IRIX / mips port. Audio and CD support are not implemented yet.

Nuked BUILD_LIB_STATIC.
Changed some architecture dependend code to feature dependend code.
Autoconf'ing CD / DVD ioctl() support.

CVS patchset: 288
CVS date: 2001/07/16 19:36:00

7 files changed, 66 insertions, 41 deletions

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