diff options
| author | riggs <riggs@FreeBSD.org> | 2015-10-10 18:49:44 +0000 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2015-10-10 18:49:44 +0000 |
| commit | e9292b99035a7f9e4de60937b3029422e501301f (patch) | |
| tree | 99d2859efefff19bc40cdfadcf8d29655b7144d6 | |
| parent | 9e0908bde44802281fbeef2b99665f3eae08ce03 (diff) | |
| download | FreeBSD-ports-e9292b99035a7f9e4de60937b3029422e501301f.zip FreeBSD-ports-e9292b99035a7f9e4de60937b3029422e501301f.tar.gz | |
Update to upstream version 1.3.4 [1], take maintainership [2]
While on it:
- Handle CFLAGS with xvid's build system [2]
- Remove superfluous ln -sf in post-patch (now handled by
xvid's build system) [2]
- Pet portlint [2]
PR: 203626
Submitted by: w.litter@aon.at [1]
Reviewed by: riggs [2]
| -rw-r--r-- | multimedia/xvid/Makefile | 12 | ||||
| -rw-r--r-- | multimedia/xvid/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/xvid/files/extra-patch-cflags | 15 | ||||
| -rw-r--r-- | multimedia/xvid/files/patch-configure | 11 |
4 files changed, 23 insertions, 19 deletions
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile index bcfa3c8..11d070e 100644 --- a/multimedia/xvid/Makefile +++ b/multimedia/xvid/Makefile @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= xvid -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.4 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.xvid.org/downloads/ DISTNAME= ${PORTNAME}core-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= riggs@FreeBSD.org COMMENT= Opensource MPEG-4 codec, based on OpenDivx LICENSE= GPLv2 # or later @@ -25,7 +24,8 @@ CONFIGURE_ENV+= ac_cv_prog_ac_yasm=no PLIST_FILES= include/xvid.h \ lib/libxvidcore.a \ lib/libxvidcore.so \ - lib/libxvidcore.so.4 + lib/libxvidcore.so.4 \ + lib/libxvidcore.so.4.3 WRKSRC= ${WRKDIR}/xvidcore/build/generic @@ -41,11 +41,11 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS= # let xvid's build system decide about those +# let xvid's build system override CFLAGS +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cflags .endif post-install: - @${LN} -sf libxvidcore.so.4 ${STAGEDIR}${PREFIX}/lib/libxvidcore.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxvidcore.so .include <bsd.port.post.mk> diff --git a/multimedia/xvid/distinfo b/multimedia/xvid/distinfo index f929dc8..da509eb 100644 --- a/multimedia/xvid/distinfo +++ b/multimedia/xvid/distinfo @@ -1,2 +1,2 @@ -SHA256 (xvidcore-1.3.2.tar.gz) = 84532724c47f452d1167962e64a7cf34fc22c26f6d3b7afa7304a3765e97689a -SIZE (xvidcore-1.3.2.tar.gz) = 817743 +SHA256 (xvidcore-1.3.4.tar.gz) = 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f +SIZE (xvidcore-1.3.4.tar.gz) = 818067 diff --git a/multimedia/xvid/files/extra-patch-cflags b/multimedia/xvid/files/extra-patch-cflags new file mode 100644 index 0000000..ae2b30d --- /dev/null +++ b/multimedia/xvid/files/extra-patch-cflags @@ -0,0 +1,15 @@ +--- configure.orig 2015-06-21 14:21:32 UTC ++++ configure +@@ -2503,9 +2503,9 @@ if test x"$CFLAGS" = x"" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- force_default_cc_options="no" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } ++ force_default_cc_options="yes" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi + + ac_ext=c diff --git a/multimedia/xvid/files/patch-configure b/multimedia/xvid/files/patch-configure deleted file mode 100644 index a439f26..0000000 --- a/multimedia/xvid/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2011-05-23 10:22:01 UTC -+++ configure -@@ -4332,7 +4332,7 @@ $as_echo "ok" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 - $as_echo "ok" >&6; } - STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" -- SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)" -+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)" - SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm" - SPECIFIC_CFLAGS="-fPIC" - ;; |
