svn commit: r391217 - in head: multimedia/avidemux multimedia/ffmpeg multimedia/ffmpeg0 multimedia/ffmpeg23 multimedia/ffmpeg26 multimedia/gstreamer-plugins-x264 multimedia/gstreamer1-plugins-x264 ...
Kubilay Kocak
koobs at FreeBSD.org
Fri Jul 3 07:02:52 UTC 2015
Author: koobs
Date: Fri Jul 3 07:02:44 2015
New Revision: 391217
URL: https://svnweb.freebsd.org/changeset/ports/391217
Log:
multimedia/{lib}x264: Update to 0.144.2533 and major refactor
- Update to 0.144.2533 (from upstream stable branch) [1]
- Switch x264 and libx264 ports to master/slave ports respectively
- Bump PORTREVISION for dependent ports as the shared library version
has changed.
multimedia/x264:
- Clean up and update "updating instructions" in Makefile header
- Tweak COMMENT
- Only LIB_DEPENDS on libx264 and add PLIST_FILES if this isn't the
libx264 port.
- Allow COMMENT, USES, OPTIONS_*, CONFIGURE_ARGS to be overriden in
libx264 port.
- Place common configure arguments in a CONFIGURE_COMMON_ARGS variable
to make overriding values without duplication easier.
- Use --prefix configure argument over post-patch replacements
- Enable stripping of binaries and libraries if DEBUG is off. Remove
post-install target STRIP_CMD accordingly.
- Delete patch-Makefile in favour of patching WRKSRC/configure to
identify amd64, arm64 and mipsn32. powerpc and powerpc64 are now
covered upstream without needing patches.
- Patch out a bogus compiler argument check (cc_check) that results
in -Wno-maybe-uninitialized being added to CFLAGS causing causes
warnings when clang is cc. The cc_check function checks for basename
$CC to identify compiler type (icl, clang, gcc, etc).
multimedia/libx264:
- Remove all Makefile entries that are duplicated or common and found
in the master port (x264).
- Set lib as the PKGNAMEPREFIX
- Tweak COMMENT
- Delete upstreamed ARM patches [1]
- Delete all but one patch, as they duplicate those in x264.
- Dont remove pkgconfig/libdata directory
Changes:
https://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable
Based on:
PR: 201260 [1]
Submitted by: Andrey Cherkashin <andoriyu gmail com> [1]
Deleted:
head/multimedia/libx264/files/patch-Makefile
head/multimedia/libx264/files/patch-common_arm_asm.S
head/multimedia/libx264/files/patch-common_arm_cpu-a.S
head/multimedia/libx264/files/patch-common_arm_dct-a.S
head/multimedia/libx264/files/patch-common_arm_deblock-a.S
head/multimedia/libx264/files/patch-common_arm_mc-a.S
head/multimedia/libx264/files/patch-common_arm_pixel-a.S
head/multimedia/libx264/files/patch-common_arm_predict-a.S
head/multimedia/libx264/files/patch-common_arm_quant-a.S
head/multimedia/libx264/files/patch-common_cpu.c
head/multimedia/libx264/files/patch-configure
head/multimedia/x264/files/patch-Makefile
Modified:
head/multimedia/avidemux/Makefile
head/multimedia/ffmpeg/Makefile
head/multimedia/ffmpeg0/Makefile
head/multimedia/ffmpeg23/Makefile
head/multimedia/ffmpeg26/Makefile
head/multimedia/gstreamer-plugins-x264/Makefile
head/multimedia/gstreamer1-plugins-x264/Makefile
head/multimedia/handbrake/Makefile
head/multimedia/libav/Makefile
head/multimedia/libquicktime/Makefile
head/multimedia/libx264/Makefile
head/multimedia/libx264/pkg-plist
head/multimedia/mpeg4ip/Makefile
head/multimedia/mplayer/Makefile
head/multimedia/msx264/Makefile
head/multimedia/obs-studio/Makefile
head/multimedia/transcode/Makefile
head/multimedia/vlc/Makefile
head/multimedia/x264/Makefile
head/multimedia/x264/distinfo
head/multimedia/x264/files/patch-common_cpu.c
head/multimedia/x264/files/patch-configure
head/net/opal/Makefile
head/x11/xpra/Makefile
Modified: head/multimedia/avidemux/Makefile
==============================================================================
--- head/multimedia/avidemux/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/avidemux/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -6,7 +6,7 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MAINTAINER= multimedia at FreeBSD.org
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/ffmpeg/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,6 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.7.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/ffmpeg0/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 0.7.16
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
Modified: head/multimedia/ffmpeg23/Makefile
==============================================================================
--- head/multimedia/ffmpeg23/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/ffmpeg23/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,6 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.3.6
+PORTREVISION= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
PKGNAMESUFFIX= 23
Modified: head/multimedia/ffmpeg26/Makefile
==============================================================================
--- head/multimedia/ffmpeg26/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/ffmpeg26/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 2.6.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
PKGNAMESUFFIX= 26
Modified: head/multimedia/gstreamer-plugins-x264/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins-x264/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/gstreamer-plugins-x264/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin
Modified: head/multimedia/gstreamer1-plugins-x264/Makefile
==============================================================================
--- head/multimedia/gstreamer1-plugins-x264/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/gstreamer1-plugins-x264/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin
Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/handbrake/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,6 +3,7 @@
PORTNAME= handbrake
PORTVERSION= 0.10.2
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \
http://download.handbrake.fr/handbrake/contrib/:contrib \
Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/libav/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -2,7 +2,7 @@
PORTNAME= libav
PORTVERSION= 11.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://libav.org/releases/
Modified: head/multimedia/libquicktime/Makefile
==============================================================================
--- head/multimedia/libquicktime/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/libquicktime/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.4
-PORTREVISION?= 10
+PORTREVISION?= 11
CATEGORIES= multimedia
MASTER_SITES= SF
Modified: head/multimedia/libx264/Makefile
==============================================================================
--- head/multimedia/libx264/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/libx264/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,95 +3,28 @@
#
# Updating notes: see multimedia/x264/Makefile.
-PORTNAME= libx264
-PORTVERSION= 0.${X264_BUILD}.${X264_REV}
-PORTREVISION= 3
-CATEGORIES= multimedia
-MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
- http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-DISTNAME= x264-snapshot-${X264_SNAPSHOT}-2245-stable
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR= x264
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER= koobs at FreeBSD.org
-COMMENT= Library for encoding H.264/MPEG-4 AVC video
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-BUILD_DEPENDS= yasm>=1.2.0:${PORTSDIR}/devel/yasm \
- bash:${PORTSDIR}/shells/bash
-
-X264_BUILD= 142
-X264_REV= 2455
-X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd
-X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT= 20140827
+PKGNAMEPREFIX= lib
+COMMENT= H.264/MPEG-4 AVC Video Encoding (Library)
+MASTERDIR= ${.CURDIR}/../x264
+PLIST= ${.CURDIR}/pkg-plist
USES= gmake pathfix tar:bzip2
-USE_LDCONFIG= yes
-HAS_CONFIGURE= yes
OPTIONS_DEFINE= ASM DEBUG GCC HI10P PGO
-OPTIONS_DEFAULT= ASM
+OPTIONS_EXCLUDE= GPAC LAV
-ASM_DESC= Enable Assembly Optimizations
-DEBUG_DESC= Generate Debugging Symbols
-GCC_DESC= Use current GCC
-HI10P_DESC= Enable High 10 Profile 10-bit encoding
+DEBUG_CONFIGURE_OFF= --enable-strip
-ASM_CONFIGURE_OFF= --disable-asm
-DEBUG_CONFIGURE_ON= --enable-debug
+HI10P_DESC= Enable High 10 Profile 10-bit encoding
HI10P_CONFIGURE_ON= --bit-depth=10
-CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \
- --extra-ldflags="-L${LOCALBASE}/lib" \
- --enable-static --enable-shared \
- --disable-opencl
-CFLAGS_armv6+= -mcpu=arm1136jf-s
+CONFIGURE_ARGS= ${CONFIGURE_COMMON_ARGS} \
+ --enable-static \
+ --enable-shared \
+ --disable-cli
PATHFIX_MAKEFILEIN= Makefile
-PLIST_SUB+= X264_BUILD=${X264_BUILD}
-.include <bsd.port.options.mk>
+PLIST_SUB+= X264_BUILD=${X264_BUILD}
-.if ${PORT_OPTIONS:MGCC}
-USE_GCC= yes
-.elif ${PORT_OPTIONS:MPGO}
-USE_GCC= any
-.endif
-
-.if ${PORT_OPTIONS:MPGO}
-# y4m sample video
-Y4M_VIDEO= example.y4m
-Y4M_VIDEO_DISTFILE= example.y4m.bz2
-
-DISTFILES+= ${Y4M_VIDEO_DISTFILE}:pgo
-ALL_TARGET= fprofiled
-MAKE_ENV+= VIDS="${WRKDIR}/${Y4M_VIDEO}"
-
-RESTRICTED= ${Y4M_VIDEO_DISTFILE} file may not be mirrored
-RESTRICTED_FILES= ${Y4M_VIDEO_DISTFILE}
-.endif
-
-post-extract:
-.if ${PORT_OPTIONS:MPGO}
- @( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
- s|/bin/bash|${LOCALBASE}/bin/bash|; \
- s|gpac_static|gpac|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|bash|sh|; \
- s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \
- s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \
- ${WRKSRC}/version.sh
-
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/bin/x264
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libx264.so.*
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Modified: head/multimedia/libx264/pkg-plist
==============================================================================
--- head/multimedia/libx264/pkg-plist Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/libx264/pkg-plist Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,5 +3,4 @@ include/x264_config.h
lib/libx264.a
lib/libx264.so
lib/libx264.so.%%X264_BUILD%%
- at dir libdata/pkgconfig
libdata/pkgconfig/x264.pc
Modified: head/multimedia/mpeg4ip/Makefile
==============================================================================
--- head/multimedia/mpeg4ip/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/mpeg4ip/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.6.1
-PORTREVISION= 32
+PORTREVISION= 33
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/mplayer/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= High performance media player supporting many formats
Modified: head/multimedia/msx264/Makefile
==============================================================================
--- head/multimedia/msx264/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/msx264/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -2,6 +2,7 @@
PORTNAME= msx264
PORTVERSION= 1.5.1
+PORTREVISION= 1
CATEGORIES= multimedia net
MASTER_SITES= SAVANNAH/linphone/plugins/sources/
Modified: head/multimedia/obs-studio/Makefile
==============================================================================
--- head/multimedia/obs-studio/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/obs-studio/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -2,6 +2,7 @@
PORTNAME= obs-studio
PORTVERSION= 0.9.1
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= kmoore at FreeBSD.org
Modified: head/multimedia/transcode/Makefile
==============================================================================
--- head/multimedia/transcode/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/transcode/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.7
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= multimedia
MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/vlc/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.2.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/x264/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -1,17 +1,17 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
#
-# Updating notes:
-# We use the nightly tarballs for the *stable* branch of the git repo.
-# X264_BUILD is the "core" number, and can always be found in x264.h.
+# NOTES FOR UPDATING PORT:
+#
+# We use tarballs from the *stable* branch of the upstream git repository.
+#
+# X264_BUILD is the "core" number, and can be found in x264.h.
+#
# X264_COMMIT is the commit number, and can be found here:
# http://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable
-# To get X264_REV, you must checkout the git revision for the version to
-# which you wish to update, and then run version.sh against it.
-# Don't forget to update these for multimedia/libx264 as well:
-# X264_BUILD, X264_REV, X264_COMMIT, X264_SNAPSHOT
#
-# distinfo for this port and libx264 should always be *identical*.
+# X264_REV requires a checkout the git revision for the version the port
+# is being updated to. Then run version.sh against it.
#
# Bumping PORTREVISION for dependent ports? This is useful:
# cd $PORTSDIR; for x in $(find . -name "Makefile*" -print);
@@ -19,7 +19,6 @@
PORTNAME= x264
PORTVERSION= 0.${X264_BUILD}.${X264_REV}
-PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -29,54 +28,62 @@ DIST_SUBDIR= x264
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= koobs at FreeBSD.org
-COMMENT= Front-end for encoding H.264/MPEG-4 AVC video
+COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI)
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= yasm>=1.2.0:${PORTSDIR}/devel/yasm \
bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
-X264_BUILD= 142
-X264_REV= 2455
-X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd
+X264_BUILD= 144
+X264_REV= 2533
+X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6
X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT= 20140827
+X264_SNAPSHOT= 20150629
-USES= gmake pkgconfig tar:bzip2
+USES?= gmake pkgconfig tar:bzip2
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
-OPTIONS_DEFINE= ASM DEBUG GCC GPAC LAVF PGO
-OPTIONS_DEFAULT= ASM GPAC
+OPTIONS_DEFINE?= ASM DEBUG GCC GPAC LAVF PGO
+OPTIONS_DEFAULT?= ASM GPAC
GCC_DESC= Use current GCC
GPAC_DESC= MPEG-4 output support
LAVF_DESC= libav* format input/output support (requires FFmpeg)
ASM_CONFIGURE_OFF= --disable-asm
+
DEBUG_CONFIGURE_ON= --enable-debug
-GPAC_LIB_DEPENDS= libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
+DEBUG_CONFIGURE_OFF= --enable-strip
+
GPAC_CONFIGURE_OFF= --disable-gpac
+GPAC_LIB_DEPENDS= libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
+
+LAVF_CONFIGURE_OFF= --disable-swscale --disable-lavf
LAVF_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
libswscale.so:${PORTSDIR}/multimedia/ffmpeg
-LAVF_CONFIGURE_OFF= --disable-swscale --disable-lavf
-CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \
+CONFIGURE_COMMON_ARGS= --prefix=${PREFIX} \
+ --extra-cflags="-I${LOCALBASE}/include" \
--extra-ldflags="-L${LOCALBASE}/lib" \
--disable-opencl \
+
+CONFIGURE_ARGS?= ${CONFIGURE_COMMON_ARGS} \
--system-libx264
CFLAGS_armv6+= -mcpu=arm1136jf-s
-PLIST_FILES= bin/x264
-PLIST_SUB+= X264_BUILD=${X264_BUILD}
-
.include <bsd.port.options.mk>
+.if ${SLAVE_PORT} == "no"
+PLIST_FILES= bin/x264
+LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264
+.endif
+
.if ${PORT_OPTIONS:MGCC}
USE_GCC= yes
.elif ${PORT_OPTIONS:MPGO}
@@ -102,19 +109,19 @@ post-extract:
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
+ @${REINPLACE_CMD} -e ' \
s|/bin/bash|${LOCALBASE}/bin/bash|; \
s|gpac_static|gpac|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|bash|sh|; \
+ @${REINPLACE_CMD} -e ' \
+ s|bash|sh|; \
s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \
s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \
${WRKSRC}/version.sh
+.if ${SLAVE_PORT} == "no"
pre-build:
@(${RM} ${WRKSRC}/x264_config.h)
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/x264
+.endif
.include <bsd.port.mk>
Modified: head/multimedia/x264/distinfo
==============================================================================
--- head/multimedia/x264/distinfo Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/x264/distinfo Fri Jul 3 07:02:44 2015 (r391217)
@@ -1,4 +1,2 @@
-SHA256 (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3
-SIZE (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939
-SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
-SIZE (x264/example.y4m.bz2) = 4910029
+SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340
+SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453
Modified: head/multimedia/x264/files/patch-common_cpu.c
==============================================================================
--- head/multimedia/x264/files/patch-common_cpu.c Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/x264/files/patch-common_cpu.c Fri Jul 3 07:02:44 2015 (r391217)
@@ -1,6 +1,6 @@
---- common/cpu.c.orig 2014-08-27 20:45:08 UTC
+--- common/cpu.c.orig 2015-06-29 20:45:09 UTC
+++ common/cpu.c
-@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void )
+@@ -316,7 +316,7 @@ uint32_t x264_cpu_detect( void )
#elif ARCH_PPC
@@ -9,7 +9,7 @@
#include <sys/sysctl.h>
uint32_t x264_cpu_detect( void )
{
-@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void )
+@@ -324,12 +324,16 @@ uint32_t x264_cpu_detect( void )
uint32_t cpu = 0;
#if SYS_OPENBSD
int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
Modified: head/multimedia/x264/files/patch-configure
==============================================================================
--- head/multimedia/x264/files/patch-configure Fri Jul 3 05:25:38 2015 (r391216)
+++ head/multimedia/x264/files/patch-configure Fri Jul 3 07:02:44 2015 (r391217)
@@ -1,25 +1,40 @@
-From 9463ec0004f1bddc49c05ed8e38430a4ce1738fb Mon Sep 17 00:00:00 2001
-From: Janne Grunau <janne-x264 at jannau.net>
-Date: Sun, 20 Jul 2014 13:40:28 +0200
-Subject: [PATCH] arm/ppc: use $CC as default assembler
-
---- configure.orig 2014-08-27 20:45:08 UTC
+--- configure.orig 2015-06-29 20:45:09 UTC
+++ configure
-@@ -648,7 +648,7 @@ case $host_cpu in
- ARCH="PPC"
- if [ $asm = auto ] ; then
- define HAVE_ALTIVEC
-- AS="${AS-${cross_prefix}gcc}"
-+ AS="${AS-${CC}}"
- if [ $SYS = MACOSX ] ; then
- CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
- else
-@@ -674,7 +674,7 @@ case $host_cpu in
- LDFLAGS="$LDFLAGS -arch armv7"
- fi
- else
-- AS="${AS-${cross_prefix}gcc}"
-+ AS="${AS-${CC}}"
+@@ -639,7 +639,7 @@ case $host_cpu in
+ ASFLAGS="$ASFLAGS -f elf"
fi
;;
- s390|s390x)
+- x86_64)
++ x86_64|amd64)
+ ARCH="X86_64"
+ AS="yasm"
+ AS_EXT=".asm"
+@@ -678,7 +678,7 @@ case $host_cpu in
+ sparc)
+ ARCH="SPARC"
+ ;;
+- mips|mipsel|mips64|mips64el)
++ mips|mipsel|mips64|mips64el|mipsn32)
+ ARCH="MIPS"
+ ;;
+ arm*)
+@@ -695,7 +695,7 @@ case $host_cpu in
+ AS="${AS-${CC}}"
+ fi
+ ;;
+- aarch64)
++ aarch64|arm64)
+ ARCH="AARCH64"
+ if [ "$SYS" = MACOSX ] ; then
+ AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}"
+@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then
+ CFLAGS="-Wshadow $CFLAGS"
+ fi
+
+-if cc_check '' -Wmaybe-uninitialized ; then
+- CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
+-fi
+-
+ if [ $compiler = ICC -o $compiler = ICL ] ; then
+ if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
+ define HAVE_INTEL_DISPATCHER
Modified: head/net/opal/Makefile
==============================================================================
--- head/net/opal/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/net/opal/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,7 +3,7 @@
PORTNAME= opal
PORTVERSION= 3.10.10
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= GNOME
Modified: head/x11/xpra/Makefile
==============================================================================
--- head/x11/xpra/Makefile Fri Jul 3 05:25:38 2015 (r391216)
+++ head/x11/xpra/Makefile Fri Jul 3 07:02:44 2015 (r391217)
@@ -3,6 +3,7 @@
PORTNAME= xpra
PORTVERSION= 0.15.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/
More information about the svn-ports-all
mailing list