[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdemultimedia
From:       Hasso Tepper <hasso () kde ! org>
Date:       2007-06-13 10:18:09
Message-ID: 1181729889.995005.23024.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 674869 by hasso:

Make kdemultimedia compile and work on DragonFly BSD.


 M  +1 -1      kmix/kmix-platforms.cpp  
 M  +5 -0      kscd/libwm/include/wm_config.h  
 M  +2 -2      kscd/libwm/plat_freebsd.c  
 M  +4 -1      mpeglib/configure.in.in  
 M  +3 -0      mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h  
 M  +1 -1      oggvorbis_artsplugin/oggPlayObject_impl.h  


--- branches/KDE/3.5/kdemultimedia/kmix/kmix-platforms.cpp #674868:674869
@@ -46,7 +46,7 @@
 #define OSS_MIXER
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__bsdi__) || defined(_UNIXWARE) +#if defined(__FreeBSD__) || \
defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || \
defined(_UNIXWARE) || defined(__DragonFly__)  #define OSS_MIXER
 #endif
 
--- branches/KDE/3.5/kdemultimedia/kscd/libwm/include/wm_config.h #674868:674869
@@ -139,6 +139,11 @@
 
 #endif /* freebsd */
 
+/* DragonFly */
+#if defined(__DragonFly__)
+#define DEFAULT_CD_DEVICE       "/dev/acd0c"
+#endif
+
 /******************************************************************
  * NetBSD
  ******************************************************************
--- branches/KDE/3.5/kdemultimedia/kscd/libwm/plat_freebsd.c #674868:674869
@@ -30,7 +30,7 @@
  *
  */
 
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined \
(__NetBSD) +#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || \
defined (__NetBSD) || defined(__DragonFly__)  
 #include <errno.h>
 #include <stdio.h>
@@ -61,7 +61,7 @@
 #else
 # define LEFT_PORT 0
 # define RIGHT_PORT 1
-# if __FreeBSD_version < 300000
+# if defined(__FreeBSD_version) && __FreeBSD_version < 300000
 #  include <scsi.h>
 # endif
 #endif
--- branches/KDE/3.5/kdemultimedia/mpeglib/configure.in.in #674868:674869
@@ -173,6 +173,9 @@
   SunOS)
     kde_mpeglib_compiles=yes
     ;;
+  DragonFly)
+    kde_mpeglib_compiles=yes
+    ;;
   *)
     AC_MSG_RESULT([*** We disable mpeglib for this platform ***])
     DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
@@ -191,7 +194,7 @@
     AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
     ;;
 
-  FreeBSD)
+  FreeBSD | DragonFly)
     OS_TYPE="BSD"
     AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
     ;;
--- branches/KDE/3.5/kdemultimedia/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h \
#674868:674869 @@ -20,6 +20,9 @@
 
 /* gcc 3.3.1 and later optimise the "not used" (only in asm code)
    symbols away. So we need to mark them as used. */
+#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ)
+#define __GNUC_PREREQ __GNUC_PREREQ__
+#endif
 #ifdef __GNUC_PREREQ
 #if __GNUC_PREREQ (3,1)
 # define __attribute_used__ __attribute__ ((__used__))
--- branches/KDE/3.5/kdemultimedia/oggvorbis_artsplugin/oggPlayObject_impl.h \
#674868:674869 @@ -1,7 +1,7 @@
 #ifndef OGGPLAYER_IMPL_H
 #define OGGPLAYER_IMPL_H "$Id$"
 
-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) || \
defined(__DragonFly__)  /* union semun is defined by including <sys/sem.h> */
 #else
 /* according to X/OPEN we have to define it ourselves */


[prev in list] [next in list] [prev in thread] [next in thread]