[Midnightbsd-cvs] mports [15507] U trunk/multimedia/x264/pkg-plist: update x264

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Sep 25 20:46:48 EDT 2013 

Revision: 15507
          http://svnweb.midnightbsd.org/mports/?rev=15507
Author:   laffer1
Date:     2013-09-25 20:46:47 -0400 (Wed, 25 Sep 2013)
Log Message:
-----------
update x264

Modified Paths:
--------------
    trunk/multimedia/x264/Makefile
    trunk/multimedia/x264/distinfo
    trunk/multimedia/x264/files/patch-Makefile
    trunk/multimedia/x264/pkg-plist

Removed Paths:
-------------
    trunk/multimedia/x264/files/patch-configure

Property Changed:
----------------
    trunk/multimedia/x264/distinfo
    trunk/multimedia/x264/files/patch-Makefile
    trunk/multimedia/x264/files/patch-common_cpu.c
    trunk/multimedia/x264/pkg-plist

Modified: trunk/multimedia/x264/Makefile
===================================================================
--- trunk/multimedia/x264/Makefile	2013-09-25 12:22:18 UTC (rev 15506)
+++ trunk/multimedia/x264/Makefile	2013-09-26 00:46:47 UTC (rev 15507)
@@ -4,53 +4,57 @@
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
 CATEGORIES=	multimedia
-MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
+MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245
-DISTFILES=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	mm/x264
+DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	x264
-EXTRACT_ONLY=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT?=	Library and tool for encoding H.264/AVC video streams
+
 LICENSE=	gpl2
 
-BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
+		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-X264_BUILD=	110
-X264_REV=	1804
-X264_SNAPSHOT=	20101128
+X264_BUILD=	125
+X264_REV=	2201
+X264_COMMIT=	37be55213a39db40cf159ada319bd482a1b00680
+X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
+X264_SNAPSHOT=	20120721
 
 USE_BZIP2=	yes
-EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
+USE_GCC=	any
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	ASM "Assembly optimizations (devel/binutils)" On \
-		DEBUG "Enable Debugging" Off \
-		PGO "Enable Profile-Guided Optimization" Off \
-		GCC44 "Use gcc 4.4+ (implies WITH_ASM)" Off \
-		GPAC "Enable MPEG-4 Output" On \
-		X11_OUTPUT "Enable X11 Output" Off
+OPTIONS_DEFINE=	ASM DEBUG PGO GCC44 GPAC X11_OUTPUT
+OPTIONS_DEFAULT=	ASM PGO GPAC
+ASM_DESC=		Assembly optimizations (devel/binutils)
+GCC44_DESC=		Use current GCC (implies WITH_ASM)
+GPAC_DESC=		Enable MPEG-4 Output
+X11_OUTPUT_DESC=	Enable X11 Output
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \
-			--enable-shared \
-			--host=${ARCH}-portbld-freebsd7.0 \
-			--build=${ARCH}-portbld-freebsd7.0
+			--enable-static --enable-shared
 
 PLIST_SUB+=	X264_BUILD=${X264_BUILD}
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_GCC44)
-USE_GCC?=	4.4+
+.if ${PORT_OPTIONS:MGCC44}
+USE_GCC?=	yes
 .endif
 
-.if !defined(WITHOUT_ASM) || defined(WITH_GCC44)
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MASM} || ${PORT_OPTIONS:MGCC44}
 BUILD_DEPENDS+=		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
@@ -70,11 +74,11 @@
 MAKE_ENV+=	ARCH= \
 		TARGET_ARCH=
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
 # y4m sample video
 Y4M_VIDEO=example.y4m
 Y4M_VIDEO_DISTFILE=example.y4m.bz2
@@ -87,7 +91,7 @@
 RESTRICTED_FILES=	${Y4M_VIDEO_DISTFILE}
 .endif
 
-.if !defined(WITHOUT_GPAC)
+.if ${PORT_OPTIONS:MGPAC}
 BUILD_DEPENDS+=		gpac-libgpac>=0.4.5,1:${PORTSDIR}/multimedia/gpac-libgpac
 LIB_DEPENDS+=		gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
 .else
@@ -94,13 +98,13 @@
 CONFIGURE_ARGS+=	--disable-gpac
 .endif
 
-.if defined(WITH_X11_OUTPUT)
+.if ${PORT_OPTIONS:MX11_OUTPUT}
 CONFIGURE_ARGS+=	--enable-visualize
 USE_XORG=	x11
 .endif
 
 post-extract:
