diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-03-02 14:36:30 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-03-02 14:36:30 +0000 |
commit | 38314aa6fc7640da7b5441c89af83bc30da487c5 (patch) | |
tree | b68bee8949fb47c046e53c5b957992d658e2446e /multimedia | |
parent | ea956735777d00e91d1660cdd886a866d77522cf (diff) | |
download | ports-38314aa6fc7640da7b5441c89af83bc30da487c5.tar.gz ports-38314aa6fc7640da7b5441c89af83bc30da487c5.zip |
Notes
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/kodi/Makefile | 16 | ||||
-rw-r--r-- | multimedia/kodi/distinfo | 8 | ||||
-rw-r--r-- | multimedia/kodi/files/patch-ffmpegx86 | 6 |
3 files changed, 9 insertions, 21 deletions
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index e837ec3f814b..cec50ae89e94 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -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}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ 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;' \ diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo index 3bc2060503a7..ef4f87963cf5 100644 --- a/multimedia/kodi/distinfo +++ b/multimedia/kodi/distinfo @@ -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 diff --git a/multimedia/kodi/files/patch-ffmpegx86 b/multimedia/kodi/files/patch-ffmpegx86 index 61a59cc8ba05..cbad5a8de38d 100644 --- a/multimedia/kodi/files/patch-ffmpegx86 +++ b/multimedia/kodi/files/patch-ffmpegx86 @@ -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 |