From 15948b2172d3375d6e8e57512802152f4a649fd2 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Tue, 15 Jul 2014 20:14:43 +0000 Subject: [PATCH] - Add USES=libtool and INSTALL_TARGET=install-strip - Remove SSE option because it doesn't have any effect - Disable mmx when the MMX option is off - Remove a patch for gcc 3.4 --- multimedia/libfame/Makefile | 19 ++++++----------- multimedia/libfame/files/patch-mmx_one-gcc34 | 22 -------------------- multimedia/libfame/pkg-plist | 7 +++---- 3 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 multimedia/libfame/files/patch-mmx_one-gcc34 diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile index 4620a2a421dd..027a52ccc2e7 100644 --- a/multimedia/libfame/Makefile +++ b/multimedia/libfame/Makefile @@ -3,33 +3,26 @@ PORTNAME= libfame PORTVERSION= 0.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF/fame/${PORTNAME}/${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= Video encoding library -USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= libtool USE_LDCONFIG= yes -OPTIONS_DEFINE= SSE MMX -OPTIONS_DEFAULT= MMX +OPTIONS_DEFINE= MMX +OPTIONS_DEFAULT=MMX -SSE_DESC= SSE optimized routines (no effect in this release) - -SSE_CONFIGURE_ON= --enable-sse -MMX_CONFIGURE_ON= --enable-mmx +MMX_CONFIGURE_ENABLE= mmx post-patch: - @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ - ${WRKSRC}/configure @${REINPLACE_CMD} \ -e 's|AC_DEFUN(AM_PATH_LIBFAME|AC_DEFUN([AM_PATH_LIBFAME]|g' \ ${WRKSRC}/libfame.m4 ${WRKSRC}/libfame.m4.in -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfame-0.9.so.1 - .include diff --git a/multimedia/libfame/files/patch-mmx_one-gcc34 b/multimedia/libfame/files/patch-mmx_one-gcc34 deleted file mode 100644 index 114cb9a1da3e..000000000000 --- a/multimedia/libfame/files/patch-mmx_one-gcc34 +++ /dev/null @@ -1,22 +0,0 @@ ---- src/half_sse.h.orig Tue Dec 7 10:24:14 2004 -+++ src/half_sse.h Tue Dec 7 10:24:29 2004 -@@ -19,7 +19,7 @@ - */ - /**************************** half-pixel interpolation ***********************/ - --static short const _mmx_one[] = { 1, 1, 1, 1 }; -+const _mmx_one[] = { 1, 1, 1, 1 }; - static unsigned char const _mmx_one_byte[] = {1,1,1,1,1,1,1,1}; - - ---- src/half_mmx.h.orig Tue Dec 7 10:23:21 2004 -+++ src/half_mmx.h Tue Dec 7 10:23:32 2004 -@@ -18,7 +18,7 @@ - */ - /**************************** half-pixel interpolation ***********************/ - --static short const _mmx_one[] = { 1, 1, 1, 1 }; -+const _mmx_one[] = { 1, 1, 1, 1 }; - - static void inline mmx_interpolate(unsigned char **ref, - int pitch, diff --git a/multimedia/libfame/pkg-plist b/multimedia/libfame/pkg-plist index 5b24b740724d..d6a92a1466a9 100644 --- a/multimedia/libfame/pkg-plist +++ b/multimedia/libfame/pkg-plist @@ -25,11 +25,10 @@ include/fame_syntax.h include/fame_syntax_mpeg1.h include/fame_syntax_mpeg4.h include/fame_version.h -lib/libfame.a -lib/libfame.la -lib/libfame.so -lib/libfame-0.9.so lib/libfame-0.9.so.1 +lib/libfame-0.9.so.1.0.0 +lib/libfame.a +lib/libfame.so man/man3/fame_close.3.gz man/man3/fame_encode_frame.3.gz man/man3/fame_encode_slice.3.gz