Files gavl.orig/.Makefile.swp and gavl/.Makefile.swp differ diff -ruN gavl.orig/Makefile gavl/Makefile --- gavl.orig/Makefile 2008-06-13 19:41:59.000000000 +0400 +++ gavl/Makefile 2008-06-13 20:50:21.000000000 +0400 @@ -6,9 +6,9 @@ # PORTNAME= gavl -PORTVERSION= 0.2.5 +PORTVERSION= 1.0.0 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gmerlin MAINTAINER= multimedia@FreeBSD.org @@ -21,34 +21,24 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --without-cpuflags + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --without-cpuflags --without-doxygen PORTDOCS= README -.include +OPTIONS= OPTIMIZED_CFLAGS "Additional optimizations" off -.if ${OSVERSION} < 504000 -EXTRA_PATCHES= ${PATCHDIR}/gavl-mix.c-patch \ - ${PATCHDIR}/gavl-c-_cmix_c.c-patch -.endif +.include -pre-everything:: -.if !defined(WITH_OPTIMIZED_CFLAGS) - @${ECHO_MSG} "===>" - @${ECHO_MSG} "===> Enable Optimized CFLAGS by defining" - @${ECHO_MSG} "===> WITH_OPTIMIZED_CFLAGS" - @${ECHO_MSG} "===>" +.if defined(WITH_OPTIMIZED_CFLAGS) && ${ARCH} == i386 && ${OSVERSION} < 700000 +# Build fails on FreeBSD-6.3 i386 with optimized cflags with gcc 3.4 +USE_GCC= 4.2+ .endif post-patch: -# No llrintf in freebsd (yet) -.if ${OSVERSION} < 504000 - @${REINPLACE_CMD} -e 's|llrintf|rintf|g' \ - ${WRKSRC}/gavl/c/*.* -.endif - @${REINPLACE_CMD} -e 's|CFLAGS="-Wall|CFLAGS="${CFLAGS} -Wall|g' \ - ${WRKSRC}/configure + # This is possibly wrong, but benchmark does not affect library functionality, so + @${REINPLACE_CMD} -e 's|CLOCK_PROCESS_CPUTIME_ID|CLOCK_PROF|g' \ + ${WRKSRC}/src/benchmark.c .if !defined(WITH_OPTIMIZED_CFLAGS) @${REINPLACE_CMD} -e \ 's|-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math||g' \ diff -ruN gavl.orig/distinfo gavl/distinfo --- gavl.orig/distinfo 2008-06-13 19:41:59.000000000 +0400 +++ gavl/distinfo 2008-06-13 19:47:36.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (gavl-0.2.5.tar.gz) = ef4e916c0422e02dd3df2b738b2e4546 -SHA256 (gavl-0.2.5.tar.gz) = a4e9bf74facb45be3ffcef8e6acee1243911e940b28508e34c20ef207256197a -SIZE (gavl-0.2.5.tar.gz) = 897188 +MD5 (gavl-1.0.0.tar.gz) = b0d89453b414a9a7f40471f3ac1b59ab +SHA256 (gavl-1.0.0.tar.gz) = 6ba28221734be08f8bccc2fdba221374319e8bab07baae4e6c276c43e022d65c +SIZE (gavl-1.0.0.tar.gz) = 1048751 diff -ruN gavl.orig/files/gavl-c-_cmix_c.c-patch gavl/files/gavl-c-_cmix_c.c-patch --- gavl.orig/files/gavl-c-_cmix_c.c-patch 2008-06-13 19:41:59.000000000 +0400 +++ gavl/files/gavl-c-_cmix_c.c-patch 1970-01-01 03:00:00.000000000 +0300 @@ -1,27 +0,0 @@ ---- gavl/c/_mix_c.c.orig Sun Aug 29 21:14:18 2004 -+++ gavl/c/_mix_c.c Sun Aug 29 21:19:30 2004 -@@ -1,3 +1,24 @@ -+#include -+ -+#ifndef INT8_MAX -+#define INT8_MAX SCHAR_MAX -+#endif -+#ifndef INT8_MIN -+#define INT8_MIN SCHAR_MIN -+#endif -+#ifndef INT16_MAX -+#define INT16_MAX SHRT_MAX -+#endif -+#ifndef INT16_MIN -+#define INT16_MIN SHRT_MIN -+#endif -+#ifndef INT32_MAX -+#define INT32_MAX LONG_MAX -+#endif -+#ifndef INT32_MIN -+#define INT32_MIN LONG_MIN -+#endif -+ - - static void RENAME(mix_1_to_1)(gavl_mix_output_channel_t * channel, - gavl_audio_frame_t * input_frame, diff -ruN gavl.orig/files/gavl-mix.c-patch gavl/files/gavl-mix.c-patch --- gavl.orig/files/gavl-mix.c-patch 2008-06-13 19:41:59.000000000 +0400 +++ gavl/files/gavl-mix.c-patch 1970-01-01 03:00:00.000000000 +0300 @@ -1,20 +0,0 @@ ---- gavl/mix.c.orig Sun Aug 29 21:27:05 2004 -+++ gavl/mix.c Sun Aug 29 21:29:27 2004 -@@ -31,6 +31,17 @@ - */ - - /* If we have more output- than input channels */ -+#include -+ -+#ifndef INT8_MAX -+#define INT8_MAX SCHAR_MAX -+#endif -+#ifndef INT16_MAX -+#define INT16_MAX SHRT_MAX -+#endif -+#ifndef INT32_MAX -+#define INT32_MAX LONG_MAX -+#endif - - #define FRONT_TO_REAR 1.0 - #define FRONT_TO_CENTER 1.0 diff -ruN gavl.orig/pkg-descr gavl/pkg-descr --- gavl.orig/pkg-descr 2008-06-13 19:41:59.000000000 +0400 +++ gavl/pkg-descr 2008-06-13 20:28:29.000000000 +0400 @@ -1,23 +1,12 @@ -Gavl (Gmerlin Audio Video Library) is a library for handling -uncompressed video and audio data. - -Support: - Colorspaces: RGB and BGR formats with 15, 16, 24 and 32 bpp, RGBA (32 bpp), - YUY2, Planar YUV formats: 4:2:0, 4:2:2, 4:4:4 with both MPEG and JPEG - quantization. +Gavl is short for Gmerlin Audio Video Library. It is a low level +library, upon which multimedia APIs can be built. Gavl handles all +the details of audio and video formats like colorspaces, samplerates, +multichannel configurations etc. It provides standardized definitions +for those formats as well as container structures for carrying audio +samples or video images inside an application. + +In addition, it handles the sometimes ugly task to convert between +all these formats and provides some elementary operations (copying, +scaling, alpha blending etc) - Alpha blending with user defined background color - - Audio PCM formats: 8 and 16 bit signed and unsigned, 32 bit signed, floating - point. Byte order is always machine native. - - Support for currently 6 audio channels (can easily be extended). Support for - speaker configurations. Downmixing, upmixing and reordering of channels is - done by the audio converter. - - Audio channels can be interleaved or not. - - Generic time type (64 bit, us precision) and routines for converting - frame/sample counts to time values and vice versa. - -WWW: http://gmerlin.sourceforge.net +WWW: http://gmerlin.sourceforge.net/ diff -ruN gavl.orig/pkg-plist gavl/pkg-plist --- gavl.orig/pkg-plist 2008-06-13 19:41:59.000000000 +0400 +++ gavl/pkg-plist 2008-06-13 20:13:53.000000000 +0400 @@ -1,7 +1,8 @@ include/gavl/gavl.h +include/gavl/gavl_version.h +include/gavl/gavldsp.h include/gavl/gavltime.h lib/gavl/include/gavlconfig.h -lib/libgavl.a lib/libgavl.la lib/libgavl.so lib/libgavl.so.0