diff options
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 28 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 10 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-configure | 14 |
4 files changed, 27 insertions, 29 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index e89038222d1..6a76ceadc60 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.111 2013/06/29 14:53:39 wiz Exp $ +# $NetBSD: Makefile,v 1.112 2013/08/02 18:24:18 adam Exp $ -PKGNAME= ffmpeg-20130510.${DISTVERSION} -PKGREVISION= 2 +PKGNAME= ffmpeg-20130728.${DISTVERSION} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software @@ -19,8 +18,8 @@ CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-cross-compile -CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS:Q} -CONFIGURE_ARGS+= --arch=${MACHINE_ARCH:Q} +CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS} +CONFIGURE_ARGS+= --arch=${MACHINE_ARCH} CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q} CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q} .endif @@ -39,18 +38,17 @@ post-install: # disable asm on i386 for non-gcc and gcc < 4.2 # no alignment options needed for gcc >= 4.6 on i386 - .if ${MACHINE_ARCH} == "i386" -.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ - || !empty(MACHINE_PLATFORM:MSunOS-*-i386) -CONFIGURE_ARGS+= --disable-asm -.elif !empty(CC_VERSION:Mgcc-4.[2345]*) -CFLAGS+=-mstackrealign -mpreferred-stack-boundary=4 -.elif !empty(CC_VERSION:Mgcc-[123]*) \ - || !empty(CC_VERSION:Mgcc-4.[01]*) \ - || empty(CC_VERSION:Mgcc*) +. if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \ + || !empty(MACHINE_PLATFORM:MSunOS-*-i386) CONFIGURE_ARGS+= --disable-asm -.endif +. elif !empty(CC_VERSION:Mgcc-4.[2345]*) +CFLAGS+= -mstackrealign -mpreferred-stack-boundary=4 +. elif !empty(CC_VERSION:Mgcc-[123]*) \ + || !empty(CC_VERSION:Mgcc-4.[01]*) \ + || empty(CC_VERSION:Mgcc*) +CONFIGURE_ARGS+= --disable-asm +. endif .endif .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/multimedia/ffmpeg/Makefile.common b/multimedia/ffmpeg/Makefile.common index 4d0dd0dfd06..3c0b18de8bf 100644 --- a/multimedia/ffmpeg/Makefile.common +++ b/multimedia/ffmpeg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2013/05/13 14:42:32 adam Exp $ +# $NetBSD: Makefile.common,v 1.33 2013/08/02 18:24:18 adam Exp $ # used by multimedia/ffplay/Makefile # used by multimedia/ffmpeg/Makefile @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2 LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 -DISTVERSION= 1.2.1 +DISTVERSION= 1.2.2 PREV_PKGPATH= multimedia/ffmpeg-devel PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg/patches diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 32e090d0f72..31221a42db1 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.68 2013/05/13 14:42:32 adam Exp $ +$NetBSD: distinfo,v 1.69 2013/08/02 18:24:18 adam Exp $ -SHA1 (ffmpeg-1.2.1.tar.bz2) = 930e5612d75d04fdf7c0579f4d85d47e31e38945 -RMD160 (ffmpeg-1.2.1.tar.bz2) = bbccff41da7fb5731051b5bd4ececc41ed1d5749 -Size (ffmpeg-1.2.1.tar.bz2) = 5968378 bytes +SHA1 (ffmpeg-1.2.2.tar.bz2) = 5ccf4067f43853e5d63218aba13bc571b1108b5a +RMD160 (ffmpeg-1.2.2.tar.bz2) = 102edda2a14b234fe78605eccd2be88389c2821b +Size (ffmpeg-1.2.2.tar.bz2) = 5968091 bytes SHA1 (patch-aa) = 14006874aee07e7e41803269040f0ae0157d931d SHA1 (patch-ac) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 SHA1 (patch-ap) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e -SHA1 (patch-configure) = 2a1085bef529b883270a4d55450c202f83c478db +SHA1 (patch-configure) = a04493172f7600cc9ebbda6c140915b1169f5f14 diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure index bba13929a04..fb37fe28e00 100644 --- a/multimedia/ffmpeg/patches/patch-configure +++ b/multimedia/ffmpeg/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.18 2013/01/16 20:55:47 adam Exp $ +$NetBSD: patch-configure,v 1.19 2013/08/02 18:24:18 adam Exp $ ---- configure.orig 2013-01-06 21:53:29.000000000 +0000 +--- configure.orig 2013-07-27 23:49:20.000000000 +0000 +++ configure -@@ -3134,6 +3134,11 @@ case $target_os in +@@ -3225,6 +3225,11 @@ case $target_os in ;; netbsd) disable symver @@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.18 2013/01/16 20:55:47 adam Exp $ oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs -@@ -3469,10 +3474,13 @@ check_cc <<EOF && enable attribute_may_a +@@ -3555,10 +3560,13 @@ check_cc <<EOF && enable attribute_may_a union { int x; } __attribute__((may_alias)) x; EOF @@ -31,7 +31,7 @@ $NetBSD: patch-configure,v 1.18 2013/01/16 20:55:47 adam Exp $ if enabled alpha; then -@@ -4010,6 +4018,7 @@ enabled xmm_clobber_test && +@@ -4092,6 +4100,7 @@ enabled xmm_clobber_test && -Wl,--wrap,sws_scale || disable xmm_clobber_test @@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.18 2013/01/16 20:55:47 adam Exp $ echo "X{};" > $TMPV if test_ldflags -Wl,--version-script,$TMPV; then append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' -@@ -4022,6 +4031,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") +@@ -4104,6 +4113,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") void ff_foo(void) {} EOF fi @@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.18 2013/01/16 20:55:47 adam Exp $ if [ -z "$optflags" ]; then if enabled small; then -@@ -4517,7 +4527,7 @@ Version: $version +@@ -4560,7 +4570,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: |