cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to x264 snapshot 20080713.

Browse Source 
Also remove ajacoutot@ as maintainer per his request.

ok jakemsr@
This commit is contained in:
brad 2008-07-22 20:24:04 +00:00
parent 067dd66ed3
commit 57f2cafc36
10 changed files with 99 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
multimedia/x264/Makefile
View File

@ -1,46 +1,38 @@
# $OpenBSD: Makefile,v 1.3 2007/07/20 20:11:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2008/07/22 20:24:04 brad Exp $
COMMENT= free h264/avc encoder
COMMENT= free H264/AVC encoder
V= 20070325
V= 20080713
DISTNAME= x264-snapshot-${V}-2245
PKGNAME= x264-${V}p1
SHARED_LIBS= x264 0.0 # 5.0
PKGNAME= x264-${V}
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS= x264 1.0
HOMEPAGE= http://www.videolan.org/developers/x264.html
EXTRACT_SUFX= .tar.bz2
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
WANTLIB= c m pthread
NO_REGRESS= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=simple
CONFIGURE_ENV= API=${LIBx264_VERSION}
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-pthread \
--enable-pic
--enable-pic \
--disable-mp4-output
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= ::devel/nasm
.endif
.if ${MACHINE_ARCH} == "amd64"
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= ::devel/yasm
.endif
NO_REGRESS= Yes
pre-configure:
@perl -pi -e 's,!!PREFIX!!,${PREFIX},g; s,!!X11BASE!!,${X11BASE},g' \
${WRKSRC}/configure

10
multimedia/x264/distinfo
View File

@ -1,5 +1,5 @@
MD5 (x264-snapshot-20070325-2245.tar.bz2) = bda/MV4JXV5WSlYi/9AYXw==
RMD160 (x264-snapshot-20070325-2245.tar.bz2) = EDeRA65I5ucZBd/m72t1zueSr2o=
SHA1 (x264-snapshot-20070325-2245.tar.bz2) = sz0iib9s6kNgvEplYKozjJizmCA=
SHA256 (x264-snapshot-20070325-2245.tar.bz2) = Hk9LJ+3Zr7RQXYb3rg1qhhZi5UHNmBRCJcUe1vxxfFw=
SIZE (x264-snapshot-20070325-2245.tar.bz2) = 509357
MD5 (x264-snapshot-20080713-2245.tar.bz2) = YDfmg1Xk42i48O4GPgL2Og==
RMD160 (x264-snapshot-20080713-2245.tar.bz2) = FGbrc8CPlm+Ssa3ElYenDwW1CWs=
SHA1 (x264-snapshot-20080713-2245.tar.bz2) = LBhxRwnYWEDJAmiataGx4Nj0gjE=
SHA256 (x264-snapshot-20080713-2245.tar.bz2) = BuXSoRBunb3gljW++dTgpSsUiECpsrmgxipzimXyVOM=
SIZE (x264-snapshot-20080713-2245.tar.bz2) = 2161879

60
multimedia/x264/patches/patch-Makefile
View File

