From 72afd714e6170fb7120db30a3c9becf5c4c99e1f Mon Sep 17 00:00:00 2001 From: ahze Date: Wed, 10 May 2006 11:44:28 +0000 Subject: - Update to 0.0.20060509 patch-muxers submitted by: lioux --- multimedia/x264-devel/Makefile | 30 +++++++----------- multimedia/x264-devel/distinfo | 6 ++-- multimedia/x264-devel/files/patch-Makefile | 49 +++++++++++++---------------- multimedia/x264-devel/files/patch-configure | 40 ++++++----------------- multimedia/x264-devel/files/patch-muxers.c | 11 +++++++ multimedia/x264-devel/files/patch-x264.c | 11 ------- multimedia/x264/Makefile | 30 +++++++----------- multimedia/x264/distinfo | 6 ++-- multimedia/x264/files/patch-Makefile | 49 +++++++++++++---------------- multimedia/x264/files/patch-configure | 40 ++++++----------------- multimedia/x264/files/patch-muxers.c | 11 +++++++ multimedia/x264/files/patch-x264.c | 11 ------- 12 files changed, 114 insertions(+), 180 deletions(-) create mode 100644 multimedia/x264-devel/files/patch-muxers.c delete mode 100644 multimedia/x264-devel/files/patch-x264.c create mode 100644 multimedia/x264/files/patch-muxers.c delete mode 100644 multimedia/x264/files/patch-x264.c (limited to 'multimedia') diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index 0d6fbb9f8bd1..8eb875e54389 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= x264 -PORTVERSION= 0.0.20060112 -PORTREVISION= 1 +PORTVERSION= 0.0.20060509 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -18,10 +17,8 @@ COMMENT= Multimedia library and tool for encoding H.264/AVC video streams USE_BZIP2= yes USE_GETOPT_LONG=yes WRKSRC= ${WRKDIR}/${DISTNAME} -USE_REINPLACE= yes USE_GMAKE= yes ALL_TARGET= default -SHLIB_VER= 1 INSTALLS_SHLIB= yes HAS_CONFIGURE= yes @@ -29,7 +26,7 @@ PLIST_FILES= bin/x264 \ include/x264.h \ lib/libx264.a \ lib/libx264.so \ - lib/libx264.so.${SHLIB_VER} \ + lib/libx264.so.47 \ libdata/pkgconfig/x264.pc OPTIONS= GPAC "Enable MPEG-4 Output" On \ @@ -39,7 +36,8 @@ OPTIONS= GPAC "Enable MPEG-4 Output" On \ CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ - --disable-pthread + --disable-pthread \ + --enable-shared .include @@ -48,7 +46,7 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= ARCH_X86="1" .endif -.if ${ARCH}=="amd64" +.if ${ARCH}=="amd64" || ${ARCH}=="sparc64" BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm MAKE_ENV+= ARCH_X86_64="1" .endif @@ -71,20 +69,14 @@ CONFIGURE_ARGS+= --enable-visualize USE_XLIB= yes .endif -#post-patch: -# @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ -# ${WRKSRC}/configure +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/Makefile pre-install: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/x264.pc -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/x264 ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/x264.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/libx264.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libx264.so.${SHLIB_VER} ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/x264.pc ${PREFIX}/libdata/pkgconfig - ${LN} -sf libx264.so.${SHLIB_VER} ${PREFIX}/lib/libx264.so - .include diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index 853b32c1a2c8..c1388be4c796 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (x264-snapshot-20060112-2245.tar.bz2) = b4911ff276dcbe7d483490ddb5a0732f -SHA256 (x264-snapshot-20060112-2245.tar.bz2) = 46688deeea46659a5583004e0a10cd610a8553002424f045d201fe7fb51a95df -SIZE (x264-snapshot-20060112-2245.tar.bz2) = 373990 +MD5 (x264-snapshot-20060509-2245.tar.bz2) = 5c82cb170c5c23b6072bc31febbf0375 +SHA256 (x264-snapshot-20060509-2245.tar.bz2) = 1aaf6a4dfb137e0b7d0aaaa6c73a9038db805e5b2f89f376c896f7e8b95c4f0e +SIZE (x264-snapshot-20060509-2245.tar.bz2) = 500356 diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile index b08aa0a82ca3..f50410665714 100644 --- a/multimedia/x264-devel/files/patch-Makefile +++ b/multimedia/x264-devel/files/patch-Makefile @@ -1,36 +1,31 @@ ---- Makefile.orig Tue Nov 29 16:45:03 2005 -+++ Makefile Tue Nov 29 23:17:26 2005 -@@ -16,7 +16,7 @@ +--- Makefile.orig Tue May 9 16:45:02 2006 ++++ Makefile Tue May 9 22:14:14 2006 +@@ -18,7 +18,7 @@ endif # MMX/SSE optims -ifeq ($(ARCH),X86) -+ifdef ARCH_X86 - SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c ++ifeq ($(ARCH),i386) + SRCS += common/i386/mc-c.c common/i386/dct-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 \ -@@ -60,14 +60,21 @@ - DEP = depend - - .PHONY: default fprofiled clean distclean install uninstall --default: $(DEP) x264$(EXE) -+ -+SHARED_LIB = libx264.so -+SHARED_LIB_VER = $(SHARED_LIB).1 -+ -+default: $(DEP) x264$(EXE) $(SHARED_LIB_VER) +@@ -30,7 +30,7 @@ + endif - libx264.a: .depend $(OBJS) $(OBJASM) - ar rc libx264.a $(OBJS) $(OBJASM) - ranlib libx264.a + # MMX/SSE optims +-ifeq ($(ARCH),X86_64) ++ifeq ($(ARCH),amd64) + SRCS += common/i386/mc-c.c common/i386/dct-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,10 +47,6 @@ + endif --x264$(EXE): libx264.a x264.o matroska.o -- $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS) -+x264$(EXE): $(SHARED_LIB_VER) x264.o matroska.o -+ $(CC) -o $@ x264.o matroska.o $(SHARED_LIB_VER) $(LDFLAGS) -+ -+$(SHARED_LIB_VER): $(OBJS) libx264.a -+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) $(LDFLAGS) + # VIS optims +-ifeq ($(ARCH),UltraSparc) +-ASMSRC += common/sparc/pixel.asm +-OBJASM = $(ASMSRC:%.asm=%.o) +-endif - x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h) - make -C vfw/build/cygwin + ifneq ($(HAVE_GETOPT_LONG),1) + SRCS += extras/getopt.c diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure index 07e2121c6761..4519c8d6e197 100644 --- a/multimedia/x264-devel/files/patch-configure +++ b/multimedia/x264-devel/files/patch-configure @@ -1,40 +1,20 @@ ---- configure.orig Tue May 31 12:27:55 2005 -+++ configure Tue May 31 12:35:38 2005 -@@ -32,8 +32,8 @@ - vfw="no" - vis="no" - --CC="gcc" --CFLAGS="-Wall -I. -O4 -ffast-math -D__X264__" -+#CC="gcc" -+CFLAGS="-Wall -I. -ffast-math -D__X264__" - LDFLAGS="" - - AS="nasm" -@@ -85,9 +85,9 @@ - ARCH="X86" - CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" +--- configure.orig Tue May 9 16:45:02 2006 ++++ configure Tue May 9 22:04:19 2006 +@@ -129,7 +129,7 @@ + ASFLAGS="$ASFLAGS -f elf" + fi ;; - x86_64) -- ARCH="X86_64" -- CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" + x86_64 | amd64) -+ ARCH="amd64" -+ CFLAGS="$CFLAGS" + ARCH="X86_64" + CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" AS="yasm" - ASFLAGS="-f elf -m amd64" - ;; -@@ -100,9 +100,12 @@ - CFLAGS="$CFLAGS -maltivec -mabi=altivec" - fi +@@ -176,8 +176,6 @@ + ARCH="PARISC" ;; -+ "Sparc64" | sparc64) -+ ARCH="SPARC64" -+ CFLAGS="$CFLAGS" -+ ;; *) - echo "Unknown platform $UNAMEM, edit the configure" - exit 1 -+ CFLAGS="$CFLAGS" ;; esac + diff --git a/multimedia/x264-devel/files/patch-muxers.c b/multimedia/x264-devel/files/patch-muxers.c new file mode 100644 index 000000000000..fd20cad4806a --- /dev/null +++ b/multimedia/x264-devel/files/patch-muxers.c @@ -0,0 +1,11 @@ +--- muxers.c.orig Tue May 9 22:04:27 2006 ++++ muxers.c Tue May 9 22:04:37 2006 +@@ -647,7 +647,7 @@ + return -1; + + memset(p_mp4, 0, sizeof(mp4_t)); +- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL); ++ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE); + + if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL) + { diff --git a/multimedia/x264-devel/files/patch-x264.c b/multimedia/x264-devel/files/patch-x264.c deleted file mode 100644 index 14740f2f8abc..000000000000 --- a/multimedia/x264-devel/files/patch-x264.c +++ /dev/null @@ -1,11 +0,0 @@ ---- x264.c.orig Sun Oct 2 21:04:20 2005 -+++ x264.c Sun Oct 2 21:04:34 2005 -@@ -1475,7 +1475,7 @@ - return -1; - - memset(p_mp4, 0, sizeof(mp4_t)); -- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL); -+ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE); - - if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL) - { diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 0d6fbb9f8bd1..8eb875e54389 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -6,8 +6,7 @@ # PORTNAME= x264 -PORTVERSION= 0.0.20060112 -PORTREVISION= 1 +PORTVERSION= 0.0.20060509 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 @@ -18,10 +17,8 @@ COMMENT= Multimedia library and tool for encoding H.264/AVC video streams USE_BZIP2= yes USE_GETOPT_LONG=yes WRKSRC= ${WRKDIR}/${DISTNAME} -USE_REINPLACE= yes USE_GMAKE= yes ALL_TARGET= default -SHLIB_VER= 1 INSTALLS_SHLIB= yes HAS_CONFIGURE= yes @@ -29,7 +26,7 @@ PLIST_FILES= bin/x264 \ include/x264.h \ lib/libx264.a \ lib/libx264.so \ - lib/libx264.so.${SHLIB_VER} \ + lib/libx264.so.47 \ libdata/pkgconfig/x264.pc OPTIONS= GPAC "Enable MPEG-4 Output" On \ @@ -39,7 +36,8 @@ OPTIONS= GPAC "Enable MPEG-4 Output" On \ CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ - --disable-pthread + --disable-pthread \ + --enable-shared .include @@ -48,7 +46,7 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= ARCH_X86="1" .endif -.if ${ARCH}=="amd64" +.if ${ARCH}=="amd64" || ${ARCH}=="sparc64" BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm MAKE_ENV+= ARCH_X86_64="1" .endif @@ -71,20 +69,14 @@ CONFIGURE_ARGS+= --enable-visualize USE_XLIB= yes .endif -#post-patch: -# @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ -# ${WRKSRC}/configure +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/Makefile pre-install: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/x264.pc -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/x264 ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/x264.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/libx264.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libx264.so.${SHLIB_VER} ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/x264.pc ${PREFIX}/libdata/pkgconfig - ${LN} -sf libx264.so.${SHLIB_VER} ${PREFIX}/lib/libx264.so - .include diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo index 853b32c1a2c8..c1388be4c796 100644 --- a/multimedia/x264/distinfo +++ b/multimedia/x264/distinfo @@ -1,3 +1,3 @@ -MD5 (x264-snapshot-20060112-2245.tar.bz2) = b4911ff276dcbe7d483490ddb5a0732f -SHA256 (x264-snapshot-20060112-2245.tar.bz2) = 46688deeea46659a5583004e0a10cd610a8553002424f045d201fe7fb51a95df -SIZE (x264-snapshot-20060112-2245.tar.bz2) = 373990 +MD5 (x264-snapshot-20060509-2245.tar.bz2) = 5c82cb170c5c23b6072bc31febbf0375 +SHA256 (x264-snapshot-20060509-2245.tar.bz2) = 1aaf6a4dfb137e0b7d0aaaa6c73a9038db805e5b2f89f376c896f7e8b95c4f0e +SIZE (x264-snapshot-20060509-2245.tar.bz2) = 500356 diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile index b08aa0a82ca3..f50410665714 100644 --- a/multimedia/x264/files/patch-Makefile +++ b/multimedia/x264/files/patch-Makefile @@ -1,36 +1,31 @@ ---- Makefile.orig Tue Nov 29 16:45:03 2005 -+++ Makefile Tue Nov 29 23:17:26 2005 -@@ -16,7 +16,7 @@ +--- Makefile.orig Tue May 9 16:45:02 2006 ++++ Makefile Tue May 9 22:14:14 2006 +@@ -18,7 +18,7 @@ endif # MMX/SSE optims -ifeq ($(ARCH),X86) -+ifdef ARCH_X86 - SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c ++ifeq ($(ARCH),i386) + SRCS += common/i386/mc-c.c common/i386/dct-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 \ -@@ -60,14 +60,21 @@ - DEP = depend - - .PHONY: default fprofiled clean distclean install uninstall --default: $(DEP) x264$(EXE) -+ -+SHARED_LIB = libx264.so -+SHARED_LIB_VER = $(SHARED_LIB).1 -+ -+default: $(DEP) x264$(EXE) $(SHARED_LIB_VER) +@@ -30,7 +30,7 @@ + endif - libx264.a: .depend $(OBJS) $(OBJASM) - ar rc libx264.a $(OBJS) $(OBJASM) - ranlib libx264.a + # MMX/SSE optims +-ifeq ($(ARCH),X86_64) ++ifeq ($(ARCH),amd64) + SRCS += common/i386/mc-c.c common/i386/dct-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,10 +47,6 @@ + endif --x264$(EXE): libx264.a x264.o matroska.o -- $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS) -+x264$(EXE): $(SHARED_LIB_VER) x264.o matroska.o -+ $(CC) -o $@ x264.o matroska.o $(SHARED_LIB_VER) $(LDFLAGS) -+ -+$(SHARED_LIB_VER): $(OBJS) libx264.a -+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) $(LDFLAGS) + # VIS optims +-ifeq ($(ARCH),UltraSparc) +-ASMSRC += common/sparc/pixel.asm +-OBJASM = $(ASMSRC:%.asm=%.o) +-endif - x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h) - make -C vfw/build/cygwin + ifneq ($(HAVE_GETOPT_LONG),1) + SRCS += extras/getopt.c diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 07e2121c6761..4519c8d6e197 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,40 +1,20 @@ ---- configure.orig Tue May 31 12:27:55 2005 -+++ configure Tue May 31 12:35:38 2005 -@@ -32,8 +32,8 @@ - vfw="no" - vis="no" - --CC="gcc" --CFLAGS="-Wall -I. -O4 -ffast-math -D__X264__" -+#CC="gcc" -+CFLAGS="-Wall -I. -ffast-math -D__X264__" - LDFLAGS="" - - AS="nasm" -@@ -85,9 +85,9 @@ - ARCH="X86" - CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" +--- configure.orig Tue May 9 16:45:02 2006 ++++ configure Tue May 9 22:04:19 2006 +@@ -129,7 +129,7 @@ + ASFLAGS="$ASFLAGS -f elf" + fi ;; - x86_64) -- ARCH="X86_64" -- CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" + x86_64 | amd64) -+ ARCH="amd64" -+ CFLAGS="$CFLAGS" + ARCH="X86_64" + CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" AS="yasm" - ASFLAGS="-f elf -m amd64" - ;; -@@ -100,9 +100,12 @@ - CFLAGS="$CFLAGS -maltivec -mabi=altivec" - fi +@@ -176,8 +176,6 @@ + ARCH="PARISC" ;; -+ "Sparc64" | sparc64) -+ ARCH="SPARC64" -+ CFLAGS="$CFLAGS" -+ ;; *) - echo "Unknown platform $UNAMEM, edit the configure" - exit 1 -+ CFLAGS="$CFLAGS" ;; esac + diff --git a/multimedia/x264/files/patch-muxers.c b/multimedia/x264/files/patch-muxers.c new file mode 100644 index 000000000000..fd20cad4806a --- /dev/null +++ b/multimedia/x264/files/patch-muxers.c @@ -0,0 +1,11 @@ +--- muxers.c.orig Tue May 9 22:04:27 2006 ++++ muxers.c Tue May 9 22:04:37 2006 +@@ -647,7 +647,7 @@ + return -1; + + memset(p_mp4, 0, sizeof(mp4_t)); +- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL); ++ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE); + + if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL) + { diff --git a/multimedia/x264/files/patch-x264.c b/multimedia/x264/files/patch-x264.c deleted file mode 100644 index 14740f2f8abc..000000000000 --- a/multimedia/x264/files/patch-x264.c +++ /dev/null @@ -1,11 +0,0 @@ ---- x264.c.orig Sun Oct 2 21:04:20 2005 -+++ x264.c Sun Oct 2 21:04:34 2005 -@@ -1475,7 +1475,7 @@ - return -1; - - memset(p_mp4, 0, sizeof(mp4_t)); -- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL); -+ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE); - - if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL) - { -- cgit