[Glibc-bsd-commits] r1787 - trunk/web/patches

Petr Salinger ps-guest at alioth.debian.org
Fri Dec 8 21:52:41 CET 2006 

Author: ps-guest
Date: 2006-12-08 21:52:41 +0100 (Fri, 08 Dec 2006)
New Revision: 1787

Added:
   trunk/web/patches/cdparanoia-devname.diff
Modified:
   trunk/web/patches/kdemultimedia.diff
Log:
* update kdemultimedia



Added: trunk/web/patches/cdparanoia-devname.diff
===================================================================
--- trunk/web/patches/cdparanoia-devname.diff	2006-12-08 19:21:24 UTC (rev 1786)
+++ trunk/web/patches/cdparanoia-devname.diff	2006-12-08 20:52:41 UTC (rev 1787)
@@ -0,0 +1,63 @@
+diff -u cdparanoia-3.10+debian~pre0/debian/patches/03-kfreebsd.dpatch cdparanoia-3.10+debian~pre0/debian/patches/03-kfreebsd.dpatch
+--- cdparanoia-3.10+debian~pre0/debian/patches/03-kfreebsd.dpatch
++++ cdparanoia-3.10+debian~pre0/debian/patches/03-kfreebsd.dpatch
+@@ -67,12 +67,11 @@
+  #define MAXTRK 100
+  
+  typedef struct TOC {	/* structure of table of contents */
+-@@ -46,14 +51,20 @@
+- 
++@@ -46,13 +51,19 @@
+    int opened; /* This struct may just represent a candidate for opening */
+  
+-+#if defined(__linux__)
+    char *cdda_device_name;
+++#if defined(__linux__)
+    char *ioctl_device_name;
+  
+    int cdda_fd;
+@@ -338,12 +337,11 @@
+ diff -Naur cdparanoia-III-10pre0+debian.orig/interface/interface.c cdparanoia-III-10pre0+debian/interface/interface.c
+ --- cdparanoia-III-10pre0+debian.orig/interface/interface.c	2006-08-29 19:51:10.000000000 +0000
+ +++ cdparanoia-III-10pre0+debian/interface/interface.c	2006-11-17 17:42:39.000000000 +0000
+-@@ -29,12 +29,25 @@
+-       d->enable_cdda(d,0);
++@@ -29,11 +29,24 @@
+  
+      _clean_messages(d);
+-+#if defined(__linux__)
+      if(d->cdda_device_name)free(d->cdda_device_name);
+++#if defined(__linux__)
+      if(d->ioctl_device_name)free(d->ioctl_device_name);
+      if(d->drive_model)free(d->drive_model);
+      if(d->cdda_fd!=-1)close(d->cdda_fd);
+@@ -509,7 +507,7 @@
+ +		idmessage(messagedest, messages, "\t\tDevice %s is not a CDROM", dev);
+ +		goto cdda_identify_cooked_fail;
+ +	}
+-+
+++	d->cdda_device_name = copystring(dev);
+ +	d->drive_model = copystring("Generic cooked ioctl CDROM");
+ +	d->interface = COOKED_IOCTL;
+ +	d->bigendianp = -1;
+@@ -601,7 +599,7 @@
+ +		    "\t\tDevice is neither a CDROM nor a WORM device\n", NULL);
+ +		goto cdda_identify_scsi_fail;
+ +	}
+-+
+++	d->cdda_device_name = copystring(devname);
+ +	d->ioctl_fd = -1;
+ +	d->bigendianp = -1;
+ +	d->nsectors = -1;
+@@ -1874,9 +1872,9 @@
+ --- cdparanoia-III-10pre0+debian.orig/interface/utils.h	2004-06-25 18:14:43.000000000 +0000
+ +++ cdparanoia-III-10pre0+debian/interface/utils.h	2006-11-17 17:42:39.000000000 +0000
+ @@ -1,4 +1,9 @@
+-+#ifdef LINUX
+++#if defined (__linux__) || defined (__GLIBC__)
+  #include <endian.h>
+-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+++#elif defined(__FreeBSD__)
+ +#include <machine/endian.h>
+ +#endif
+ +

Modified: trunk/web/patches/kdemultimedia.diff
===================================================================
--- trunk/web/patches/kdemultimedia.diff	2006-12-08 19:21:24 UTC (rev 1786)
+++ trunk/web/patches/kdemultimedia.diff	2006-12-08 20:52:41 UTC (rev 1787)
@@ -1,9 +1,31 @@
 Author: aurel32
 Status: ugly, libbsd has to be fixed
+	needs enhanced cdparanoia (3.10+debian~pre0-3 is not sufficient, see BTS, cdparanoia-devname.diff)
 
