Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Mar 2016 14:36:31 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409948 - in head/multimedia/kodi: . files
Message-ID:  <201603021436.u22EaVg0037096@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Wed Mar  2 14:36:30 2016
New Revision: 409948
URL: https://svnweb.freebsd.org/changeset/ports/409948

Log:
  Use USE_GITHUB correctly.
  
  Sponsored by:	Absolight

Modified:
  head/multimedia/kodi/Makefile
  head/multimedia/kodi/distinfo
  head/multimedia/kodi/files/patch-ffmpegx86

Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile	Wed Mar  2 14:35:57 2016	(r409947)
+++ head/multimedia/kodi/Makefile	Wed Mar  2 14:36:30 2016	(r409948)
@@ -4,11 +4,6 @@ PORTNAME=	kodi
 DISTVERSION=	15.2
 PORTREVISION=	1
 CATEGORIES=	multimedia java
-MASTER_SITES=	https://codeload.github.com/xbmc/xbmc/tar.gz/${KODI_COMMIT}?dummy=/ \
-		GH:ffmpeg
-DISTFILES=	${DISTVERSION}-Isengard${EXTRACT_SUFX} \
-		${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
-EXTRACT_ONLY=	${DISTVERSION}-Isengard${EXTRACT_SUFX}
 
 MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	Award winning media center application
@@ -56,10 +51,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	xbmc
-GH_PROJECT=	ffmpeg
-GH_TAGNAME=	2.6.4-Isengard
-KODI_COMMIT=	f4dda26
+GH_TUPLE=	xbmc:xbmc:f4dda26 xbmc:FFmpeg:2.6.4-Isengard:ffmpeg
 
 USES=		autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
 		libtool pkgconfig python:2
@@ -77,8 +69,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 KODI_ARCH_i386=	x86
 KODI_ARCH_amd64=x86_64
 
-WRKSRC=		${WRKDIR}/xbmc-${KODI_COMMIT}
-
 PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
 
 OPTIONS_SUB=	yes
@@ -149,9 +139,7 @@ SFTP_CONFIGURE_ENABLE=	ssh
 CONFIGURE_ARGS+=	--disable-debug --disable-alsa
 
 post-extract:
-	${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
-	${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \
-		 -C ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
+	${MV} ${WRKSRC_ffmpeg} ${WRKSRC}/tools/depends/target/ffmpeg/
 
 post-patch:
 	${REINPLACE_CMD} 's;make;gmake;' \

Modified: head/multimedia/kodi/distinfo
==============================================================================
--- head/multimedia/kodi/distinfo	Wed Mar  2 14:35:57 2016	(r409947)
+++ head/multimedia/kodi/distinfo	Wed Mar  2 14:36:30 2016	(r409948)
@@ -1,4 +1,4 @@
-SHA256 (15.2-Isengard.tar.gz) = 6bf415258a3dffd4843e9446a62d9392997556240b7db703acb44d2bef3454d5
-SIZE (15.2-Isengard.tar.gz) = 61476469
-SHA256 (ffmpeg-2.6.4-Isengard.tar.gz) = 2487a6d4ad5701ad22582fc064ce39b60c383eec4958ca1e3218379035fa523f
-SIZE (ffmpeg-2.6.4-Isengard.tar.gz) = 9365476
+SHA256 (xbmc-xbmc-15.2-f4dda26_GH0.tar.gz) = 6bf415258a3dffd4843e9446a62d9392997556240b7db703acb44d2bef3454d5
+SIZE (xbmc-xbmc-15.2-f4dda26_GH0.tar.gz) = 61476469
+SHA256 (xbmc-FFmpeg-2.6.4-Isengard_GH0.tar.gz) = 2487a6d4ad5701ad22582fc064ce39b60c383eec4958ca1e3218379035fa523f
+SIZE (xbmc-FFmpeg-2.6.4-Isengard_GH0.tar.gz) = 9365476

Modified: head/multimedia/kodi/files/patch-ffmpegx86
==============================================================================
--- head/multimedia/kodi/files/patch-ffmpegx86	Wed Mar  2 14:35:57 2016	(r409947)
+++ head/multimedia/kodi/files/patch-ffmpegx86	Wed Mar  2 14:36:30 2016	(r409948)
@@ -1,6 +1,6 @@
---- tools/depends/target/ffmpeg/ffmpeg-2.6.4-Isengard/libavutil/x86/asm.h.orig	2014-12-25 12:59:22 UTC
-+++ tools/depends/target/ffmpeg/ffmpeg-2.6.4-Isengard/libavutil/x86/asm.h
-@@ -71,7 +71,7 @@
+--- tools/depends/target/ffmpeg/FFmpeg-2.6.4-Isengard/libavutil/x86/asm.h.orig	2015-08-02 10:35:17 UTC
++++ tools/depends/target/ffmpeg/FFmpeg-2.6.4-Isengard/libavutil/x86/asm.h
+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
  typedef int x86_reg;
  #endif
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603021436.u22EaVg0037096>