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?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/avidemux/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 17 Nov 2007 20:39:02 -0000 1.11
+++ Makefile 18 Mar 2008 15:55:48 -0000
@@ -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
--- distinfo 5 Apr 2007 16:20:06 -0000 1.3
+++ distinfo 18 Mar 2008 15:55:48 -0000
@@ -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 -0000
+++ patches/patch-admin_detect-autoconf_sh 18 Mar 2008 15:55:48 -0000
@@ -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 autoconf-2.5x`" ; then
+- AUTOCONF="`$WHICH autoconf-2.5x`"
+- elif test -x "`$WHICH autoconf-2.53`" ; then
+- AUTOCONF="`$WHICH autoconf-2.53`"
+- elif test -x "`$WHICH autoconf253`" ; then
+- AUTOCONF="`$WHICH autoconf253`"
+- elif test -x "`$WHICH autoconf-2.52`" ; then
+- AUTOCONF="`$WHICH autoconf-2.52`"
+- elif test -x "`$WHICH autoconf2.50`" ; then
+- AUTOCONF="`$WHICH autoconf2.50`"
+- fi
+-}
+-
+-checkAutoheader()
+-{
+- if test -x "`$WHICH autoheader-2.5x`" ; then
+- AUTOHEADER="`$WHICH autoheader-2.5x`"
+- AUTOM4TE="`$WHICH autom4te-2.5x`"
+- elif test -x "`$WHICH autoheader-2.53`" ; then
+- AUTOHEADER="`$WHICH autoheader-2.53`"
+- AUTOM4TE="`$WHICH autom4te-2.53`"
+- elif test -x "`$WHICH autoheader253`" ; then
+- AUTOHEADER="`$WHICH autoheader253`"
+- AUTOM4TE="`$WHICH autom4te253`"
+- elif test -x "`$WHICH autoheader-2.52`" ; then
+- AUTOHEADER="`$WHICH autoheader-2.52`"
+- elif test -x "`$WHICH autoheader2.50`" ; then
+- AUTOHEADER="`$WHICH autoheader2.50`"
+- fi
+-}
+-
+-checkAutomakeAclocal ()
+-{
+- if test -z "$UNSERMAKE"; then
+- if test -x "`$WHICH automake-1.8`" ; then
+- AUTOMAKE="`$WHICH automake-1.8`"
+- ACLOCAL="`$WHICH aclocal-1.8`"
+- elif test -x "`$WHICH automake-1.7`" ; then
+- AUTOMAKE="`$WHICH automake-1.7`"
+- ACLOCAL="`$WHICH aclocal-1.7`"
+- elif test -x "`$WHICH automake-1.5`" ; then
+- AUTOMAKE="`$WHICH automake-1.5`"
+- ACLOCAL="`$WHICH aclocal-1.5`"
+- elif test -x "`$WHICH automake15`" ; then
+- AUTOMAKE="`$WHICH automake15`"
+- ACLOCAL="`$WHICH aclocal15`"
+- elif test -x "`$WHICH automake-1.6`" ; then
+- AUTOMAKE="`$WHICH automake-1.6`"
+- ACLOCAL="`$WHICH aclocal-1.6`"
+- fi
+- else
+- AUTOMAKE="$UNSERMAKE"
+- fi
+-}
+-
+ checkWhich ()
+ {
+ WHICH=""
+@@ -78,8 +17,5 @@ checkWhich ()
+ }
+
+ checkWhich
+-checkAutoconf
+-checkAutoheader
+-checkAutomakeAclocal
+
+ export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL
Index: patches/patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp
===================================================================
RCS file:
/cvs/ports/multimedia/avidemux/patches/patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp
--- patches/patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp 29 Jun 2007
06:19:46 -0000 1.1
+++ patches/patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp 18 Mar 2008
15:55:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp,v 1.1 2007/06/29
06:19:46 jakemsr Exp $
---- avidemux/ADM_audiocodec/ADM_codecfaad.cpp.orig Thu May 31 22:55:01 2007
-+++ avidemux/ADM_audiocodec/ADM_codecfaad.cpp Thu May 31 23:02:00 2007
-@@ -34,11 +34,11 @@ ADM_faad::ADM_faad( uint32_t fourcc ,WAVHeader *info,u
+--- avidemux/ADM_audiocodec/ADM_codecfaad.cpp.orig Mon Jan 7 09:14:57 2008
++++ avidemux/ADM_audiocodec/ADM_codecfaad.cpp Mon Jan 7 09:16:14 2008
+@@ -34,11 +34,11 @@ ADM_faad::ADM_faad( uint32_t fourcc ,uint32_t highEffi
{
faacDecConfigurationPtr conf;
#ifdef OLD_FAAD_PROTO
@@ -15,7 +15,7 @@
_inited=0;
_instance=NULL;
_inbuffer=0;
-@@ -108,16 +108,16 @@ uint8_t ADM_faad::endDecompress( void )
+@@ -115,16 +115,16 @@ uint8_t ADM_faad::endDecompress( void )
uint8_t ADM_faad::run(uint8_t *inptr, uint32_t nbIn, float *outptr, uint32_t
*nbOut)
{
uint32_t xin;
Index: patches/patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp
===================================================================
RCS file: patches/patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp
diff -N patches/patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp
--- patches/patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp 6 Dec 2006
16:20:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp,v 1.2 2006/12/06
16:20:30 ajacoutot Exp $
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig Thu Oct 5 15:01:34 2006
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp Thu Oct 5 15:02:20 2006
-@@ -26,9 +26,14 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
-
--#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__)
-+#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #include <soundcard.h>
- const char *dsp = DEVOSSAUDIO;;
-+
-+#elif defined(__OpenBSD__)
-+ #include <soundcard.h>
-+ const char *dsp = "/dev/audio";
-+ const char *device_mixer = "/dev/mixer";
-
- #else
- #include <sys/soundcard.h>
Index: patches/patch-avidemux_ADM_lavcodec_Makefile_in
===================================================================
RCS file: patches/patch-avidemux_ADM_lavcodec_Makefile_in
diff -N patches/patch-avidemux_ADM_lavcodec_Makefile_in
--- patches/patch-avidemux_ADM_lavcodec_Makefile_in 6 Dec 2006 16:20:30
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_lavcodec_Makefile_in,v 1.1 2006/12/06 16:20:30
ajacoutot Exp $
---- avidemux/ADM_lavcodec/Makefile.in.orig Sat Nov 25 22:02:24 2006
-+++ avidemux/ADM_lavcodec/Makefile.in Sat Dec 2 20:08:12 2006
-@@ -398,7 +398,7 @@ amr_float i386 libpostproc ppc
-
-
- ####### kdevelop will overwrite this part!!! (end)############
--INCLUDES = $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3
-Iamr_float -I../avidemux/ADM_lavutil -I$(LAVUTIL)
-+INCLUDES = $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -Iamr_float
-I../avidemux/ADM_lavutil -I$(LAVUTIL)
- noinst_HEADERS =
- all: all-recursive
-
-@@ -1240,9 +1240,9 @@ uninstall-info: uninstall-info-recursive
-
- # for SSE we need special compil flags
- fft_sse.o:i386/fft_sse.c
-- $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H
$(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL) -I../..
-+ $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H
$(X_MMX_FLAGS) -msse -I$(LAVUTIL) -I../..
- vp3dsp_sse2.o:i386/vp3dsp_sse2.c
-- $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H
$(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL) -I../..
-+ $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H
$(X_MMX_FLAGS) -msse -I$(LAVUTIL) -I../..
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: patches/patch-avidemux_ADM_lavcodec_dsputil_c
===================================================================
RCS file: patches/patch-avidemux_ADM_lavcodec_dsputil_c
diff -N patches/patch-avidemux_ADM_lavcodec_dsputil_c
--- patches/patch-avidemux_ADM_lavcodec_dsputil_c 1 Jun 2007 00:36:43
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_lavcodec_dsputil_c,v 1.1 2007/06/01 00:36:43
ajacoutot Exp $
---- avidemux/ADM_lavcodec/dsputil.c.orig Fri Jun 1 00:23:29 2007
-+++ avidemux/ADM_lavcodec/dsputil.c Fri Jun 1 00:23:57 2007
-@@ -4119,9 +4119,6 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
- #ifdef ARCH_ALPHA
- dsputil_init_alpha(c, avctx);
- #endif
--#ifdef ARCH_POWERPC
-- dsputil_init_ppc(c, avctx);
--#endif
- #ifdef HAVE_MMI
- dsputil_init_mmi(c, avctx);
- #endif
Index: patches/patch-avidemux_ADM_lavcodec_mpegvideo_c
===================================================================
RCS file: patches/patch-avidemux_ADM_lavcodec_mpegvideo_c
diff -N patches/patch-avidemux_ADM_lavcodec_mpegvideo_c
--- patches/patch-avidemux_ADM_lavcodec_mpegvideo_c 1 Jun 2007 00:36:43
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_lavcodec_mpegvideo_c,v 1.1 2007/06/01 00:36:43
ajacoutot Exp $
---- avidemux/ADM_lavcodec/mpegvideo.c.orig Thu Jul 20 08:41:37 2006
-+++ avidemux/ADM_lavcodec/mpegvideo.c Fri Jun 1 00:55:07 2007
-@@ -292,9 +292,6 @@ int DCT_common_init(MpegEncContext *s)
- #ifdef ARCH_ARMV4L
- MPV_common_init_armv4l(s);
- #endif
--#ifdef ARCH_POWERPC
-- MPV_common_init_ppc(s);
--#endif
-
- #ifdef CONFIG_ENCODERS
- s->fast_dct_quantize= s->dct_quantize;
Index: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_Makefile_am
===================================================================
RCS file: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_Makefile_am
diff -N patches/patch-avidemux_ADM_libraries_ADM_lavcodec_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_libraries_ADM_lavcodec_Makefile_am 18 Mar
2008 15:55:48 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- avidemux/ADM_libraries/ADM_lavcodec/Makefile.am.orig Mon Jan 7
09:19:18 2008
++++ avidemux/ADM_libraries/ADM_lavcodec/Makefile.am Mon Jan 7 09:20:20 2008
+@@ -36,7 +36,7 @@ else
+ EXTEND_PPC=
+
+ endif
+-MYCFLAGS= -I. -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -I../.. -I$(LAVUTIL)
-Drestrict=__restrict__ -fomit-frame-pointer -include ffconf.h
++MYCFLAGS= -I. -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -I../.. -I$(LAVUTIL)
-Drestrict=__restrict__ -fomit-frame-pointer -include ffconf.h
+ # for SSE we need special compil flags
+ fft_sse.o:i386/fft_sse.c
+ $(CC) -o $@ $< -c $(MYCFLAGS) $(CFLAGS) $(all_includes) -I.. -msse
-I$(LAVUTIL) -I../../..
Index: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_dsputil_c
===================================================================
RCS file: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_dsputil_c
diff -N patches/patch-avidemux_ADM_libraries_ADM_lavcodec_dsputil_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_libraries_ADM_lavcodec_dsputil_c 18 Mar 2008
15:55:48 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- avidemux/ADM_libraries/ADM_lavcodec/dsputil.c.orig Wed Aug 22 20:05:57 2007
++++ avidemux/ADM_libraries/ADM_lavcodec/dsputil.c Mon Jan 7 09:23:11 2008
+@@ -4147,7 +4147,6 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx
+ if (ENABLE_MLIB) dsputil_init_mlib (c, avctx);
+ if (ENABLE_SPARC) dsputil_init_vis (c, avctx);
+ if (ENABLE_ALPHA) dsputil_init_alpha (c, avctx);
+- if (ENABLE_POWERPC) dsputil_init_ppc (c, avctx);
+ if (ENABLE_MMI) dsputil_init_mmi (c, avctx);
+ if (ENABLE_SH4) dsputil_init_sh4 (c, avctx);
+ if (ENABLE_BFIN) dsputil_init_bfin (c, avctx);
Index: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegaudiodec_c
===================================================================
RCS file: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegaudiodec_c
diff -N patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegaudiodec_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegaudiodec_c 18 Mar
2008 15:55:48 -0000
@@ -0,0 +1,74 @@
+$OpenBSD$
+--- avidemux/ADM_libraries/ADM_lavcodec/mpegaudiodec.c.orig Mon Jul 16
19:46:57 2007
++++ avidemux/ADM_libraries/ADM_lavcodec/mpegaudiodec.c Tue Jan 15 21:34:19 2008
+@@ -2357,70 +2357,6 @@ static int mp_decode_frame(MPADecodeContext *s,
+ return nb_frames * 32 * sizeof(OUT_INT) * s->nb_channels;
+ }
+
+-static int decode_frame(AVCodecContext * avctx,
+- void *data, int *data_size,
+- uint8_t * buf, int buf_size)
+-{
+- MPADecodeContext *s = avctx->priv_data;
+- uint32_t header;
+- int out_size;
+- OUT_INT *out_samples = data;
+-
+-retry:
+- if(buf_size < HEADER_SIZE)
+- return -1;
+-
+- header = AV_RB32(buf);
+- if(ff_mpa_check_header(header) < 0){
+- buf++;
+-// buf_size--;
+- av_log(avctx, AV_LOG_ERROR, "Header missing skipping one byte.\n");
+- goto retry;
+- }
+-
+- if (ff_mpegaudio_decode_header(s, header) == 1) {
+- /* free format: prepare to compute frame size */
+- s->frame_size = -1;
+- return -1;
+- }
+- /* update codec info */
+- avctx->channels = s->nb_channels;
+- avctx->bit_rate = s->bit_rate;
+- avctx->sub_id = s->layer;
+- switch(s->layer) {
+- case 1:
+- avctx->frame_size = 384;
+- break;
+- case 2:
+- avctx->frame_size = 1152;
+- break;
+- case 3:
+- if (s->lsf)
+- avctx->frame_size = 576;
+- else
+- avctx->frame_size = 1152;
+- break;
+- }
+-
+- if(s->frame_size<=0 || s->frame_size > buf_size){
+- av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
+- return -1;
+- }else if(s->frame_size < buf_size){
+- av_log(avctx, AV_LOG_ERROR, "incorrect frame size\n");
+- buf_size= s->frame_size;
+- }
+-
+- out_size = mp_decode_frame(s, out_samples, buf, buf_size);
+- if(out_size>=0){
+- *data_size = out_size;
+- avctx->sample_rate = s->sample_rate;
+- //FIXME maybe move the other codec info stuff from above here too
+- }else
+- av_log(avctx, AV_LOG_DEBUG, "Error while decoding MPEG audio
frame.\n"); //FIXME return -1 / but also return the number of bytes consumed
+- s->frame_size = 0;
+- return buf_size;
+-}
+-
+ static void flush(AVCodecContext *avctx){
+ MPADecodeContext *s = avctx->priv_data;
+ s->last_buf_size= 0;
Index: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegvideo_c
===================================================================
RCS file: patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegvideo_c
diff -N patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegvideo_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_libraries_ADM_lavcodec_mpegvideo_c 18 Mar
2008 15:55:48 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- avidemux/ADM_libraries/ADM_lavcodec/mpegvideo.c.orig Mon Jan 7
09:23:20 2008
++++ avidemux/ADM_libraries/ADM_lavcodec/mpegvideo.c Mon Jan 7 09:23:34 2008
+@@ -151,8 +151,6 @@ static int DCT_common_init(MpegEncContext *s)
+ MPV_common_init_mmi(s);
+ #elif defined(ARCH_ARMV4L)
+ MPV_common_init_armv4l(s);
+-#elif defined(ARCH_POWERPC)
+- MPV_common_init_ppc(s);
+ #elif defined(ARCH_BFIN)
+ MPV_common_init_bfin(s);
+ #endif
Index: patches/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c
===================================================================
RCS file: patches/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c
diff -N patches/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c 18 Mar
2008 15:55:48 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- avidemux/ADM_libraries/ADM_libswscale/yuv2rgb.c.orig Mon Jan 7
09:23:59 2008
++++ avidemux/ADM_libraries/ADM_libswscale/yuv2rgb.c Mon Jan 7 09:24:33 2008
+@@ -665,6 +665,9 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c)
+
+ switch(c->dstFormat){
+ case PIX_FMT_BGR32:
++#ifdef ADM_BIG_ENDIAN
++ case PIX_FMT_BGRA:
++#endif
+ case PIX_FMT_RGB32: return yuv2rgb_c_32;
+ case PIX_FMT_RGB24: return yuv2rgb_c_24_rgb;
+ case PIX_FMT_BGR24: return yuv2rgb_c_24_bgr;
Index: patches/patch-avidemux_ADM_libswscale_yuv2rgb_c
===================================================================
RCS file: patches/patch-avidemux_ADM_libswscale_yuv2rgb_c
diff -N patches/patch-avidemux_ADM_libswscale_yuv2rgb_c
--- patches/patch-avidemux_ADM_libswscale_yuv2rgb_c 8 Apr 2007 17:34:54
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_libswscale_yuv2rgb_c,v 1.2 2007/04/08 17:34:54
ajacoutot Exp $
---- avidemux/ADM_libswscale/yuv2rgb.c.orig Sun Oct 1 16:39:44 2006
-+++ avidemux/ADM_libswscale/yuv2rgb.c Sun Apr 8 11:03:46 2007
-@@ -620,6 +620,9 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c)
-
- switch(c->dstFormat){
- case PIX_FMT_BGR32:
-+#ifdef ADM_BIG_ENDIAN
-+ case PIX_FMT_BGRA:
-+#endif
- case PIX_FMT_RGB32: return yuv2rgb_c_32;
- case PIX_FMT_RGB24: return yuv2rgb_c_24_rgb;
- case PIX_FMT_BGR24: return yuv2rgb_c_24_bgr;
Index: patches/patch-avidemux_ADM_osSupport_ADM_crashdump_cpp
===================================================================
RCS file: patches/patch-avidemux_ADM_osSupport_ADM_crashdump_cpp
diff -N patches/patch-avidemux_ADM_osSupport_ADM_crashdump_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_osSupport_ADM_crashdump_cpp 18 Mar 2008
15:55:48 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+--- avidemux/ADM_osSupport/ADM_crashdump.cpp.orig Wed Jan 9 14:36:11 2008
++++ avidemux/ADM_osSupport/ADM_crashdump.cpp Wed Jan 9 15:26:39 2008
+@@ -249,7 +249,9 @@ EXCEPTION_DISPOSITION exceptionHandler(struct _EXCEPTI
+ }
+ #else
+ #include <signal.h>
++#ifndef __OpenBSD__
+ #include <execinfo.h>
++#endif
+ void sig_segfault_handler(int signo);
+ void installSigHandler()
+ {
+@@ -370,6 +372,10 @@ void ADM_backTrack(int lineno,const char *file)
+
+ saveCrashProject();
+ printf("\n*********** BACKTRACK **************\n");
++#ifdef __OpenBSD__
++ printf("\nNot supported under OpenBSD\n");
++ printf("*********** BACKTRACK **************\n");
++#else
+ count = backtrace(stack, 20);
+ functions = backtrace_symbols(stack, count);
+
+@@ -391,6 +397,7 @@ void ADM_backTrack(int lineno,const char *file)
+ const char *title="Crash BackTrace";
+ if(lineno) title="Assert failed";
+ diaFactoryRun(title,count+1,(diaElem **)txt);
++#endif
+
+ //
+ printf("Memory stat:\n");
Index: patches/patch-avidemux_ADM_script_ADM_JSFunctions_cpp
===================================================================
RCS file: patches/patch-avidemux_ADM_script_ADM_JSFunctions_cpp
diff -N patches/patch-avidemux_ADM_script_ADM_JSFunctions_cpp
--- patches/patch-avidemux_ADM_script_ADM_JSFunctions_cpp 8 Apr 2007
17:34:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_script_ADM_JSFunctions_cpp,v 1.2 2007/04/08
17:34:54 ajacoutot Exp $
---- avidemux/ADM_script/ADM_JSFunctions.cpp.orig Sun Oct 8 16:40:42 2006
-+++ avidemux/ADM_script/ADM_JSFunctions.cpp Sun Apr 8 11:03:46 2007
-@@ -325,7 +325,7 @@ JSBool systemExecute(JSContext *cx, JSObject *obj, uin
- // clear file descriptor table of forked process and fork
- #if defined( __linux__) || defined(__maxosx__)
- pid_t pidRtn = fork();
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
- pid_t pidRtn = rfork(RFPROC|RFCFDG);
- #endif
- if(pidRtn == 0)
Index: patches/patch-avidemux_ADM_script_DirectorySearch_cpp
===================================================================
RCS file: patches/patch-avidemux_ADM_script_DirectorySearch_cpp
diff -N patches/patch-avidemux_ADM_script_DirectorySearch_cpp
--- patches/patch-avidemux_ADM_script_DirectorySearch_cpp 8 Apr 2007
17:34:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-avidemux_ADM_script_DirectorySearch_cpp,v 1.2 2007/04/08
17:34:54 ajacoutot Exp $
---- avidemux/ADM_script/DirectorySearch.cpp.orig Sun Oct 8 16:40:42 2006
-+++ avidemux/ADM_script/DirectorySearch.cpp Sun Apr 8 11:03:46 2007
-@@ -29,7 +29,7 @@ int CDirectorySearch::_findnext(unsigned long int hDir
- strncpy(pfdData->name,pEntry->d_name,pEntry->d_reclen);
- // append NULL terminator
- pfdData->name[pEntry->d_reclen] = '\0';
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
- strncpy(pfdData->name,pEntry->d_name,pEntry->d_namlen);
- // append NULL terminator
- pfdData->name[pEntry->d_namlen] = '\0';
Index: patches/patch-avidemux_ADM_videoFilter_ADM_vidParticle_cpp
===================================================================
RCS file: patches/patch-avidemux_ADM_videoFilter_ADM_vidParticle_cpp
diff -N patches/patch-avidemux_ADM_videoFilter_ADM_vidParticle_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-avidemux_ADM_videoFilter_ADM_vidParticle_cpp 18 Mar 2008
15:55:48 -0000
@@ -0,0 +1,47 @@
+$OpenBSD$
+--- avidemux/ADM_videoFilter/ADM_vidParticle.cpp.orig Sun Feb 3 13:04:10 2008
++++ avidemux/ADM_videoFilter/ADM_vidParticle.cpp Mon Feb 18 10:50:21 2008
+@@ -797,8 +797,8 @@ uint8_t ImageTool::autoOutline (uint32_t x, uint32_t y
+
+ if (my_outImage)
+ {
+- uint32_t px = static_cast <uint32_t> (nearbyintf
(my_particle.centroidX));
+- uint32_t py = static_cast <uint32_t> (nearbyintf
(my_particle.centroidY));
++ uint32_t px = static_cast <uint32_t> (rint (my_particle.centroidX));
++ uint32_t py = static_cast <uint32_t> (rint (my_particle.centroidY));
+ if (validPixel (px, py))
+ outPixel (px, py) = 255;
+ else
+@@ -1157,8 +1157,8 @@ static inline
+ char & pixel_char (vector <string> & grid, int16_t xbase, int16_t ybase,
+ float cX, float cY, float dX, float dY)
+ {
+- uint16_t x = static_cast <uint16_t> (nearbyintf (cX + dX));
+- uint16_t y = static_cast <uint16_t> (nearbyintf (cY + dY));
++ uint16_t x = static_cast <uint16_t> (rint (cX + dX));
++ uint16_t y = static_cast <uint16_t> (rint (cY + dY));
+ return grid [y - ybase][x - xbase];
+ }
+
+@@ -1319,8 +1319,8 @@ void ImageTool::showStuff (ShowStuff what) const
+ ++plit;
+ }
+
+- uint32_t px = static_cast <uint32_t> (nearbyintf
(my_particle.centroidX));
+- uint32_t py = static_cast <uint32_t> (nearbyintf
(my_particle.centroidY));
++ uint32_t px = static_cast <uint32_t> (rint (my_particle.centroidX));
++ uint32_t py = static_cast <uint32_t> (rint (my_particle.centroidY));
+ char & ch = grid [py - ybase][px - xbase];
+ if (ch == 'x')
+ ch = 'X';
+@@ -1353,8 +1353,8 @@ void ImageTool::showStuff (ShowStuff what) const
+ }
+ }
+ }
+- uint32_t px = static_cast <uint32_t> (nearbyintf
(my_particle.centroidX));
+- uint32_t py = static_cast <uint32_t> (nearbyintf
(my_particle.centroidY));
++ uint32_t px = static_cast <uint32_t> (rint (my_particle.centroidX));
++ uint32_t py = static_cast <uint32_t> (rint (my_particle.centroidY));
+ char & ch = grid [py - ybase][px - xbase];
+ if (ch == '.')
+ ch = '*';
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 1 Jun 2007 00:36:43 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2007/06/01 00:36:43 ajacoutot Exp $
---- configure.orig Sat Nov 25 22:02:18 2006
-+++ configure Fri Jun 1 01:57:42 2007
-@@ -3277,13 +3277,13 @@ if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
-- CXXFLAGS="-g -O2"
-+ CXXFLAGS="-g"
- else
- CXXFLAGS="-g"
- fi
- else
- if test "$GXX" = yes; then
-- CXXFLAGS="-O2"
-+ CXXFLAGS=""
- else
- CXXFLAGS=
- fi
-@@ -4152,13 +4152,13 @@ if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-+ CFLAGS="-g"
- else
- CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-+ CFLAGS=""
- else
- CFLAGS=
- fi
-@@ -21469,7 +21469,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #ifdef __NetBSD__
-+ #if defined(__NetBSD__) || defined(__OpenBSD__)
- #include <sys/ioccom.h>
- #include <soundcard.h>
- #else
-@@ -21540,6 +21540,8 @@ cat >>confdefs.h <<\_ACEOF
- #define OSS_SUPPORT 1
- _ACEOF
-
-+LIBS="-lossaudio $LIBS"
-+
- fi
- fi
-
-@@ -25383,7 +25385,7 @@ cat >>confdefs.h <<\_ACEOF
- #define WORDS_BIGENDIAN 1
- _ACEOF
- ;;
-- ppc)
-+ powerpc)
- have_little_endian=no;
- LMPG_OPT="";
-
-@@ -25794,11 +25796,11 @@ _ACEOF
-
- else
- if test "x$use_builtin" = "x1"; then
-- CXXFLAGS="$CXXFLAGS -O3"
-- CFLAGS="$CFLAGS -O3"
-+ CXXFLAGS="$CXXFLAGS"
-+ CFLAGS="$CFLAGS"
- else
-- CXXFLAGS="$CXXFLAGS -O2"
-- CFLAGS="$CFLAGS -O2"
-+ CXXFLAGS="$CXXFLAGS"
-+ CFLAGS="$CFLAGS"
- fi
- fi
- if test "x$use_gpt" = "x1"; then
Index: patches/patch-configure_in_in
===================================================================
RCS file: patches/patch-configure_in_in
diff -N patches/patch-configure_in_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_in_in 18 Mar 2008 15:55:48 -0000
@@ -0,0 +1,55 @@
+$OpenBSD$
+--- configure.in.in.orig Mon Feb 18 09:35:13 2008
++++ configure.in.in Mon Feb 18 09:36:50 2008
+@@ -771,7 +771,7 @@ have_oss=no
+ if test "x$with_oss" != "xno"; then
+ AC_MSG_CHECKING(for OSS support)
+ AC_TRY_COMPILE([
+- #ifdef __NetBSD__
++ #if defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/ioccom.h>
+ #include <soundcard.h>
+ #else
+@@ -786,6 +786,7 @@ if test "x$with_oss" != "xno"; then
+
+ if test "x$have_oss" = "xyes"; then
+ AC_DEFINE(OSS_SUPPORT,1,[OSS detected])
++ LIBS="-lossaudio $LIBS"
+ fi
+ fi
+
+@@ -1191,7 +1192,7 @@ case $host_cpu in
+ AC_DEFINE(ENABLE_MMX,0,[post proc])
+ AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
+ ;;
+- ppc)
++ powerpc)
+ have_little_endian=no;
+ LMPG_OPT="";
+ AC_DEFINE(FPM_PPC,1,[Mad ])
+@@ -1200,9 +1201,6 @@ case $host_cpu in
+ AC_DEFINE(restrict,__restrict__,[roundup function])
+ AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian CPU - SPARC or PowerPC])
+ AC_DEFINE(ARCH_POWERPC,1,[Enable PowerPC optim])
+- AC_ARG_ENABLE(altivec,
+- AC_HELP_STRING([--enable-altivec], [enable AltiVec
acceleration (PowerPC)]),
+- have_altivec=yes)
+ AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian CPU - SPARC or PowerPC])
+ AC_DEFINE(ENABLE_MMX,0,[post proc])
+ ;;
+@@ -1342,11 +1340,11 @@ if test "x$use_debug" = "xyes"; then
+ else
+ dnl -- built-in means gcc3, for gcc 2 we stick to -O2 --
+ if test "x$use_builtin" = "xyes"; then
+- CXXFLAGS="$CXXFLAGS -O3"
+- CFLAGS="$CFLAGS -O3"
++ CXXFLAGS="$CXXFLAGS"
++ CFLAGS="$CFLAGS"
+ else
+- CXXFLAGS="$CXXFLAGS -O2"
+- CFLAGS="$CFLAGS -O2"
++ CXXFLAGS="$CXXFLAGS"
++ CFLAGS="$CFLAGS"
+ fi
+ fi
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/avidemux/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 6 Dec 2006 16:20:30 -0000 1.2
+++ pkg/PLIST 18 Mar 2008 15:55:48 -0000
@@ -1,9 +1,17 @@
@comment $OpenBSD: PLIST,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $
-bin/avidemux2
+bin/avidemux2_cli
+bin/avidemux2_gtk
+share/locale/ca/LC_MESSAGES/avidemux.mo
share/locale/cs/LC_MESSAGES/avidemux.mo
+share/locale/de/LC_MESSAGES/avidemux.mo
+share/locale/el/LC_MESSAGES/avidemux.mo
share/locale/es/LC_MESSAGES/avidemux.mo
share/locale/fr/LC_MESSAGES/avidemux.mo
[EMAIL PROTECTED] share/locale/klingon/
[EMAIL PROTECTED] share/locale/klingon/LC_MESSAGES/
[EMAIL PROTECTED] share/locale/klingon/LC_MESSAGES/avidemux.mo
+share/locale/it/LC_MESSAGES/avidemux.mo
+share/locale/ja/LC_MESSAGES/avidemux.mo
share/locale/ru/LC_MESSAGES/avidemux.mo
+share/locale/sr/LC_MESSAGES/avidemux.mo
+share/locale/[EMAIL PROTECTED]/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/avidemux.mo
+share/locale/tr/LC_MESSAGES/avidemux.mo
