Hi.
This diff updates avidemux to the latest stable version and adds support
for esound.
Works fine here on amd64 playing with flv and mp4 files.
Comments/OK?
--
AntoineIndex: Makefile
===
RCS file: /cvs/ports/multimedia/avidemux/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile17 Nov 2007 20:39:02 - 1.11
+++ Makefile18 Mar 2008 15:55:48 -
@@ -2,11 +2,13 @@
COMMENT= free video editor
-V= 2.3.0
+V= 2.4.1
DISTNAME= avidemux_${V}
-PKGNAME= avidemux-${V}p4
+PKGNAME= avidemux-${V}
+
CATEGORIES=multimedia
-MASTER_SITES= ${MASTER_SITE_BERLIOS:=avidemux/}
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=avidemux/}
HOMEPAGE= http://fixounet.free.fr/avidemux/
@@ -19,7 +21,7 @@
PERMIT_DISTFILES_FTP= yes
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
- Xcomposite Xdamage pcre \
+ Xcomposite Xdamage pcre audiofile \
Xrender Xv atk-1.0 c cairo expat fontconfig \
freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gthread-2.0 m ogg pango-1.0 pangocairo-1.0 \
@@ -27,24 +29,32 @@
MODULES= devel/gettext
+BUILD_DEPENDS=
:autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
+
:automake-${AUTOMAKE_VERSION}.*:devel/automake/${AUTOMAKE_VERSION}
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
faac::audio/faac \
faad.=1::audio/faad \
- js.=1::lang/spidermonkey \
- mp3lame::audio/lame \
+ mp3lame.=1::audio/lame \
vorbis.=5,vorbisenc.=2::audio/libvorbis \
xml2.=9::textproc/libxml \
xvidcore.=4::multimedia/xvidcore \
- x264::multimedia/x264
+ x264::multimedia/x264 \
+ esd.=2::audio/esound
USE_X11= Yes
USE_LIBTOOL= Yes
-USE_GCC3= Yes
+USE_GMAKE= Yes
+
+# disable optimisations
+CFLAGS+= -O
+
+AUTOCONF_VERSION=2.59
+AUTOMAKE_VERSION=1.8
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/libpng \
- LDFLAGS=-L${LOCALBASE}/lib -logg
+ LDFLAGS=-L${LOCALBASE}/lib -logg -lm -lz
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-jsapi-include=${LOCALBASE}/include/js \
--enable-xv \
@@ -54,10 +64,20 @@
--with-oss \
--with-faac \
--with-faad2 \
+ --with-esd \
--without-arts \
- --without-esd \
--without-libdca \
--without-libsdl \
- --without-newfaad
+ --without-newfaad \
+ --without-aften \
+ --without-qt-dir \
+ --without-qt-includes \
+ --disable-ssse3 \
+ --disable-altivec
+
+pre-configure:
+ @cd ${WRKSRC} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION}
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ ${MAKE_PROGRAM} -f Makefile.dist
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/multimedia/avidemux/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo5 Apr 2007 16:20:06 - 1.3
+++ distinfo18 Mar 2008 15:55:48 -
@@ -1,5 +1,5 @@
-MD5 (avidemux_2.3.0.tar.gz) = FMWMFPyXV9NuTXJJhDHaQg==
-RMD160 (avidemux_2.3.0.tar.gz) = HhAYPUuAEEpC1Av9nZ6bXFSEPZ4=
-SHA1 (avidemux_2.3.0.tar.gz) = QKUdsiWT2RAiTayRtRJImmr0mfs=
-SHA256 (avidemux_2.3.0.tar.gz) = 7wg6sk4+xhKxDIoBY4Rf9oD+qEXV6t4h1g1H6EO0xiM=
-SIZE (avidemux_2.3.0.tar.gz) = 4750919
+MD5 (avidemux_2.4.1.tar.gz) = LZcva4eVyJHdbg6+UDWFKg==
+RMD160 (avidemux_2.4.1.tar.gz) = gUnrYstPMZbZi4wnB6QlLwbhmM8=
+SHA1 (avidemux_2.4.1.tar.gz) = a79UK6tz2Ry3PxmNLYr+ENg7KCE=
+SHA256 (avidemux_2.4.1.tar.gz) = 88etqdps1lzoQBJ9+nBipwBK8KRKLjpHT/FTsOfVC1E=
+SIZE (avidemux_2.4.1.tar.gz) = 5788014
Index: patches/patch-admin_detect-autoconf_sh
===
RCS file: patches/patch-admin_detect-autoconf_sh
diff -N patches/patch-admin_detect-autoconf_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-admin_detect-autoconf_sh 18 Mar 2008 15:55:48 -
@@ -0,0 +1,80 @@
+$OpenBSD$
+--- admin/detect-autoconf.sh.orig Tue Jan 8 15:02:17 2008
admin/detect-autoconf.sh Tue Jan 8 15:03:15 2008
+@@ -7,67 +7,6 @@ AUTOM4TE=autom4te
+ AUTOMAKE=automake
+ ACLOCAL=aclocal
+
+-
+-# We don't use variable here for remembering the type ... strings.
+-# local variables are not that portable, but we fear namespace issues with
+-# our includer. The repeated type calls are not that expensive.
+-checkAutoconf()
+-{
+- if test -x `$WHICH