---- kdemultimedia-3.4.2.orig/config.h.in
-+++ kdemultimedia-3.4.2/config.h.in
-@@ -461,13 +461,14 @@
+diff -u kdemultimedia-3.5.5/debian/rules kdemultimedia-3.5.5/debian/rules
+--- kdemultimedia-3.5.5/debian/rules
++++ kdemultimedia-3.5.5/debian/rules
+@@ -6,11 +6,14 @@
+ include /usr/share/cdbs/1/rules/utils.mk
+ 
+ DEB_CONFIGURE_EXTRA_FLAGS := \
+-	--with-alsa --with-arts-alsa \
+ 	--with-extra-includes=/usr/include/speex:/usr/include/kde/arts
+ 	# The include/kde/arts one should be temporary. See
+ 	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
+ 
++ifeq (linux,$(DEB_HOST_ARCH_OS))
++DEB_CONFIGURE_EXTRA_FLAGS += --with-alsa --with-arts-alsa
++endif
++
+ DOC_HTML_PRUNE := kcontrol
+ 
+ DEB_DH_STRIP_ARGS  := --dbg-package=kdemultimedia-dbg
+only in patch2:
+unchanged:
+--- kdemultimedia-3.5.5.orig/config.h.in
++++ kdemultimedia-3.5.5/config.h.in
+@@ -406,13 +406,14 @@
  #endif
  #endif
  
@@ -19,7 +41,7 @@
  #ifdef __cplusplus
  }
  #endif
-@@ -479,7 +480,7 @@
+@@ -424,7 +425,7 @@
  #ifdef __cplusplus
  extern "C" {
  #endif
@@ -28,36 +50,11 @@
  #ifdef __cplusplus
  }
  #endif
---- kdemultimedia-3.4.2.orig/debian/akode.install.kfreebsd-i386
-+++ kdemultimedia-3.4.2/debian/akode.install.kfreebsd-i386
-@@ -0,0 +1,24 @@
-+debian/tmp/usr/lib/libakode.so.1
-+debian/tmp/usr/lib/libakode.so.1.0.0
-+debian/tmp/usr/lib/libakode_jack_sink.la
-+debian/tmp/usr/lib/libakode_jack_sink.so
-+debian/tmp/usr/lib/libakode_mpc_decoder.la
-+debian/tmp/usr/lib/libakode_mpc_decoder.so
-+debian/tmp/usr/lib/libakode_mpeg_decoder.la
-+debian/tmp/usr/lib/libakode_mpeg_decoder.so
-+debian/tmp/usr/lib/libakode_oss_sink.la
-+debian/tmp/usr/lib/libakode_oss_sink.so
-+debian/tmp/usr/lib/libakode_src_resampler.la
-+debian/tmp/usr/lib/libakode_src_resampler.so
-+debian/tmp/usr/lib/libakode_xiph_decoder.la
-+debian/tmp/usr/lib/libakode_xiph_decoder.so
-+debian/tmp/usr/lib/libarts_akode.la
-+debian/tmp/usr/lib/libarts_akode.so
-+debian/tmp/usr/lib/mcop/akodeMPCPlayObject.mcopclass
-+debian/tmp/usr/lib/mcop/akodeMPEGPlayObject.mcopclass
-+debian/tmp/usr/lib/mcop/akodePlayObject.mcopclass
-+debian/tmp/usr/lib/mcop/akodeSpeexStreamPlayObject.mcopclass
-+debian/tmp/usr/lib/mcop/akodeVorbisStreamPlayObject.mcopclass
-+debian/tmp/usr/lib/mcop/akodeXiphPlayObject.mcopclass
-+debian/tmp/usr/lib/mcop/akodearts.mcopclass
-+debian/tmp/usr/lib/mcop/akodearts.mcoptype
---- kdemultimedia-3.4.2.orig/debian/patches/13_kfreebsd.patch
-+++ kdemultimedia-3.4.2/debian/patches/13_kfreebsd.patch
-@@ -0,0 +1,136 @@
+only in patch2:
+unchanged:
+--- kdemultimedia-3.5.5.orig/debian/patches/13_kfreebsd.patch
++++ kdemultimedia-3.5.5/debian/patches/13_kfreebsd.patch
+@@ -0,0 +1,125 @@
 +--- kde.orig/kscd/kscdmagic/sound.cpp	2005-09-05 02:02:29.000000000 +0200
 ++++ kde.patched/kscd/kscdmagic/sound.cpp	2005-09-05 02:03:33.000000000 +0200
 +@@ -102,7 +102,7 @@
@@ -78,17 +75,6 @@
 +   attempt(ioctl(device,SNDCTL_DSP_SETFMT,&format),"setting format",true);
 +   if (format != SOUNDFORMAT) error("setting format (2)");
 + #endif
-+--- kde.orig/kscd/kscd.h	2005-09-05 02:05:31.000000000 +0200
-++++ kde.patched/kscd/kscd.h	2005-09-05 02:05:45.000000000 +0200
-+@@ -64,7 +64,7 @@
-+ #include <sys/ustat.h>
-+ #endif
-+ 
-+-#ifdef __FreeBSD__
-++#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ #include <sys/param.h>
-+ #include <sys/ucred.h>
-+ #include <sys/mount.h>
 +--- kde.orig/kscd/libwm/include/wm_config.h	2005-09-05 08:34:47.000000000 +0200
 ++++ kde.patched/kscd/libwm/include/wm_config.h	2005-09-05 08:35:44.000000000 +0200
 +@@ -129,9 +129,9 @@

More information about the Glibc-bsd-commits mailing list