A bug fix update to xvidcore 1.3.2. Mostly bug fixes for Windows or things that don't affect us.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/xvidcore/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 20 Mar 2011 23:49:32 -0000 1.12 +++ Makefile 15 Jun 2011 18:52:59 -0000 @@ -2,7 +2,7 @@ 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_V 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 <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/multimedia/xvidcore/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 20 Mar 2011 23:49:33 -0000 1.8 +++ distinfo 15 Jun 2011 18:38:48 -0000 @@ -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 Index: patches/patch-build_generic_Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/xvidcore/patches/patch-build_generic_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-build_generic_Makefile --- patches/patch-build_generic_Makefile 20 Mar 2011 23:49:33 -0000 1.3 +++ patches/patch-build_generic_Makefile 15 Jun 2011 18:47:03 -0000 @@ -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 +--- 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)/$(<F)" @$(INSTALL) -d $(BUILD_DIR)/$(@D) @@ -18,7 +18,7 @@ $OpenBSD: patch-build_generic_Makefile,v #----------------------------------------------------------------------------- # Generic C rule -@@ -103,7 +104,7 @@ $(PPC_ALTIVEC_OBJECTS): CFLAGS+= $(ALTIVEC_CFLAGS) +@@ -105,7 +106,7 @@ $(PPC_ALTIVEC_OBJECTS): CFLAGS+= $(ALTIVEC_CFLAGS) .c.$(OBJECT_EXTENSION): @echo " C: $(@D)/$(<F)" @$(INSTALL) -d $(BUILD_DIR)/$(@D) @@ -27,7 +27,7 @@ $OpenBSD: patch-build_generic_Makefile,v #----------------------------------------------------------------------------- # Static Library -@@ -111,7 +112,7 @@ $(PPC_ALTIVEC_OBJECTS): CFLAGS+= $(ALTIVEC_CFLAGS) +@@ -113,7 +114,7 @@ $(PPC_ALTIVEC_OBJECTS): CFLAGS+= $(ALTIVEC_CFLAGS) $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS) @echo " L: $(@F)" Index: patches/patch-build_generic_configure =================================================================== RCS file: /home/cvs/ports/multimedia/xvidcore/patches/patch-build_generic_configure,v retrieving revision 1.5 diff -u -p -r1.5 patch-build_generic_configure --- patches/patch-build_generic_configure 20 Mar 2011 23:49:33 -0000 1.5 +++ patches/patch-build_generic_configure 15 Jun 2011 18:46:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-build_generic_configure,v 1.5 2011/03/20 23:49:33 edd Exp $ ---- build/generic/configure.orig Mon Feb 14 12:29:29 2011 -+++ build/generic/configure Sat Mar 5 16:55:23 2011 -@@ -1316,8 +1316,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +--- build/generic/configure.orig Mon May 23 06:22:01 2011 ++++ build/generic/configure Wed Jun 15 14:46:41 2011 +@@ -2243,8 +2243,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -10,8 +10,8 @@ $OpenBSD: patch-build_generic_configure, minimum_yasm_major_version=1 minimum_nasm_minor_version=0 -@@ -3939,7 +3937,7 @@ echo "${ECHO_T}ok" >&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, 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, 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;} Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/multimedia/xvidcore/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 14 Jul 2008 06:02:31 -0000 1.2 +++ pkg/PLIST 15 Jun 2011 18:53:08 -0000 @@ -2,5 +2,3 @@ include/xvid.h lib/libxvidcore.a %%SHARED%% -@comment lib/libxvidcore.def -@comment lib/libxvidcore.ld -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
