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

sndio supported by default; drop ossaudio(3), artsd and esd support.

Browse Source
This commit is contained in:
jakemsr 2010-04-26 02:09:03 +00:00
parent fe75938e11
commit a7bf435011
15 changed files with 404 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
multimedia/avidemux/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.23 2010/03/20 16:56:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2010/04/26 02:09:03 jakemsr Exp $
COMMENT= free video editor
V= 2.4.4
DISTNAME= avidemux_${V}
PKGNAME= avidemux-${V}p2
PKGNAME= avidemux-${V}p3
CATEGORIES= multimedia
@ -19,11 +19,11 @@ PERMIT_DISTFILES_CDROM= yes
PERMIT_DISTFILES_FTP= yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xv atk-1.0 audiofile c cairo
WANTLIB += Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo
WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 m ogg ossaudio pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs sndio stdc++
WANTLIB += xcb z
WANTLIB += gobject-2.0 gthread-2.0 m ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs sndio
WANTLIB += stdc++ xcb xcb-render xcb-render-util z
MODULES= devel/gettext
@ -37,9 +37,7 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
xml2.>=9::textproc/libxml \
xvidcore.>=4::multimedia/xvidcore \
x264::multimedia/x264 \
artsc.>=1::x11/kde/arts3 \
esd::audio/esound
x264::multimedia/x264
USE_X11= Yes
USE_LIBTOOL= Yes
@ -52,21 +50,19 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib -logg -lm -lz"
# XXX TODO: remove arts, esd, oss
# add sndio
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-xv \
--with-x \
--with-freetype2 \
--with-lame \
--with-fontconfig \
--with-oss \
--with-faac \
--with-faad2 \
--with-esd \
--with-arts \
--without-libdca \
--without-libsdl \
--without-oss \
--without-esd \
--without-arts \
--without-libdca \
--without-newfaad \
--without-aften \
--without-qt-dir \
@ -81,6 +77,9 @@ pre-configure:
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
${MAKE_PROGRAM} -f Makefile.dist
pre-build:
@cp ${FILESDIR}/ADM_devicesndio.{cpp,h} ${WRKSRC}/avidemux/ADM_audiodevice/
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps

109
multimedia/avidemux/files/ADM_devicesndio.cpp Normal file
View File

