[Midnightbsd-cvs] mports [17650] h.264 20130827 snap

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 28 19:08:36 EDT 2014 

Revision: 17650
          http://svnweb.midnightbsd.org/mports/?rev=17650
Author:   laffer1
Date:     2014-09-28 19:08:34 -0400 (Sun, 28 Sep 2014)
Log Message:
-----------
h.264 20130827 snap

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

Property Changed:
----------------
    trunk/multimedia/x264/pkg-descr

Modified: trunk/multimedia/x264/Makefile
===================================================================
--- trunk/multimedia/x264/Makefile	2014-09-28 23:06:26 UTC (rev 17649)
+++ trunk/multimedia/x264/Makefile	2014-09-28 23:08:34 UTC (rev 17650)
@@ -6,7 +6,6 @@
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-MASTER_SITE_SUBDIR=	mm/x264
 DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	x264
@@ -20,48 +19,53 @@
 BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-X264_BUILD=	125
-X264_REV=	2201
-X264_COMMIT=	37be55213a39db40cf159ada319bd482a1b00680
+X264_BUILD=	136
+X264_REV=	2358
+X264_COMMIT=	3361d59a0a83dcb8b321cc0eb8e6ba68ca49c7d4
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT=	20120721
+X264_SNAPSHOT=	20130827
 
-USE_BZIP2=	yes
-USE_GCC=	any
+USES=		gmake tar:bzip2
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
-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)
+OPTIONS_DEFINE=		ASM DEBUG HI10P PGO GCC GPAC X11_OUTPUT
+OPTIONS_DEFAULT=	ASM GPAC
+ASM_DESC=		Enable Assembly Optimizations
+GCC_DESC=		Use current GCC
+HI10P_DESC=		Enable High 10 Profile 10-bit encoding
 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-static --enable-shared
+CONFIGURE_ARGS+=	--extra-cflags="-I${LOCALBASE}/include" \
+			--extra-ldflags="-L${LOCALBASE}/lib" \
+			--enable-static --enable-shared \
+			--disable-opencl \
+			--disable-swscale
 
 PLIST_SUB+=	X264_BUILD=${X264_BUILD}
 
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MGCC44}
-USE_GCC?=	yes
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC=	yes
+.elif ${PORT_OPTIONS:MPGO}
+USE_GCC=	any
 .endif
 
-.include <bsd.port.pre.mk>
+.if !${PORT_OPTIONS:MASM}
+CONFIGURE_ARGS+=	--disable-asm
+.endif
 
-.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
-.else
-CONFIGURE_ARGS+=		--disable-asm
+.if ${PORT_OPTIONS:MHI10P}
+CONFIGURE_ARGS+=	--bit-depth=10
 .endif
 
+.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 # Around the time GCC stack protection (aka Propolice) for userland
 # was enabled on src/share/mk/bsd.sys.mk
 # SVN rev 180012 on 2008-06-25 21:33:28Z by ru
@@ -69,16 +73,7 @@
 LDFLAGS+=	-fstack-protector
 .endif
 
-CONFIGURE_ENV+=	ARCH= \
-		TARGET_ARCH=
-MAKE_ENV+=	ARCH= \
-		TARGET_ARCH=
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO}
 # y4m sample video
 Y4M_VIDEO=example.y4m
 Y4M_VIDEO_DISTFILE=example.y4m.bz2
@@ -92,8 +87,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MGPAC}
-BUILD_DEPENDS+=		gpac-libgpac>=0.4.5,1:${PORTSDIR}/multimedia/gpac-libgpac
-LIB_DEPENDS+=		gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
+LIB_DEPENDS+=		libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
 .else
 CONFIGURE_ARGS+=	--disable-gpac
 .endif
@@ -100,11 +94,11 @@
 
 .if ${PORT_OPTIONS:MX11_OUTPUT}
 CONFIGURE_ARGS+=	--enable-visualize
-USE_XORG=	x11
+USE_XORG=		x11
 .endif
 
 post-extract:
-.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO}
 	@( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
 .endif
 
@@ -118,24 +112,8 @@
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
-.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
-.endif
 
-.if ${SLAVE_PORT:L}=="no"
-.if 0 # BROKEN
-post-build:
-	cd ${WRKSRC}/tools && ${MAKE} avc2avi
-
-pre-install:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-		${WRKSRC}/x264.pc
-
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/avc2avi ${PREFIX}/bin
-.endif # BROKEN
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/x264
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/multimedia/x264/distinfo
===================================================================
--- trunk/multimedia/x264/distinfo	2014-09-28 23:06:26 UTC (rev 17649)
+++ trunk/multimedia/x264/distinfo	2014-09-28 23:08:34 UTC (rev 17650)
@@ -1,4 +1,4 @@
-SHA256 (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 9e8f87d08ee51b4e4b66a3720796c6cf50fc4668946c2d958fcfce236ac73cff
-SIZE (x264/x264-snapshot-20120721-2245-stable.tar.bz2) = 554280
+SHA256 (x264/x264-snapshot-20130827-2245-stable.tar.bz2) = 5e418d6bb0fa8aebd503f7c6298ef0ee007ae8f066811d5427c28edc4a0304ef
+SIZE (x264/x264-snapshot-20130827-2245-stable.tar.bz2) = 619606
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029

Modified: trunk/multimedia/x264/files/patch-Makefile
===================================================================
--- trunk/multimedia/x264/files/patch-Makefile	2014-09-28 23:06:26 UTC (rev 17649)
+++ trunk/multimedia/x264/files/patch-Makefile	2014-09-28 23:08:34 UTC (rev 17650)
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-04-24 22:45:06.000000000 +0200
-+++ Makefile	2012-04-25 10:17:55.692859510 +0200
-@@ -84,13 +84,13 @@
+--- Makefile.orig	2013-08-27 22:45:07.000000000 +0200
++++ Makefile	2014-02-04 20:59:54.000000000 +0100
+@@ -86,13 +86,13 @@
  endif
  X86SRC = $(X86SRC0:%=common/x86/%)
  
@@ -16,12 +16,19 @@
  ARCH_X86 = yes
  ASMSRC   = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
  ASFLAGS += -DARCH_X86_64=1
-@@ -106,7 +106,7 @@
+@@ -108,7 +108,14 @@
  endif
  
  # AltiVec optims
 -ifeq ($(ARCH),PPC)
 +ifeq ($(ARCH),powerpc)
++ARCH_PPC = yes
++endif
++ifeq ($(ARCH),powerpc64)
++ARCH_PPC = yes
++endif
++
++ifdef ARCH_PPC
  ifneq ($(AS),)
  SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
          common/ppc/quant.c common/ppc/deblock.c \

Modified: trunk/multimedia/x264/pkg-descr
===================================================================
--- trunk/multimedia/x264/pkg-descr	2014-09-28 23:06:26 UTC (rev 17649)
+++ trunk/multimedia/x264/pkg-descr	2014-09-28 23:08:34 UTC (rev 17650)
@@ -10,4 +10,4 @@
  * Ratecontrol: constant quantizer, constant bitrate, or multipass ABR
  * Scene cut detection
 
-WWW:	http://www.videolan.org/x264.html
+WWW: http://www.videolan.org/x264.html


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

More information about the Midnightbsd-cvs mailing list