-.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
 	@( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
 .endif
 
@@ -107,7 +111,7 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
 		s|-lpthread|${PTHREAD_LIBS}|g; \
-		s|bash|sh|; \
+		s|/bin/bash|${LOCALBASE}/bin/bash|; \
 		s|gpac_static|gpac|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh
@@ -114,7 +118,7 @@
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
-.if !defined(WITH_GCC44)
+.if ${PORT_OPTIONS:MGCC44}
 	@${REINPLACE_CMD} -e 's|$$(CC) -shared -o|COMPILER_PATH= $$(CC) -shared -o|g' \
 		-e 's|$$(CC) -o|COMPILER_PATH= $$(CC) -o|g' \
 		${WRKSRC}/Makefile

Modified: trunk/multimedia/x264/distinfo
===================================================================
--- trunk/multimedia/x264/distinfo	2013-09-25 12:22:18 UTC (rev 15506)
+++ trunk/multimedia/x264/distinfo	2013-09-26 00:46:47 UTC (rev 15507)
@@ -1,4 +1,4 @@
-MD5 (x264/x264-snapshot-20101128-2245.tar.bz2) = a32f0262386a3769fe834b4c184ecefa
-SHA256 (x264/x264-snapshot-20101128-2245.tar.bz2) = 7bcf72cd27780833ee7757de1efe53e8192c9a110d33c1f86e0f70085fab71db
-RMD160 (x264/x264-snapshot-20101128-2245.tar.bz2) = 3102471c7d6202b819b2221ef9139702b5a073d0
-SIZE (x264/x264-snapshot-20101128-2245.tar.bz2) = 472116
+SHA256 (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 9e8f87d08ee51b4e4b66a3720796c6cf50fc4668946c2d958fcfce236ac73cff
+SIZE (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 554280
+SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
+SIZE (x264/example.y4m.bz2) = 4910029


Property changes on: trunk/multimedia/x264/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/multimedia/x264/files/patch-Makefile
===================================================================
--- trunk/multimedia/x264/files/patch-Makefile	2013-09-25 12:22:18 UTC (rev 15506)
+++ trunk/multimedia/x264/files/patch-Makefile	2013-09-26 00:46:47 UTC (rev 15507)
@@ -1,7 +1,7 @@
---- Makefile.orig	2010-07-07 22:45:06.000000000 +0200
-+++ Makefile	2010-07-08 17:08:43.434178535 +0200
-@@ -56,12 +56,12 @@
-           cpu-a.asm dct-32.asm bitstream-a.asm
+--- Makefile.orig	2012-04-24 22:45:06.000000000 +0200
++++ Makefile	2012-04-25 10:17:55.692859510 +0200
+@@ -84,13 +84,13 @@
+ endif
  X86SRC = $(X86SRC0:%=common/x86/%)
  
 -ifeq ($(ARCH),X86)
@@ -8,14 +8,15 @@
 +ifeq ($(ARCH),i386)
  ARCH_X86 = yes
  ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
+ ASFLAGS += -DARCH_X86_64=0
  endif
  
 -ifeq ($(ARCH),X86_64)
 +ifeq ($(ARCH),amd64)
  ARCH_X86 = yes
- ASMSRC   = $(X86SRC:-32.asm=-64.asm)
- ASFLAGS += -DARCH_X86_64
-@@ -77,7 +77,7 @@
+ ASMSRC   = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
+ ASFLAGS += -DARCH_X86_64=1
+@@ -106,7 +106,7 @@
  endif
  
  # AltiVec optims


Property changes on: trunk/multimedia/x264/files/patch-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/multimedia/x264/files/patch-common_cpu.c
===================================================================
--- trunk/multimedia/x264/files/patch-common_cpu.c	2013-09-25 12:22:18 UTC (rev 15506)
+++ trunk/multimedia/x264/files/patch-common_cpu.c	2013-09-26 00:46:47 UTC (rev 15507)

Property changes on: trunk/multimedia/x264/files/patch-common_cpu.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/multimedia/x264/files/patch-configure
===================================================================
--- trunk/multimedia/x264/files/patch-configure	2013-09-25 12:22:18 UTC (rev 15506)
+++ trunk/multimedia/x264/files/patch-configure	2013-09-26 00:46:47 UTC (rev 15507)
@@ -1,25 +0,0 @@
---- configure.orig	2010-11-28 22:45:04.000000000 +0100
-+++ configure	2010-11-29 22:51:09.651506774 +0100
-@@ -350,12 +350,16 @@
-         ARCH="X86"
-         AS="yasm"
-         ASFLAGS="$ASFLAGS -O2"
--        if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
--            CFLAGS="$CFLAGS -march=i686"
--        fi
--        if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
--            CFLAGS="$CFLAGS -mfpmath=sse -msse"
--        fi
-+	if [ "$asm" = yes ]; then
-+	    case "$CFLAGS" in
-+	    *-march*) ;;
-+	    *) CFLAGS="$CFLAGS -march=i686" ;;
-+	    esac
-+	    case "$CFLAGS" in
-+	    *-mfpmath*) ;;
-+	    *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
-+	    esac
-+	fi
-         if [ "$SYS" = MACOSX ]; then
-             ASFLAGS="$ASFLAGS -f macho -DPREFIX"
-         elif [ "$SYS" = MINGW ]; then

Modified: trunk/multimedia/x264/pkg-plist
===================================================================
--- trunk/multimedia/x264/pkg-plist	2013-09-25 12:22:18 UTC (rev 15506)
+++ trunk/multimedia/x264/pkg-plist	2013-09-26 00:46:47 UTC (rev 15507)
@@ -1,5 +1,6 @@
 bin/x264
 include/x264.h
+include/x264_config.h
 lib/libx264.a
 lib/libx264.so
 lib/libx264.so.%%X264_BUILD%%


Property changes on: trunk/multimedia/x264/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list