rev 11863 - in trunk/packages/kdemultimedia/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2008-08-07 07:02:26 +0000 (Thu, 07 Aug 2008)
New Revision: 11863

Added:
   trunk/packages/kdemultimedia/debian/patches/15_kfreebsd.diff
Modified:
   trunk/packages/kdemultimedia/debian/changelog
Log:
  +++ Changes by Aurelien Jarno:

  * Add GNU/kFreeBSD patch:
    - 15_kfreebsd.diff




Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2008-08-07 01:55:51 UTC (rev 11862)
+++ trunk/packages/kdemultimedia/debian/changelog	2008-08-07 07:02:26 UTC (rev 11863)
@@ -1,3 +1,12 @@
+kdemultimedia (4:3.5.9-3) unstable; urgency=low
+
+  +++ Changes by Aurelien Jarno:
+
+  * Add GNU/kFreeBSD patch:
+    - 15_kfreebsd.diff
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 07 Aug 2008 06:49:08 +0200
+
 kdemultimedia (4:3.5.9-2) unstable; urgency=low
 
   * KDE_3_5_BRANCH update (up to r828850):

Added: trunk/packages/kdemultimedia/debian/patches/15_kfreebsd.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/15_kfreebsd.diff	                        (rev 0)
+++ trunk/packages/kdemultimedia/debian/patches/15_kfreebsd.diff	2008-08-07 07:02:26 UTC (rev 11863)
@@ -0,0 +1,94 @@
+--- kdemultimedia-3.5.9.orig/kscd/libwm/plat_freebsd.c
++++ kdemultimedia-3.5.9/kscd/libwm/plat_freebsd.c
+@@ -30,7 +30,7 @@
+  *
+  */
+ 
+-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined (__NetBSD) || defined(__DragonFly__)
+ 
+ #include <errno.h>
+ #include <stdio.h>
+--- kdemultimedia-3.5.9.orig/kscd/libwm/include/wm_config.h
++++ kdemultimedia-3.5.9/kscd/libwm/include/wm_config.h
+@@ -129,9 +129,14 @@
+  ***  ******  **  **  ******  ******  **  ******  **  *  **********
+  ***  ******  **  **      **      **     ****    ***    ***********
+  ******************************************************************/
+-#if defined(__FreeBSD__) || defined(__FreeBSD)
++#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__FreeBSD_kernel__)
+ 
+-#if __FreeBSD_version >= 500100
++#if defined(__FreeBSD_version__)
++#undef __FreeBSD_kernel_version__
++#define __FreeBSD_kernel_version__ __FreeBSD_version__
++#endif
++
++#if __FreeBSD_kernel_version__ >= 500100
+ #define DEFAULT_CD_DEVICE	"/dev/acd0"
+ #else
+ #define DEFAULT_CD_DEVICE	"/dev/acd0c"
+--- kdemultimedia-3.5.9.orig/configure
++++ kdemultimedia-3.5.9/configure
+@@ -40996,6 +40996,9 @@
+   DragonFly)
+     kde_mpeglib_compiles=yes
+     ;;
++  GNU/kFreeBSD)
++    kde_mpeglib_compiles=yes
++    ;;
+   *)
+     { echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
+ echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6; }
+@@ -41247,7 +41250,7 @@
+ 
+     ;;
+ 
+-  FreeBSD | DragonFly)
++  FreeBSD | DragonFly | GNU/kFreeBSD)
+     OS_TYPE="BSD"
+ 
+ cat >>confdefs.h <<\_ACEOF
+--- kdemultimedia-3.5.9.orig/configure.in
++++ kdemultimedia-3.5.9/configure.in
+@@ -1328,6 +1328,9 @@
+   DragonFly)
+     kde_mpeglib_compiles=yes
+     ;;
++  GNU/kFreeBSD)
++    kde_mpeglib_compiles=yes
++    ;;
+   *)
+     AC_MSG_RESULT([*** We disable mpeglib for this platform ***])
+     DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
+@@ -1346,7 +1349,7 @@
+     AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
+     ;;
+ 
+-  FreeBSD | DragonFly)
++  FreeBSD | DragonFly | GNU/kFreeBSD)
+     OS_TYPE="BSD"
+     AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
+     ;;
+--- kdemultimedia-3.5.9.orig/mpeglib/configure.in.in
++++ kdemultimedia-3.5.9/mpeglib/configure.in.in
+@@ -176,6 +176,9 @@
+   DragonFly)
+     kde_mpeglib_compiles=yes
+     ;;
++  GNU/kFreeBSD)
++    kde_mpeglib_compiles=yes
++    ;;
+   *)
+     AC_MSG_RESULT([*** We disable mpeglib for this platform ***])
+     DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
+@@ -194,7 +197,7 @@
+     AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
+     ;;
+ 
+-  FreeBSD | DragonFly)
++  FreeBSD | DragonFly | GNU/kFreeBSD)
+     OS_TYPE="BSD"
+     AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
+     ;;
+