From ed9e06f6c23361c2490532a2914e91d61bc3a972 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 1 Jun 2007 00:36:43 +0000 Subject: [PATCH] - improve powerpc support: properly detect cpu at configure time enable ppc specific code where possible (i.e. where altivec is not needed) - reorder dependencies and fix WANTLIB --- multimedia/avidemux/Makefile | 23 ++++++++----------- .../patch-avidemux_ADM_lavcodec_dsputil_c | 13 +++++++++++ .../patch-avidemux_ADM_lavcodec_mpegvideo_c | 13 +++++++++++ multimedia/avidemux/patches/patch-configure | 15 +++++++++--- 4 files changed, 48 insertions(+), 16 deletions(-) create mode 100644 multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_dsputil_c create mode 100644 multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_mpegvideo_c diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 5bf767f3061..410ae1637c9 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2007/04/08 17:34:54 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2007/06/01 00:36:43 ajacoutot Exp $ COMMENT= "free video editor" V= 2.3.0 DISTNAME= avidemux_${V} -PKGNAME= avidemux-${V}p1 +PKGNAME= avidemux-${V}p2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_BERLIOS:=avidemux/} @@ -18,24 +18,21 @@ PERMIT_PACKAGE_FTP= yes PERMIT_DISTFILES_CDROM= yes PERMIT_DISTFILES_FTP= yes -WANTLIB= freetype c stdc++ Xv ossaudio m X11 Xrender pthread \ - Xext fontconfig z pango-1.0 pangocairo-1.0 cairo.>=4 \ - atk-1.0 gmodule-2.0 gthread-2.0 glib-2.0 pangoft2-1.0 \ - gobject-2.0 Xau Xdmcp expat +WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ + Xrender Xv atk-1.0 c cairo expat faad fontconfig \ + freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \ + gthread-2.0 m ogg pango-1.0 pangocairo-1.0 \ + pangoft2-1.0 png pthread stdc++ z ossaudio MODULES= devel/gettext LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ - vorbis.>=5,vorbisenc.>=2::audio/libvorbis \ - mp3lame::audio/lame \ + faac::audio/faac \ js.>=1::lang/spidermonkey \ + mp3lame::audio/lame \ + vorbis.>=5,vorbisenc.>=2::audio/libvorbis \ xml2.>=9::textproc/libxml \ xvidcore.>=4::multimedia/xvidcore \ - faad::audio/faad \ - faac::audio/faac \ - glitz.>=1::graphics/glitz \ - ogg.>=5::audio/libogg \ - png.>=5::graphics/png \ x264::multimedia/x264 USE_X11= Yes diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_dsputil_c b/multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_dsputil_c new file mode 100644 index 00000000000..273e50e24eb --- /dev/null +++ b/multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_dsputil_c @@ -0,0 +1,13 @@ +$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 diff --git a/multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_mpegvideo_c b/multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_mpegvideo_c new file mode 100644 index 00000000000..719b9a92357 --- /dev/null +++ b/multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_mpegvideo_c @@ -0,0 +1,13 @@ +$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; diff --git a/multimedia/avidemux/patches/patch-configure b/multimedia/avidemux/patches/patch-configure index 6cd8e629e94..8073905195a 100644 --- a/multimedia/avidemux/patches/patch-configure +++ b/multimedia/avidemux/patches/patch-configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $ ---- configure.orig Sat Dec 2 20:09:09 2006 -+++ configure Sat Dec 2 20:14:38 2006 +$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 @@ -51,6 +51,15 @@ $OpenBSD: patch-configure,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $ 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