summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acconfig.h18
-rw-r--r--configure.in47
-rwxr-xr-xcvscompile.sh14
-rw-r--r--m4/Makefile.am2
-rw-r--r--m4/_xine.m448
-rw-r--r--m4/irixal.m440
-rw-r--r--src/audio_out/Makefile.am20
-rw-r--r--src/input/Makefile.am11
-rw-r--r--src/input/input_dvd.c41
-rw-r--r--src/input/input_rtp.c4
-rw-r--r--src/input/input_vcd.c25
-rw-r--r--src/libw32dll/wine/Makefile.am4
-rw-r--r--src/video_out/yuv2rgb.c2
13 files changed, 210 insertions, 66 deletions
diff --git a/acconfig.h b/acconfig.h
index 6d8b3ca26..2e0d50d4e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,6 +17,9 @@
/* Define this if you're running Sparc architecture */
#undef __sparc__
+/* Define this if you're running Mips architecture */
+#undef __mips__
+
/* Define this if you have mlib installed */
#undef HAVE_MLIB
@@ -56,11 +59,18 @@
/* Define this if you have a usable Sun sound interface available */
#undef HAVE_SUNAUDIO
-/* Define this if you have kernel statistics available via kstat interface */
-#undef HAVE_KSTAT
+/* Define this if you have a usable IRIX al interface available */
+#undef HAVE_IRIXAL
/* Define this if you have ARTS (libartsc) installed */
#undef HAVE_ARTS
-/* Define this if you have ARTS (libartsc) installed */
-#undef HAVE_ARTS
+/* Define this if you have kernel statistics available via kstat interface */
+#undef HAVE_KSTAT
+
+/* Define this if you have CDROM ioctls */
+#undef HAVE_CDROM_IOCTLS
+
+/* Define this if you have ip_mreqn in netinet/in.h */
+#undef HAVE_IP_MREQN
+
diff --git a/configure.in b/configure.in
index 27fdcd06f..1e3beb59e 100644
--- a/configure.in
+++ b/configure.in
@@ -79,13 +79,6 @@ AC_SUBST(STATIC)
dnl
-dnl Build all libs as static
-dnl
-BUILD_LIB_STATIC="-static"
-AC_SUBST(BUILD_LIB_STATIC)
-
-
-dnl
dnl Checks for typedefs, structures, and compiler characteristics.
dnl
AC_C_BIGENDIAN
@@ -274,6 +267,14 @@ AC_MSG_RESULT($have_sunaudio)
AM_CONDITIONAL(HAVE_SUNAUDIO, test x"$have_sunaudio" = "xyes")
dnl
+dnl IRIX style audio interface
+dnl
+AM_PATH_IRIXAL(0,
+ AC_DEFINE(HAVE_IRIXAL),
+ AC_MSG_RESULT(*** All of IRIX AL dependent parts will be disabled ***))
+AM_CONDITIONAL(HAVE_IRIXAL, test "x$have_irixal" = xyes)
+
+dnl
dnl Solaris kstat kernel statistics
dnl
AC_CHECK_LIB(kstat, kstat_open,
@@ -282,6 +283,19 @@ AC_CHECK_LIB(kstat, kstat_open,
AC_SUBST(KSTAT_LIBS)
dnl
+dnl cdrom ioctls
+dnl
+AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h)
+AM_CHECK_CDROM_IOCTLS(AC_DEFINE(HAVE_CDROM_IOCTLS),
+ AC_MSG_RESULT(*** DVD and (S)VCD support will be disabled ***))
+AM_CONDITIONAL(HAVE_CDROM_IOCTLS, test x"$have_cdrom_ioctls" = "xyes")
+
+dnl
+dnl ip_mreqn
+dnl
+AC_CHECK_IP_MREQN
+
+dnl
dnl Some extra checks.
dnl
AC_HAVE_FUNCS(sigaction sigset getpwuid_r)
@@ -298,16 +312,19 @@ AC_TRY_CFLAGS("-fno-strict-aliasing", f_nsa="-fno-strict-aliasing", f_nsa="")
AC_TRY_CFLAGS("-fschedule-insns2", f_si="-fschedule-insns2", f_si="")
AC_TRY_CFLAGS("-mwide-multiply", m_wm="-mwide-multiply", m_wm="")
+dnl Flags not supported by all *cc* variants
+AC_TRY_CFLAGS("-Wall", wall="-Wall", wall="")
+
dnl Common cflags for all platforms
-COMMON_CFLAGS="-Wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE"
+COMMON_CFLAGS="$wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE"
enable_w32dll="no"
case $host in
i386-*-freebsd*)
GLOBAL_CFLAGS="$GLOBAL_CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
- GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS"
- DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS $CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS -DDEBUG"
+ GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS"
+ DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS $CFLAGS"
AC_DEFINE(__i386__)
AC_DEFINE([ARCH_X86],,[x86 architecture])
@@ -402,14 +419,18 @@ case $host in
GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mcpu=v8 -mtune=ultrasparc -funroll-loops -funroll-all-loops -finline-functions"
DEBUG_CFLAGS="$DEBUG_CFLAGS -O -mcpu=v8 -mtune=ultrasparc -funroll-loops -funroll-all-loops -finline-functions"
;;
+ mips-*)
+ GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3"
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+ ;;
*) echo "$host is not currently supported by xine"; exit 1;;
esac
-
- GLOBAL_CFLAGS="$GLOBAL_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS"
- DEBUG_CFLAGS="$DEBUG_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS -g -DDEBUG"
;;
esac
+GLOBAL_CFLAGS="$GLOBAL_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
+DEBUG_CFLAGS="$DEBUG_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS -g -DDEBUG"
+
AM_CONDITIONAL(HAVE_W32DLL, test x"$enable_w32dll" = "xyes")
if test x"$enable_w32dll" = "xyes"; then
W32DLL_DEP=""
diff --git a/cvscompile.sh b/cvscompile.sh
index ebbdc4be5..23e57daaa 100755
--- a/cvscompile.sh
+++ b/cvscompile.sh
@@ -1,20 +1,20 @@
#!/bin/sh
# Run this to generate all the initial Makefiles, etc.
-m4_files="_xine.m4 alsa.m4 arts.m4 esd.m4 aa.m4"
-if test -d m4; then
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+#m4_files="_xine.m4 alsa.m4 arts.m4 esd.m4 aa.m4 irixal.m4"
+if test -d $srcdir/m4; then
rm -f acinclude.m4
- for m4f in $m4_files; do
- cat m4/$m4f >> acinclude.m4
+ for m4f in $srcdir/m4/*.m4; do
+ cat $m4f >> acinclude.m4
done
else
echo "Directory 'm4' is missing."
exit 1
fi
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
(test -f $srcdir/configure.in) || {
echo -n "*** Error ***: Directory "\`$srcdir\'" does not look like the"
echo " top-level directory"
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 4b1db639e..62ec11511 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -6,7 +6,7 @@ m4datadir = @ACLOCAL_DIR@
m4data_DATA = xine.m4
endif
-EXTRA_DIST = _xine.m4 alsa.m4 arts.m4 esd.m4 xine.m4 aa.m4
+EXTRA_DIST = _xine.m4 alsa.m4 arts.m4 esd.m4 xine.m4 aa.m4 irixal.m4
debug:
diff --git a/m4/_xine.m4 b/m4/_xine.m4
index 745453e41..6d89dfd97 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -128,3 +128,51 @@ AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
AC_TRY_COMPILE([],[switch (0) case 0: case (sizeof ($1) == $2):;],[],
[AC_MSG_ERROR([can not build a default inttypes.h])])
AC_MSG_RESULT([yes])])
+
+
+dnl AM_CHECK_CDROM_IOCTLS ([ACTION-IF-YES], [ACTION-IF-NO])
+dnl check for CDROM_DRIVE_STATUS in ioctl.h
+AC_DEFUN([AM_CHECK_CDROM_IOCTLS],
+ [AC_CACHE_CHECK([if cdrom ioctls are available],
+ [am_cv_have_cdrom_ioctls],
+ [AC_EGREP_HEADER([CDROM_DRIVE_STATUS],[sys/ioctl.h],
+ am_cv_have_cdrom_ioctls=yes,
+ [AC_EGREP_HEADER([CDIOCALLOW],[sys/ioctl.h],
+ am_cv_have_cdrom_ioctls=yes,
+ [AC_EGREP_CPP(we_have_cdrom_ioctls,[
+#include <sys/ioctl.h>
+#ifdef HAVE_SYS_CDIO_H
+# include <sys/cdio.h>
+#endif
+#ifdef HAVE_LINUX_CDROM_H
+# include <linux/cdrom.h>
+#endif
+#if defined(CDROM_DRIVE_STATUS) || defined(CDIOCALLOW)
+ we_have_cdrom_ioctls
+#endif
+],
+ am_cv_have_cdrom_ioctls=yes,
+ am_cv_have_cdrom_ioctls=no
+ )])])])
+ have_cdrom_ioctls=$am_cv_have_cdrom_ioctls
+ if test "x$have_cdrom_ioctls" = xyes ; then
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
+])
+
+
+dnl AC_CHECK_IP_MREQN
+dnl check for struct ip_mreqn in netinet/in.h
+AC_DEFUN([AC_CHECK_IP_MREQN],
+ [AC_CACHE_CHECK([for ip_mreqn],[ac_cv_have_ip_mreqn],
+ [AC_EGREP_HEADER([ip_mreqn],[netinet/in.h],
+ ac_cv_have_ip_mreqn=yes,ac_cv_have_ip_mreqn=no)
+ ])
+ have_ip_mreqn=$ac_cv_have_ip_mreqn
+ if test "x$have_ip_mreqn" = xyes ; then
+ AC_DEFINE(HAVE_IP_MREQN)
+ fi
+])
+
diff --git a/m4/irixal.m4 b/m4/irixal.m4
new file mode 100644
index 000000000..a613eb4d4
--- /dev/null
+++ b/m4/irixal.m4
@@ -0,0 +1,40 @@
+dnl Configure paths/version for IRIX AL
+dnl
+AC_DEFUN(AM_PATH_IRIXAL,
+ [
+dnl replace by test
+ AC_ARG_ENABLE(irixal, [ --enable-irixal Turn on IRIX AL audio support.], enable_irixal=yes, enable_irixal=no)
+
+ AC_ARG_WITH(irixal-prefix,[ --irixal-prefix=pfx Prefix where al is installed (optional)],
+ irixal_prefix="$withval", irixal_prefix="")
+
+ AC_MSG_CHECKING([for IRIX AL support])
+ if test "x$enable_irixal" = xyes ; then
+
+ if test x$irixal_prefix != x ; then
+ IRIXAL_LIBS="-L$al_prefix/lib"
+ IRIXAL_STATIC_LIB="$al_prefix"
+ IRIXAL_CFLAGS="-I$al_prefix/include"
+ fi
+
+ IRIXAL_LIBS="-laudio $IRIXAL_LIBS"
+ if test x$IRIXAL_STATIC_LIB != x; then
+ IRIXAL_STATIC_LIB="$IRIXAL_STATIC_LIB/lib/libaudio.a"
+ else
+ IRIXAL_STATIC_LIB="/usr/lib/libaudio.a"
+ fi
+ fi
+
+ AC_MSG_RESULT($enable_irixal)
+ if test "x$enable_irixal" = xyes ; then
+ ifelse([$2], , :, [$2])
+ else
+ ifelse([$3], , :, [$3])
+ fi
+
+ AC_SUBST(IRIXAL_CFLAGS)
+ AC_SUBST(IRIXAL_STATIC_LIB)
+ AC_SUBST(IRIXAL_LIBS)
+
+])
+
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index ef0a646c9..091942f9f 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -1,6 +1,7 @@
-CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(ARTS_CFLAGS)
+CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS)
-EXTRA_DIST = audio_alsa_out.c audio_alsa05_out.c audio_esd_out.c audio_sun_out.c audio_arts_out.c
+EXTRA_DIST = audio_alsa_out.c audio_alsa05_out.c audio_esd_out.c \
+ audio_sun_out.c audio_arts_out.c #audio_irixal_out.c
LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
@@ -26,6 +27,10 @@ if HAVE_SUNAUDIO
sun_module = xineplug_ao_out_sun.la
endif
+if HAVE_IRIXAL
+irixal_module = xineplug_ao_out_irixal.la
+endif
+
if HAVE_ARTS
arts_module = xineplug_ao_out_arts.la
endif
@@ -36,13 +41,14 @@ endif
# All of xine audio out plugins should be named like the
# scheme "xineplug_ao_out_"
#
-lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(sun_module) $(arts_module) $(esd_module)
+lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(sun_module) \
+ $(irixal_module) $(arts_module) $(esd_module)
xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c resample.c
xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c audio_alsa05_out.c \
- resample.c
+ resample.c
xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS)
xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module
@@ -53,12 +59,16 @@ xineplug_ao_out_esd_la_LDFLAGS = -avoid-version -module
xineplug_ao_out_sun_la_SOURCES = audio_sun_out.c resample.c
xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module
+xineplug_ao_out_irixal_la_SOURCES = audio_irixal_out.c resample.c
+xineplug_ao_out_irixal_la_LIBADD = $(IRIXAL_LIBS)
+xineplug_ao_out_irixal_la_LDFLAGS = -avoid-version -module
+
xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c resample.c
xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS)
xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = audio_oss_out.h audio_alsa_out.h audio_esd_out.h \
- audio_sun_out.h audio_arts_out.h resample.h
+ audio_sun_out.h audio_arts_out.h resample.h #audio_irixal_out.h
debug:
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 02ff88580..12d21c62b 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -14,9 +14,15 @@ libdir = $(XINE_PLUGINDIR)
# ---------
# All of xine input plugins should be named like the scheme "xineplug_inp_"
#
-lib_LTLIBRARIES = xineplug_inp_file.la xineplug_inp_dvd.la \
+
+if HAVE_CDROM_IOCTLS
+in_dvd = xineplug_inp_dvd.la
+in_vcd = xineplug_inp_vcd.la
+endif
+
+lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) \
xineplug_inp_stdin_fifo.la xineplug_inp_net.la \
- xineplug_inp_vcd.la xineplug_inp_rtp.la
+ xineplug_inp_rtp.la
xineplug_inp_file_la_SOURCES = input_file.c
xineplug_inp_file_la_LDFLAGS = -avoid-version -module
@@ -38,6 +44,7 @@ xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module
include_HEADERS = input_plugin.h
noinst_HEADERS = dvd_udf.h
+EXTRA_DIST = input_dvd.c dvd_udf.c input_vcd.c
##
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index b3aa850a8..bbd302ca4 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.13 2001/07/10 21:07:55 f1rmb Exp $
+ * $Id: input_dvd.c,v 1.14 2001/07/16 19:36:00 mshopf Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -27,15 +27,6 @@
#include <dlfcn.h>
#include <stdio.h>
#include <fcntl.h>
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) \
- || defined(__sun)
-# include <sys/cdio.h>
-#elif defined(__linux__)
-#include <linux/config.h> /* Check for DEVFS */
-# include <linux/cdrom.h>
-#else
-# error "Need the DVD ioctls"
-#endif
#include <sys/ioctl.h>
#include <errno.h>
#include <unistd.h>
@@ -43,6 +34,17 @@
#include <string.h>
#include <inttypes.h>
+#ifdef HAVE_SYS_CDIO_H
+# include <sys/cdio.h>
+#endif
+#ifdef HAVE_LINUX_CDROM_H
+# include <linux/config.h> /* Check for DEVFS */
+# include <linux/cdrom.h>
+#endif
+#if ! defined (HAVE_LINUX_CDROM_H) && ! defined (HAVE_SYS_CDIO)
+#error "you need to add cdrom / VCD support for your platform to input_vcd and configure.in"
+#endif
+
#include "xine_internal.h"
#include "monitor.h"
#include "input_plugin.h"
@@ -348,7 +350,7 @@ static int dvd_plugin_eject_media (input_plugin_t *this_gen) {
if((fd = open(DVD, O_RDONLY|O_NONBLOCK)) > -1) {
-#if defined (__linux__)
+#if defined (HAVE_LINUX_CDROM_H)
if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
switch(status) {
case CDS_TRAY_OPEN:
@@ -371,8 +373,15 @@ static int dvd_plugin_eject_media (input_plugin_t *this_gen) {
return 0;
}
-#elif defined (__NetBSD__) || defined (__OpenBSD__) || defined (__FreeBSD__)
+#elif defined (HAVE_CDIO_H)
+# if defined (__sun)
+ status = 0;
+ if ((ret = ioctl(fd, CDROMEJECT)) != 0) {
+ xprintf(VERBOSE|INPUT, "CDROMEJECT failed: %s\n", strerror(errno));
+ }
+
+# else
if (ioctl(fd, CDIOCALLOW) == -1) {
perror("ioctl(cdromallow)");
} else {
@@ -380,13 +389,7 @@ static int dvd_plugin_eject_media (input_plugin_t *this_gen) {
perror("ioctl(cdromeject)");
}
}
-
-#elif defined(__sun)
-
- status = 0;
- if ((ret = ioctl(fd, CDROMEJECT)) != 0) {
- xprintf(VERBOSE|INPUT, "CDROMEJECT failed: %s\n", strerror(errno));
- }
+# endif
#endif
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index d46ba2058..b18082609 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -147,13 +147,13 @@ static int host_connect_attempt(struct in_addr ia, int port) {
}
/* multicast ? */
if ((ntohl(sin.sin_addr.s_addr) >> 28) == 0xe) {
-#if defined (__linux__)
+#ifdef HAVE_IP_MREQN
struct ip_mreqn mreqn;
mreqn.imr_multiaddr.s_addr = sin.sin_addr.s_addr;
mreqn.imr_address.s_addr = INADDR_ANY;
mreqn.imr_ifindex = 0;
-#elif defined (__FreeBSD__) || defined(__sun)
+#else
struct ip_mreq mreqn;
mreqn.imr_multiaddr.s_addr = sin.sin_addr.s_addr;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index ee1ea378e..89e08eee0 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_vcd.c,v 1.13 2001/07/10 21:07:55 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.14 2001/07/16 19:36:00 mshopf Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,16 +32,19 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <string.h>
-#if defined (__linux__)
-#include <linux/config.h> /* Check for DEVFS */
-#include <linux/cdrom.h>
-#elif defined (__FreeBSD__)
-#include <sys/cdio.h>
-#include <sys/cdrio.h>
-#elif defined (__sun)
-#include <sys/cdio.h>
-#else
-#error "you need to add cdrom / VCD support for your platform to input_vcd"
+#ifdef HAVE_LINUX_CDROM_H
+# include <linux/config.h> /* Check for DEVFS */
+# include <linux/cdrom.h>
+#endif
+#ifdef HAVE_SYS_CDIO_H
+# include <sys/cdio.h>
+/* TODO: not clean yet */
+# if defined (__FreeBSD__)
+# include <sys/cdrio.h>
+# endif
+#endif
+#if ! defined (HAVE_LINUX_CDROM_H) && ! defined (HAVE_SYS_CDIO)
+#error "you need to add cdrom / VCD support for your platform to input_vcd and configure.in"
#endif
#include "xine_internal.h"
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index a28aab089..281a6a0d9 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -4,11 +4,11 @@ noinst_LTLIBRARIES = $(wine_lib)
##
##
-CFLAGS = @GLOBAL_CFLAGS@@BUILD_LIB_STATIC@ @X_CFLAGS@ -fno-omit-frame-pointer \
+CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
-Wmissing-prototypes -Wimplicit-function-declaration \
-DWIN32_PATH=\"@w32_path@\"
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ @BUILD_LIB_STATIC@ @X_CFLAGS@ -fno-omit-frame-pointer \
+DEBUG_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ -fno-omit-frame-pointer \
-Wmissing-prototypes -Wimplicit-function-declaration \
-DWIN32_PATH=\\\"@w32_path@\\\"
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index e69d90824..13459459b 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -811,7 +811,9 @@ static void yuv2rgb_c_init (yuv2rgb_t *this, int mode)
yuv2rgb_t *yuv2rgb_init (int mode) {
+#ifdef ARCH_X86
uint32_t mm = mm_accel();
+#endif
yuv2rgb_t *this = xmalloc (sizeof (yuv2rgb_t));
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 11:35:01 +0000