@ -1,26 +1,8 @@
$OpenBSD: patch-Makefile,v 1.2 2007/07/20 20:11:48 ajacoutot Exp $
--- Makefile.orig Sun Mar 25 22:45:02 2007
+++ Makefile Fri Jul 20 12:53:31 2007
@@ -18,7 +18,7 @@ SRCS += common/visualize.c common/display-x11.c
endif
# MMX/SSE optims
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),X86) || ifeq ($(ARCH),i386)
SRCS += common/i386/mc-c.c common/i386/predict-c.c
ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \
common/i386/pixel-a.asm common/i386/mc-a.asm \
@@ -30,7 +30,7 @@ ASFLAGS += -Icommon/i386/
endif
# MMX/SSE optims
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),X86_64) || ifeq ($(ARCH),amd64)
SRCS += common/i386/mc-c.c common/i386/predict-c.c
ASMSRC = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
common/amd64/pixel-a.asm common/amd64/mc-a.asm \
@@ -47,6 +47,9 @@ ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c commo
common/ppc/quant.c
$OpenBSD: patch-Makefile,v 1.3 2008/07/22 20:24:04 brad Exp $
--- Makefile.orig Fri Jul 4 16:45:05 2008
+++ Makefile Wed Jul 9 00:15:36 2008
@@ -52,6 +52,9 @@ ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c commo
common/ppc/predict.c
SRCS += $(ALTIVECSRC)
$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
+$(ALTIVECSRC:%.c=%.so): CFLAGS += $(ALTIVECFLAGS)
@ -29,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.2 2007/07/20 20:11:48 ajacoutot Exp $
endif
# VIS optims
@@ -60,6 +63,7 @@ SRCS += extras/getopt.c
@@ -65,6 +68,7 @@ SRCS += extras/getopt.c
endif
OBJS = $(SRCS:%.c=%.o)
@ -37,32 +19,32 @@ $OpenBSD: patch-Makefile,v 1.2 2007/07/20 20:11:48 ajacoutot Exp $
OBJCLI = $(SRCCLI:%.c=%.o)
DEP = depend
@@ -72,8 +76,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
@@ -76,8 +80,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
ranlib libx264.a
-$(SONAME): .depend $(OBJS) $(OBJASM)
- $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
- $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
+$(SONAME): .depend $(SOBJS) $(OBJASM)
+ $(CC) -shared -o $@ $(SOBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
+ $(CC) -shared -o $@ $(SOBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
x264$(EXE): $(OBJCLI) libx264.a
$(CC) -o $@ $+ $(LDFLAGS)
@@ -84,6 +88,9 @@ libx264gtk.a: muxers.o libx264.a
checkasm: tools/checkasm.o libx264.a
$(CC) -o $@ $+ $(LDFLAGS)
@@ -93,6 +97,9 @@ checkasm: tools/checkasm.o libx264.a
# delete local/anonymous symbols, so they don't show up in oprofile
-@ strip -x $@
+%.so: %.c
+ $(CC) $(CFLAGS) -fPIC -c -o $@ $<
+
common/amd64/*.o: common/amd64/amd64inc.asm
common/i386/*.o: common/i386/i386inc.asm
%.o: %.asm
@@ -150,7 +157,6 @@ install: x264 $(SONAME)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
install x264 $(DESTDIR)$(bindir)
ranlib $(DESTDIR)$(libdir)/libx264.a
.depend: config.mak
rm -f .depend
# Hacky - because gcc 2.9x doesn't have -MT
@@ -160,7 +167,6 @@ install: x264$(EXE) $(SONAME)
ifeq ($(SYS),MINGW)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
else
- $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
install-gtk: libx264gtk.a
endif
$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))

8
multimedia/x264/patches/patch-common_cpu_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_cpu_c,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
--- common/cpu.c.orig Sun Mar 25 22:45:02 2007
+++ common/cpu.c Mon Mar 26 17:28:58 2007
@@ -144,7 +144,7 @@ uint32_t x264_cpu_detect( void )
$OpenBSD: patch-common_cpu_c,v 1.2 2008/07/22 20:24:04 brad Exp $
--- common/cpu.c.orig Fri Jul 4 16:45:05 2008
+++ common/cpu.c Tue Jul 8 23:59:12 2008
@@ -201,7 +201,7 @@ uint32_t x264_cpu_detect( void )
return cpu;
}

10
multimedia/x264/patches/patch-common_ppc_dct_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-common_ppc_dct_c,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
--- common/ppc/dct.c.orig Mon Mar 19 22:45:02 2007
+++ common/ppc/dct.c Tue Mar 20 18:19:50 2007
@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
$OpenBSD: patch-common_ppc_dct_c,v 1.2 2008/07/22 20:24:04 brad Exp $
--- common/ppc/dct.c.orig Fri Jul 4 16:45:05 2008
+++ common/ppc/dct.c Tue Jul 8 23:59:12 2008
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#ifdef SYS_LINUX

10
multimedia/x264/patches/patch-common_ppc_pixel_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-common_ppc_pixel_c,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
--- common/ppc/pixel.c.orig Mon Mar 19 22:45:02 2007
+++ common/ppc/pixel.c Tue Mar 20 18:20:28 2007
@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
$OpenBSD: patch-common_ppc_pixel_c,v 1.2 2008/07/22 20:24:04 brad Exp $
--- common/ppc/pixel.c.orig Fri Jul 4 16:45:05 2008
+++ common/ppc/pixel.c Tue Jul 8 23:59:12 2008
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#ifdef SYS_LINUX

8
multimedia/x264/patches/patch-common_ppc_quant_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-common_ppc_quant_c,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
--- common/ppc/quant.c.orig Mon Mar 19 22:45:02 2007
+++ common/ppc/quant.c Tue Mar 20 18:20:42 2007
$OpenBSD: patch-common_ppc_quant_c,v 1.2 2008/07/22 20:24:04 brad Exp $
--- common/ppc/quant.c.orig Fri Jul 4 16:45:05 2008
+++ common/ppc/quant.c Tue Jul 8 23:59:12 2008
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
*****************************************************************************/
-#if defined SYS_LINUX

18
multimedia/x264/patches/patch-common_x86_mc-a_asm Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-common_x86_mc-a_asm,v 1.1 2008/07/22 20:24:04 brad Exp $
--- common/x86/mc-a.asm.orig Tue Jul 22 09:15:30 2008
+++ common/x86/mc-a.asm Tue Jul 22 09:17:05 2008
@@ -373,12 +373,12 @@ AVG_CACHELINE_CHECK 8, 32, mmxext
AVG_CACHELINE_CHECK 12, 32, mmxext
AVG_CACHELINE_CHECK 16, 32, mmxext
AVG_CACHELINE_CHECK 20, 32, mmxext
-AVG_CACHELINE_CHECK 16, 64, mmxext
-AVG_CACHELINE_CHECK 20, 64, mmxext
%endif
AVG_CACHELINE_CHECK 8, 64, mmxext
AVG_CACHELINE_CHECK 12, 64, mmxext
+AVG_CACHELINE_CHECK 16, 64, mmxext
+AVG_CACHELINE_CHECK 20, 64, mmxext
AVG_CACHELINE_CHECK 16, 64, sse2
AVG_CACHELINE_CHECK 20, 64, sse2

41
multimedia/x264/patches/patch-configure
View File

@ -1,25 +1,16 @@
$OpenBSD: patch-configure,v 1.3 2007/07/20 20:11:48 ajacoutot Exp $
--- configure.orig Sun Mar 25 22:45:02 2007
+++ configure Fri Jul 20 13:02:53 2007
@@ -46,7 +46,7 @@ as_check() {
rm -f config.h config.mak x264.pc
-prefix='/usr/local'
+prefix='!!PREFIX!!';
exec_prefix='${prefix}'
bindir='${exec_prefix}/bin'
libdir='${exec_prefix}/lib'
@@ -160,7 +160,7 @@ case "${MACHINE%%-*}" in
ASFLAGS="$ASFLAGS -f elf"
$OpenBSD: patch-configure,v 1.4 2008/07/22 20:24:04 brad Exp $
--- configure.orig Fri Jul 4 16:45:05 2008
+++ configure Sat Jul 12 02:16:14 2008
@@ -254,7 +254,7 @@ case $host_cpu in
fi
as_check || AS="nasm"
;;
- x86_64)
+ x86_64 | amd64)
ARCH="X86_64"
CFLAGS="$CFLAGS -DHAVE_MMX"
AS="yasm"
@@ -334,6 +334,9 @@ if test "$pthread" = "auto" ; then
if [ "$SYS" = MACOSX ];then
@@ -353,6 +353,9 @@ if test "$pthread" = "auto" ; then
CFLAGS="$CFLAGS -DPTW32_STATIC_LIB"
fi
;;
@ -29,13 +20,15 @@ $OpenBSD: patch-configure,v 1.3 2007/07/20 20:11:48 ajacoutot Exp $
*)
cc_check pthread.h -lpthread && pthread="yes" && libpthread="-lpthread"
;;
@@ -370,19 +373,19 @@ if [ "$avis_input" = "yes" ] ; then
@@ -389,21 +392,21 @@ if [ "$avis_input" = "yes" ] ; then
fi
if [ "$pic" = "yes" ] ; then
- CFLAGS="$CFLAGS -fPIC"
+ CFLAGS="$CFLAGS"
ASFLAGS="$ASFLAGS -D__PIC__"
# resolve textrels in the x86 asm
cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
fi
if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
@ -53,15 +46,23 @@ $OpenBSD: patch-configure,v 1.3 2007/07/20 20:11:48 ajacoutot Exp $
fi
if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then
@@ -426,7 +429,6 @@ echo '' >> config.mak
@@ -449,7 +452,6 @@ echo '' >> config.mak
cp config.mak gtk/config.mak
if [ "$shared" = "yes" ]; then
- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
echo "SONAME=libx264.so.$API" >> config.mak
if [ "$SYS" = "MINGW" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
@@ -459,7 +461,6 @@ if [ "$shared" = "yes" ]; then
echo 'SOFLAGS=-dynamiclib -Wl,-single_module -Wl,-read_only_relocs,suppress' >> config.mak
else
echo "SONAME=libx264.so.$API" >> config.mak
- echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
echo 'default: $(SONAME)' >> config.mak
if [ "$gtk" = "yes" ]; then
@@ -441,7 +443,7 @@ fi
@@ -474,7 +475,7 @@ fi
./version.sh

4
multimedia/x264/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/08 17:31:01 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/07/22 20:24:05 brad Exp $
%%SHARED%%
bin/x264
@bin bin/x264
include/x264.h
lib/libx264.a
lib/pkgconfig/