@ -0,0 +1,109 @@
/*
* Copyright (c) 2010 Jacob Meuser <jakemsr@sdf.lonestar.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "config.h"
#if defined(USE_SNDIO)
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "default.h"
#include "ADM_audiodevice.h"
#include "ADM_assert.h"
#include "ADM_audiodevice/ADM_devicesndio.h"
#include "ADM_toolkit/toolkit.hxx"
#include "prefs.h"
uint8_t
sndioAudioDevice::setVolume(int volume)
{
}
uint8_t
sndioAudioDevice::stop(void)
{
if (hdl != NULL) {
sio_close(hdl);
hdl = NULL;
}
return 1;
}
uint8_t
sndioAudioDevice::init(uint8_t channels, uint32_t fq)
{
struct sio_par par;
_channels = channels;
printf("\n sndio : %lu Hz, %lu channels", fq, channels);
hdl = sio_open(NULL, SIO_PLAY, 0);
if (hdl == NULL) {
printf("\ncould not open sndio audio device\n");
return 0;
}
sio_initpar(&par);
par.rate = fq;
par.pchan = channels;
par.bits = 16;
par.sig = 1;
par.le = SIO_LE_NATIVE;
par.appbufsz = fq / 4;
if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
printf("\nerror configuring sndio device\n");
return 0;
}
if (par.rate != fq || par.pchan != channels || par.bits != 16 ||
par.sig != 1 || par.le != SIO_LE_NATIVE) {
printf("\ncould not set appropriate sndio parameters\n");
return 0;
}
if (!sio_start(hdl)) {
printf("\ncould not start sndio\n");
return 0;
}
return 1;
}
uint8_t
sndioAudioDevice::play(uint32_t len, float *data)
{
uint32_t w;
if (!hdl)
return 0;
dither16(data, len, _channels);
w = sio_write(hdl, data, len * 2);
if (w != len * 2)
printf("\nwarning: sio_write() returned short: %d of %d\n",
w, len * 2);
return 1;
}
#else
void dummy_sndio_func(void);
void dummy_sndio_func(void) {}
#endif

32
multimedia/avidemux/files/ADM_devicesndio.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2010 Jacob Meuser <jakemsr@sdf.lonestar.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef USE_SNDIO
#include <sndio.h>
class sndioAudioDevice : public audioDevice
{
protected:
struct sio_hdl *hdl;
public:
sndioAudioDevice(void) { hdl = NULL; }
virtual uint8_t init(uint8_t channels, uint32_t fq);
virtual uint8_t play(uint32_t len, float *data);
virtual uint8_t stop(void);
uint8_t setVolume(int volume);
};
#endif

36
multimedia/avidemux/patches/patch-avidemux_ADM_audiodevice_ADM_audiodevice_cpp Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-avidemux_ADM_audiodevice_ADM_audiodevice_cpp,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_audiodevice/ADM_audiodevice.cpp.orig Sat Jun 28 01:20:38 2008
+++ avidemux/ADM_audiodevice/ADM_audiodevice.cpp Wed Apr 21 09:32:24 2010
@@ -66,8 +66,10 @@
#include "ADM_audiodevice/ADM_deviceAudioCore.h"
#endif
+#ifdef USE_SNDIO
+#include "ADM_devicesndio.h"
+#endif
-
#include "gui_action.hxx"
#include "audio_out.h"
@@ -148,6 +150,7 @@ AUDIO_DEVICE id;
case DEVICE_ARTS:
case DEVICE_ALSA:
case DEVICE_COREAUDIO:
+ case DEVICE_SNDIO:
case DEVICE_SDL:
case DEVICE_WIN32:
case DEVICE_ESD:
@@ -255,6 +258,12 @@ void AVDM_switch(AUDIO_DEVICE action)
currentDevice=DEVICE_ALSA;
break;
+#endif
+#ifdef USE_SNDIO
+ case DEVICE_SNDIO:
+ device=new sndioAudioDevice;
+ currentDevice=DEVICE_SNDIO;
+ break;
#endif
#ifdef USE_SDL
case DEVICE_SDL:

21
multimedia/avidemux/patches/patch-avidemux_ADM_audiodevice_Makefile_am Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-avidemux_ADM_audiodevice_Makefile_am,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_audiodevice/Makefile.am.orig Wed Apr 21 07:07:08 2010
+++ avidemux/ADM_audiodevice/Makefile.am Wed Apr 21 07:08:44 2010
@@ -7,14 +7,14 @@ libADM_audiodevice_a_METASOURCES = AUTO
libADM_audiodevice_a_SOURCES = ADM_deviceArts.cpp ADM_audiodevice.cpp \
ADM_deviceoss.cpp ADM_deviceALSA.cpp ADM_deviceALSA.h ADM_deviceAudioCore.cpp \
- ADM_deviceSDL.cpp ADM_deviceWin32.cpp ADM_deviceEsd.cpp
+ ADM_deviceSDL.cpp ADM_deviceWin32.cpp ADM_deviceEsd.cpp ADM_devicesndio.cpp
EXTRA_DIST = ADM_audiodevice.cpp ADM_deviceArts.cpp \
ADM_deviceEsd.cpp ADM_deviceWin32.cpp audio_out.h \
ADM_audiodevice.h ADM_deviceArts.h ADM_deviceEsd.h ADM_deviceWin32.h oss_out.cpp \
-ADM_deviceALSA.cpp ADM_deviceAudioCore.cpp ADM_deviceSDL.cpp ADM_deviceoss.cpp \
-ADM_deviceALSA.h ADM_deviceAudioCore.h ADM_deviceSDL.h ADM_deviceoss.h
+ADM_deviceALSA.cpp ADM_deviceAudioCore.cpp ADM_deviceSDL.cpp ADM_deviceoss.cpp ADM_devicesndio.cpp \
+ADM_deviceALSA.h ADM_deviceAudioCore.h ADM_deviceSDL.h ADM_deviceoss.h ADM_devicesndio.h
####### kdevelop will overwrite this part!!! (end)############

21
multimedia/avidemux/patches/patch-avidemux_ADM_audiodevice_audio_out_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-avidemux_ADM_audiodevice_audio_out_h,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_audiodevice/audio_out.h.orig Wed Apr 21 07:14:40 2010
+++ avidemux/ADM_audiodevice/audio_out.h Wed Apr 21 07:15:34 2010
@@ -29,6 +29,7 @@ typedef enum
DEVICE_WIN32,
DEVICE_ESD,
DEVICE_JACK,
+ DEVICE_SNDIO,
DEVICE_PULSE_SIMPLE,
DEVICE_LIMIT
}AUDIO_DEVICE;
@@ -65,6 +66,9 @@ static const DEVICELIST audioDeviceList[]=
#endif
#ifdef USE_JACK
MKADID(JACK),
+#endif
+#ifdef USE_SNDIO
+ MKADID(SNDIO),
#endif
#ifdef USE_PULSE_SIMPLE
MKADID(PULSE_SIMPLE),

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

@ -0,0 +1,13 @@
$OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_default_h,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_libraries/ADM_utilities/default.h.orig Wed Apr 21 07:28:42 2010
+++ avidemux/ADM_libraries/ADM_utilities/default.h Wed Apr 21 07:29:03 2010
@@ -103,7 +103,8 @@ extern const char* translate(const char *__domainname,
#if (defined( HAVE_LIBESD) && defined(HAVE_ESD_H)) || \
defined(OSS_SUPPORT) || defined (USE_ARTS) || \
defined(USE_SDL) || defined(CONFIG_DARWIN) || \
- defined(ADM_WIN32) || defined(ALSA_SUPPORT)
+ defined(ADM_WIN32) || defined(ALSA_SUPPORT) || \
+ defined(USE_SNDIO)
#define HAVE_AUDIO
#endif

12
multimedia/avidemux/patches/patch-avidemux_ADM_libraries_ADM_utilities_prefs_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_prefs_cpp,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_libraries/ADM_utilities/prefs.cpp.orig Wed Jul 23 09:47:32 2008
+++ avidemux/ADM_libraries/ADM_utilities/prefs.cpp Wed Apr 21 10:42:49 2010
@@ -103,7 +103,7 @@ static opt_def opt_defs [] = {
#ifdef __WIN32
{"device.audiodevice", STRING,"WIN32",NULL, NULL, NULL },
#else
- {"device.audiodevice", STRING,"ALSA", NULL, NULL, NULL },
+ {"device.audiodevice", STRING,"SNDIO", NULL, NULL, NULL },
#endif
{"device.audio.alsa_device", STRING,"dmix", NULL, NULL, NULL },
{"device.videodevice", UINT, "0", NULL, "0", "10" },

39
multimedia/avidemux/patches/patch-avidemux_ADM_userInterfaces_ADM_commonUI_DIA_builtin_cpp Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-avidemux_ADM_userInterfaces_ADM_commonUI_DIA_builtin_cpp,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_userInterfaces/ADM_commonUI/DIA_builtin.cpp.orig Wed Apr 21 10:10:06 2010
+++ avidemux/ADM_userInterfaces/ADM_commonUI/DIA_builtin.cpp Wed Apr 21 10:13:02 2010
@@ -44,7 +44,7 @@
uint8_t DIA_builtin(void)
{
uint32_t altivec=0,mad=0,a52dec=0,xvid4=0,X264=0,freetype=0,esd=0,arts=0,vorbis=0,win32=0;
- uint32_t faac=0,faad=0,libdca=0,aften=0,libamrnb=0,lame=0,sdl=0,oss=0,xvideo=0,x86=0,x86_64=0,alsa=0;
+ uint32_t faac=0,faad=0,libdca=0,aften=0,libamrnb=0,lame=0,sdl=0,oss=0,xvideo=0,x86=0,x86_64=0,alsa,sndio=0;
uint32_t adm_powerpc=0,adm_gettext=0,adm_fontconfig=0;
#ifdef USE_FONTCONFIG
adm_fontconfig=1;
@@ -108,6 +108,9 @@ uint8_t DIA_builtin(void)
#ifdef ALSA_SUPPORT
alsa=1;
#endif
+#ifdef USE_SNDIO
+ sndio=1;
+#endif
#ifdef USE_XV
xvideo=1;
@@ -160,6 +163,7 @@ uint8_t DIA_builtin(void)
diaElemNotch tGettext(adm_gettext, QT_TR_NOOP("Gettext"));
diaElemNotch tAlsa(alsa, QT_TR_NOOP("ALSA"));
diaElemNotch tOss(oss, QT_TR_NOOP("OSS"));
+ diaElemNotch tSndio(sndio, QT_TR_NOOP("sndio"));
diaElemNotch tSdl(sdl, QT_TR_NOOP("SDL"));
diaElemNotch tXvideo(xvideo, QT_TR_NOOP("XVideo"));
@@ -170,7 +174,7 @@ uint8_t DIA_builtin(void)
diaElem *codecElems[] = {&videoFrame, &audioFrame};
- diaElem *libsElems[] = {&tArts, &tEsd, &tFontConfig, &tFreetype, &tGettext, &tAlsa, &tOss, &tSdl, &tXvideo};
+ diaElem *libsElems[] = {&tArts, &tEsd, &tFontConfig, &tFreetype, &tGettext, &tAlsa, &tOss, &tSdl, &tSndio, &tXvideo};
diaElem *CPUElems[] = {&tAltivec, &tPowerPc, &tX86, &tX86_64};
diaElemTabs tabCodec(QT_TR_NOOP("Codecs"), 2, codecElems);

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

@ -0,0 +1,13 @@
$OpenBSD: patch-avidemux_ADM_userInterfaces_ADM_commonUI_DIA_prefs_cpp,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp.orig Tue Sep 23 17:43:30 2008
+++ avidemux/ADM_userInterfaces/ADM_commonUI/DIA_prefs.cpp Wed Apr 21 10:35:12 2010
@@ -317,6 +317,9 @@ char *globalGlyphName=NULL;
#ifdef USE_JACK
{DEVICE_JACK, QT_TR_NOOP("JACK")},
#endif
+ #ifdef USE_SNDIO
+ {DEVICE_SNDIO, QT_TR_NOOP("SNDIO")},
+ #endif
#ifdef OSS_SUPPORT
{DEVICE_OSS, QT_TR_NOOP("OSS")},
#endif

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

@ -0,0 +1,13 @@
$OpenBSD: patch-avidemux_avi_vars_h,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/avi_vars.h.orig Wed Apr 21 07:22:01 2010
+++ avidemux/avi_vars.h Wed Apr 21 07:22:26 2010
@@ -16,7 +16,8 @@
#if (defined( HAVE_LIBESD) && defined(HAVE_ESD_H)) || \
defined(OSS_SUPPORT) || defined (USE_ARTS) || \
defined(USE_SDL) || defined(CONFIG_DARWIN) || \
- defined(ADM_WIN32) || defined(ALSA_SUPPORT)
+ defined(ADM_WIN32) || defined(ALSA_SUPPORT) || \
+ defined(USE_SNDIO)
#define HAVE_AUDIO
#endif

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

@ -0,0 +1,13 @@
$OpenBSD: patch-avidemux_gtk_gui_cpp,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/gtk_gui.cpp.orig Wed Apr 21 10:04:53 2010
+++ avidemux/gtk_gui.cpp Wed Apr 21 10:23:32 2010
@@ -307,6 +307,9 @@ int nw;
case ACT_SelectDevALSA:
AVDM_switch (DEVICE_ALSA);
return;break;
+ case ACT_SelectDevSNDIO:
+ AVDM_switch (DEVICE_SNDIO);
+ return;break;
#endif
case ACT_Fast:
ADM_assert(0);

11
multimedia/avidemux/patches/patch-avidemux_gui_action_names Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-avidemux_gui_action_names,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- avidemux/gui_action.names.orig Wed Apr 21 10:24:43 2010
+++ avidemux/gui_action.names Wed Apr 21 10:25:11 2010
@@ -95,6 +95,7 @@ ACT(SelectDevOSS)
ACT(SelectDevDummy)
ACT(SelectDevArts)
ACT(SelectDevALSA)
+ACT(SelectDevSNDIO)
ACT(CutWizard)

11
multimedia/avidemux/patches/patch-configure_in_bot Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-configure_in_bot,v 1.1 2010/04/26 02:09:03 jakemsr Exp $
--- configure.in.bot.orig Wed Apr 21 07:50:26 2010
+++ configure.in.bot Wed Apr 21 07:50:58 2010
@@ -29,6 +29,7 @@ echo " FreeType 2 : $have_freetype"
echo " gettext locale : $ADM_LOCALEDIR"
echo " Libxml2 : $have_xml2"
echo " OSS : $have_oss"
+echo " sndio : $have_sndio"
echo " SDL : $have_sdl"
echo " XVideo : $have_xv"
echo "********** Machine Dependent ***********"

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

@ -1,7 +1,45 @@
$OpenBSD: patch-configure_in_in,v 1.2 2009/02/10 10:11:00 ajacoutot Exp $
--- configure.in.in.orig Fri Feb 6 20:07:37 2009
+++ configure.in.in Tue Feb 10 10:02:28 2009
@@ -753,7 +753,7 @@ have_oss=no
$OpenBSD: patch-configure_in_in,v 1.3 2010/04/26 02:09:03 jakemsr Exp $
--- configure.in.in.orig Fri Feb 6 11:07:37 2009
+++ configure.in.in Wed Apr 21 07:45:17 2010
@@ -740,6 +740,37 @@ if test "x$with_esd" != "xno"; then
fi
fi
+dnl ___________________ sndio ___________________
+AC_ARG_WITH([sndio],
+ [AC_HELP_STRING([--without-sndio], [force compilation without sndio [default=test]])],
+ [with_sndio=${withval}], [with_sndio=test])
+
+AC_MSG_CHECKING([if sndio support is requested])
+AC_MSG_RESULT($with_sndio)
+
+have_sndio=no
+
+if test "x$with_sndio" != "xno"; then
+ AC_MSG_CHECKING(for sndio support)
+ AC_TRY_COMPILE([
+ #include <sndio.h>
+ ],[
+ int arg = SIO_LE_NATIVE;
+ ],[
+ have_sndio=yes
+ ])
+
+ if test "x$have_sndio" = "xyes"; then
+ AC_CHECK_LIB(sndio,sio_open,,have_sndio=no,-lsndio)
+ fi
+
+ AC_MSG_RESULT($have_sndio)
+
+ if test "x$have_sndio" = "xyes"; then
+ AC_DEFINE(USE_SNDIO,1,[sndio detected])
+ fi
+fi
+
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([
@ -10,7 +48,7 @@ $OpenBSD: patch-configure_in_in,v 1.2 2009/02/10 10:11:00 ajacoutot Exp $
#include <sys/ioccom.h>
#include <soundcard.h>
#else
@@ -768,6 +768,7 @@ if test "x$with_oss" != "xno"; then
@@ -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])
@ -18,7 +56,7 @@ $OpenBSD: patch-configure_in_in,v 1.2 2009/02/10 10:11:00 ajacoutot Exp $
fi
fi
@@ -1173,7 +1174,7 @@ case $host_cpu in
@@ -1173,7 +1205,7 @@ case $host_cpu in
AC_DEFINE(ENABLE_MMX,0,[post proc])
AC_DEFINE(HAVE_FAST_64BIT,1,"FFMPEG")
;;
@ -27,7 +65,7 @@ $OpenBSD: patch-configure_in_in,v 1.2 2009/02/10 10:11:00 ajacoutot Exp $
have_little_endian=no;
LMPG_OPT="";
AC_DEFINE(FPM_PPC,1,[Mad ])
@@ -1182,9 +1183,6 @@ case $host_cpu in
@@ -1182,9 +1214,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])
@ -37,7 +75,7 @@ $OpenBSD: patch-configure_in_in,v 1.2 2009/02/10 10:11:00 ajacoutot Exp $
AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian CPU - SPARC or PowerPC])
AC_DEFINE(ENABLE_MMX,0,[post proc])
;;
@@ -1324,11 +1322,11 @@ if test "x$use_debug" = "xyes"; then
@@ -1324,11 +1353,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