From 9025920020b171f576094e3419efc071b3c8c44d Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 30 Aug 2011 18:53:24 +0000 Subject: [PATCH] - bugfix update to 1.3.2 * mostly bugfixes for windows or things that don't affect openbsd from brad (MAINTAINER) --- multimedia/xvidcore/Makefile | 8 +-- multimedia/xvidcore/distinfo | 10 ++-- .../patches/patch-build_generic_Makefile | 16 +++--- .../patches/patch-build_generic_configure | 54 +++++++++---------- multimedia/xvidcore/pkg/PLIST | 4 +- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile index 2f1f0fb95c6..bf504b24bb0 100644 --- a/multimedia/xvidcore/Makefile +++ b/multimedia/xvidcore/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2011/03/20 23:49:32 edd Exp $ +# $OpenBSD: Makefile,v 1.13 2011/08/30 18:53:24 jasper Exp $ COMMENT= ISO MPEG-4 compliant video codec -DISTNAME= xvidcore-1.3.0 +DISTNAME= xvidcore-1.3.2 CATEGORIES= multimedia MASTER_SITES= http://downloads.xvid.org/downloads/ @@ -17,11 +17,13 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= m WRKDIST= ${WRKDIR}/xvidcore WRKBUILD= ${WRKSRC}/build/generic +USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-assembly CONFIGURE_ENV= API_MAJOR=${LIBxvidcore_VERSION:R} \ @@ -30,7 +32,7 @@ CONFIGURE_ENV= API_MAJOR=${LIBxvidcore_VERSION:R} \ NO_REGRESS= Yes do-install: - ${INSTALL_DATA} ${WRKBUILD}/=build/libxvidcore.* ${PREFIX}/lib + ${INSTALL_DATA} ${WRKBUILD}/=build/libxvidcore.{a,so*} ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/src/xvid.h ${PREFIX}/include .include diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo index 92086c557ca..9e3f626c718 100644 --- a/multimedia/xvidcore/distinfo +++ b/multimedia/xvidcore/distinfo @@ -1,5 +1,5 @@ -MD5 (xvidcore-1.3.0.tar.gz) = L/CibXC1MmS8WZlpwrR4gg== -RMD160 (xvidcore-1.3.0.tar.gz) = 8vUh/9h1dep/YoHi8ms4mwPKbx4= -SHA1 (xvidcore-1.3.0.tar.gz) = KltQUVkkX60dPSNtyFXKaUnq1ME= -SHA256 (xvidcore-1.3.0.tar.gz) = ZxwxOFndASuzbG/oGSr2Y1fuQBZi+2ALiTfXxRwr8GI= -SIZE (xvidcore-1.3.0.tar.gz) = 816578 +MD5 (xvidcore-1.3.2.tar.gz) = h8jPe2nr7ZPC2C6lcJ0Jig== +RMD160 (xvidcore-1.3.2.tar.gz) = nGhhPan1orKZiPXgvty1y1mVdDg= +SHA1 (xvidcore-1.3.2.tar.gz) = VuBl0zFUWt4ExjyRFTuWJLUdbhs= +SHA256 (xvidcore-1.3.2.tar.gz) = hFMnJMR/RS0RZ5YuZKfPNPwiwm9tO3r6cwSjdl6XaJo= +SIZE (xvidcore-1.3.2.tar.gz) = 817743 diff --git a/multimedia/xvidcore/patches/patch-build_generic_Makefile b/multimedia/xvidcore/patches/patch-build_generic_Makefile index e0fb1ad78db..36dea806232 100644 --- a/multimedia/xvidcore/patches/patch-build_generic_Makefile +++ b/multimedia/xvidcore/patches/patch-build_generic_Makefile @@ -1,15 +1,15 @@ -$OpenBSD: patch-build_generic_Makefile,v 1.3 2011/03/20 23:49:33 edd Exp $ ---- build/generic/Makefile.orig Tue Jan 11 06:37:52 2011 -+++ build/generic/Makefile Sat Mar 5 16:51:43 2011 -@@ -44,6 +44,7 @@ include sources.inc - include platform.inc +$OpenBSD: patch-build_generic_Makefile,v 1.4 2011/08/30 18:53:24 jasper Exp $ +--- build/generic/Makefile.orig Thu May 19 04:27:26 2011 ++++ build/generic/Makefile Wed Jun 15 14:46:05 2011 +@@ -46,6 +46,7 @@ include platform.inc + endif RM = rm -rf +INSTALL = install -c ############################################################################## # -@@ -92,7 +93,7 @@ $(BUILD_DIR): +@@ -94,7 +95,7 @@ $(BUILD_DIR): .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION): @echo " A: $(@D)/$(&6 - echo "${ECHO_T}ok" >&6 +@@ -4333,7 +4331,7 @@ $as_echo "ok" >&6; } + $as_echo "ok" >&6; } STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)" SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)" - SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm" @@ -19,7 +19,7 @@ $OpenBSD: patch-build_generic_configure,v 1.5 2011/03/20 23:49:33 edd Exp $ SPECIFIC_CFLAGS="-fPIC" ;; [cC][yY][gG][wW][iI][nN]*|mingw32*|mks*) -@@ -4199,7 +4197,7 @@ echo "${ECHO_T}macho32" >&6 +@@ -4597,7 +4595,7 @@ $as_echo "macho32" >&6; } AS="$chosen_asm_prog" ASSEMBLY_EXTENSION="asm" @@ -28,29 +28,29 @@ $OpenBSD: patch-build_generic_configure,v 1.5 2011/03/20 23:49:33 edd Exp $ ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}" if test "$ARCHITECTURE" = "X86_64" ; then AFLAGS=${AFLAGS}" -DARCH_IS_X86_64" -@@ -4614,13 +4612,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - - fi - if test $ac_cv_header_pthread_h = yes; then -- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5 -+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6 - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4733,13 +4731,13 @@ done + if test x"$pthread" = x"yes" ; then + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" + if test "x$ac_cv_header_pthread_h" = xyes; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 +-$as_echo_n "checking for pthread_create in -lpthread... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5 ++$as_echo_n "checking for pthread_create in -pthread... " >&6; } + if ${ac_cv_lib_pthread_pthread_create+:} false; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4680,7 +4678,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthre - echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 - if test $ac_cv_lib_pthread_pthread_create = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -4771,7 +4769,7 @@ fi + $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } + if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD" -- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread" -+ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -pthread" +- SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread" ++ SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -pthread" else - { echo "$as_me:$LINENO: WARNING: Pthread not supported. No SMP support" >&5 - echo "$as_me: WARNING: Pthread not supported. No SMP support" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Pthread not supported. No SMP support" >&5 + $as_echo "$as_me: WARNING: Pthread not supported. No SMP support" >&2;} diff --git a/multimedia/xvidcore/pkg/PLIST b/multimedia/xvidcore/pkg/PLIST index 13760326ec1..ed83c999319 100644 --- a/multimedia/xvidcore/pkg/PLIST +++ b/multimedia/xvidcore/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2008/07/14 06:02:31 brad Exp $ +@comment $OpenBSD: PLIST,v 1.3 2011/08/30 18:53:24 jasper Exp $ include/xvid.h lib/libxvidcore.a %%SHARED%% -@comment lib/libxvidcore.def -@comment lib/libxvidcore.ld