* Update to 1.0.0

* Remove 5.x cruft
* Add OPTIONS

PR:		124562
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru>
Approved by:	pav

6 files changed, 29 insertions, 96 deletions

diff --git a/multimedia/gavl/Makefile b/multimedia/gavl/Makefile
index aa2a0767fa00..a325b0dd10bc 100644
--- a/multimedia/gavl/Makefile
+++ b/multimedia/gavl/Makefile
@@ -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_GNOME=	pkgconfig gnometarget gnomehack
 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 <bsd.port.pre.mk>
+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 <bsd.port.pre.mk>
 
-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 --git a/multimedia/gavl/distinfo b/multimedia/gavl/distinfo
index db860677c4b3..433cfc27f443 100644
--- a/multimedia/gavl/distinfo
+++ b/multimedia/gavl/distinfo
@@ -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 --git a/multimedia/gavl/files/gavl-c-_cmix_c.c-patch b/multimedia/gavl/files/gavl-c-_cmix_c.c-patch
deleted file mode 100644
index 6350aca75be2..000000000000
--- a/multimedia/gavl/files/gavl-c-_cmix_c.c-patch
+++ /dev/null
@@ -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 <machine/limits.h>
-+
-+#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 --git a/multimedia/gavl/files/gavl-mix.c-patch b/multimedia/gavl/files/gavl-mix.c-patch
deleted file mode 100644
index 9f624f7698e4..000000000000
--- a/multimedia/gavl/files/gavl-mix.c-patch
+++ /dev/null
@@ -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 <machine/limits.h>
-+
-+#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 --git a/multimedia/gavl/pkg-descr b/multimedia/gavl/pkg-descr
index 17b94a43010e..c3c4a3ebed5e 100644
--- a/multimedia/gavl/pkg-descr
+++ b/multimedia/gavl/pkg-descr
@@ -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.
-
- 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
+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)
+
+WWW: http://gmerlin.sourceforge.net/
diff --git a/multimedia/gavl/pkg-plist b/multimedia/gavl/pkg-plist
index a959c6641afd..b48c9a074cc7 100644
--- a/multimedia/gavl/pkg-plist
+++ b/multimedia/gavl/pkg-plist
@@ -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