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

Cleanups from Brad:

Browse Source 
- Remove unused OSS patch chunks.
- Remove unnecessary patching for AltiVec as --disable-altivec is already used.
- Remove the whole chunk for fixing up the opimizations instead of doing
  CFLAGS=$CFLAGS & CXXFLAGS=$CXXFLAGS after removing the optimization flags
This commit is contained in:
ajacoutot 2012-04-13 06:24:19 +00:00
parent 1d60756007
commit d1a574ed89
1 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
multimedia/avidemux/patches/patch-configure_in_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in_in,v 1.6 2012/04/11 17:50:34 naddy Exp $
--- configure.in.in.orig Fri Feb 6 20:07:37 2009
+++ configure.in.in Wed Apr 11 17:42:08 2012
$OpenBSD: patch-configure_in_in,v 1.7 2012/04/13 06:24:19 ajacoutot Exp $
--- configure.in.in.orig Fri Feb 6 14:07:37 2009
+++ configure.in.in Wed Apr 11 15:44:50 2012
@@ -740,6 +740,37 @@ if test "x$with_esd" != "xno"; then
fi
fi
@ -39,24 +39,7 @@ $OpenBSD: patch-configure_in_in,v 1.6 2012/04/11 17:50:34 naddy Exp $
dnl ___________________ OSS ___________________
AC_ARG_WITH([oss],
[AC_HELP_STRING([--without-oss], [force compilation without OSS [default=test]])],
@@ -753,7 +784,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
@@ -768,6 +799,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
@@ -1153,10 +1185,39 @@ case $host_cpu in
@@ -1153,10 +1184,39 @@ case $host_cpu in
AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
echo "IA64"
;;
@ -96,7 +79,7 @@ $OpenBSD: patch-configure_in_in,v 1.6 2012/04/11 17:50:34 naddy Exp $
AC_DEFINE(FPM_SPARC,1,[Mad ])
AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian CPU - SPARC or PowerPC])
AC_DEFINE(ENABLE_MMX,0,[post proc])
@@ -1173,7 +1234,7 @@ case $host_cpu in
@@ -1173,7 +1233,7 @@ case $host_cpu in
AC_DEFINE(ENABLE_MMX,0,[post proc])
AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
;;
@ -105,29 +88,19 @@ $OpenBSD: patch-configure_in_in,v 1.6 2012/04/11 17:50:34 naddy Exp $
have_little_endian=no;
LMPG_OPT="";
AC_DEFINE(FPM_PPC,1,[Mad ])
@@ -1182,9 +1243,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])
;;
@@ -1324,11 +1382,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
@@ -1321,15 +1381,6 @@ if test "x$use_debug" = "xyes"; then
AC_DEFINE(ADM_DEBUG,1,[be verbose])
CXXFLAGS="$CXXFLAGS -O1 -g3"
CFLAGS="$CFLAGS -O1 -g3"
-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
- else
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
+ CXXFLAGS="$CXXFLAGS"
+ CFLAGS="$CFLAGS"
fi
- fi
fi
AC_ARG_WITH([gpt],