cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- improve powerpc support:

Browse Source 
properly detect cpu at configure time
  enable ppc specific code where possible (i.e. where altivec is not needed)
- reorder dependencies and fix WANTLIB
This commit is contained in:
ajacoutot 2007-06-01 00:36:43 +00:00
parent c1e3376376
commit ed9e06f6c2
4 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
multimedia/avidemux/Makefile
View File

@ -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

13
multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_dsputil_c Normal file
View File

@ -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

13
multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_mpegvideo_c Normal file
View File

@ -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;

15
multimedia/avidemux/patches/patch-configure
View File

@ -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