cvs commit: patches/kdemultimedia kdemultimedia-3.1.3-kmix_alsa-1.patch kdemultimedia-3.1.4-kmix_alsa-1.patch kdemultimedia-3.1.4-u64_long-1.patch kdemultimedia-3.1.3-kmix-alsa.patch kdemultimedia-3.1.4-kmix-alsa.patch kdemultimedia-3.1.4-u64-long-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jun 7 10:33:58 PDT 2004


jim         04/06/07 11:33:58

  Added:       kdemultimedia kdemultimedia-3.1.3-kmix_alsa-1.patch
                        kdemultimedia-3.1.4-kmix_alsa-1.patch
                        kdemultimedia-3.1.4-u64_long-1.patch
  Removed:     kdemultimedia kdemultimedia-3.1.3-kmix-alsa.patch
                        kdemultimedia-3.1.4-kmix-alsa.patch
                        kdemultimedia-3.1.4-u64-long-1.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/kdemultimedia/kdemultimedia-3.1.3-kmix_alsa-1.patch
  
  Index: kdemultimedia-3.1.3-kmix_alsa-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Date: 2003-08-13
  Initial Package Version: 3.1.3
  Origin: Alexander E. Patrakov
  Description: Turn off the magic that kmix does to determine the 
  "master" volume control. Always assume that the zeroth control is 
  the master one. The line that I commented out is certainly incorrect. 
  This "fix" will not be accepted by the KDE team because it's 
  ideologically wrong, but they don't currently have a good one.
  http://bugs.kde.org/show_bug.cgi?id=61905
  
  Applies to owners of FM801-based soundcards, maybe others. You can 
  hard-code the relevant control number in the first m_masterDevice = ... anyway.
  
  diff -ur kdemultimedia-3.1.3/kmix/mixer_alsa9.cpp kdemultimedia-3.1.3.tweaked/kmix/mixer_alsa9.cpp
  --- kdemultimedia-3.1.3/kmix/mixer_alsa9.cpp	2003-05-07 17:46:50.000000000 +0600
  +++ kdemultimedia-3.1.3.tweaked/kmix/mixer_alsa9.cpp	2003-07-31 21:06:57.000000000 +0600
  @@ -60,6 +60,7 @@
   Mixer_ALSA::Mixer_ALSA( int device, int card ) :
   	Mixer( device, card ), handle(0)
   {
  +    m_masterDevice = 0;
   }
   
   Mixer_ALSA::~Mixer_ALSA()
  @@ -70,10 +71,9 @@
   Mixer_ALSA::identify( snd_mixer_selem_id_t *sid )
   {
   	QString name = snd_mixer_selem_id_get_name( sid );
  -
   	if ( name == "Master" )
   	{
  -		m_masterDevice = snd_mixer_selem_id_get_index( sid );
  +//		m_masterDevice = snd_mixer_selem_id_get_index( sid );
   		return MixDevice::VOLUME;
   	}
   	if ( name == "Master Mono" ) return MixDevice::VOLUME;
  
  
  
  1.1                  patches/kdemultimedia/kdemultimedia-3.1.4-kmix_alsa-1.patch
  
  Index: kdemultimedia-3.1.4-kmix_alsa-1.patch
  ===================================================================
  Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
  Date: 2003-08-13
  Initial Package Version: 3.1.3
  Origin: Alexander E. Patrakov
  Description: Turn off the magic that kmix does to determine the 
  "master" volume control. Always assume that the zeroth control is 
  the master one. The line that I commented out is certainly incorrect. 
  This "fix" will not be accepted by the KDE team because it's 
  ideologically wrong, but they don't currently have a good one.
  http://bugs.kde.org/show_bug.cgi?id=61905
  
  Applies to owners of FM801-based soundcards, maybe others. You can 
  hard-code the relevant control number in the first m_masterDevice = ... anyway.
  
  diff -ur kdemultimedia-3.1.3/kmix/mixer_alsa9.cpp kdemultimedia-3.1.3.tweaked/kmix/mixer_alsa9.cpp
  --- kdemultimedia-3.1.3/kmix/mixer_alsa9.cpp	2003-05-07 17:46:50.000000000 +0600
  +++ kdemultimedia-3.1.3.tweaked/kmix/mixer_alsa9.cpp	2003-07-31 21:06:57.000000000 +0600
  @@ -60,6 +60,7 @@
   Mixer_ALSA::Mixer_ALSA( int device, int card ) :
   	Mixer( device, card ), handle(0)
   {
  +    m_masterDevice = 0;
   }
   
   Mixer_ALSA::~Mixer_ALSA()
  @@ -70,10 +71,9 @@
   Mixer_ALSA::identify( snd_mixer_selem_id_t *sid )
   {
   	QString name = snd_mixer_selem_id_get_name( sid );
  -
   	if ( name == "Master" )
   	{
  -		m_masterDevice = snd_mixer_selem_id_get_index( sid );
  +//		m_masterDevice = snd_mixer_selem_id_get_index( sid );
   		return MixDevice::VOLUME;
   	}
   	if ( name == "Master Mono" ) return MixDevice::VOLUME;
  
  
  
  1.1                  patches/kdemultimedia/kdemultimedia-3.1.4-u64_long-1.patch
  
  Index: kdemultimedia-3.1.4-u64_long-1.patch
  ===================================================================
  Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
  Date: 2003-11-02
  Initial Package Version: 3.1.4
  Origin: http://crux.fh-regensburg.de/cgi-bin/cvstrac/chngview?cn=2925
  Description: Fixed u64 long long errors when building kdemultimedia
   
  diff -Naur kdemultimedia-3.1.4.orig/kaudiocreator/cdconfigimp.cpp kdemultimedia-3.1.4/kaudiocreator/cdconfigimp.cpp
  --- kdemultimedia-3.1.4.orig/kaudiocreator/cdconfigimp.cpp	2003-09-02 01:17:41.000000000 +0000
  +++ kdemultimedia-3.1.4/kaudiocreator/cdconfigimp.cpp	2003-11-02 09:37:46.000000000 +0000
  @@ -76,6 +76,7 @@
   /* This is in support for the Mega Hack, if cdparanoia ever is fixed, or we
      use another ripping library we can remove this.  */
   #define _LINUX_BYTEORDER_SWAB_H
  +typedef unsigned long long __u64;
   #include <linux/cdrom.h>
   #include <sys/ioctl.h>
   
  diff -Naur kdemultimedia-3.1.4.orig/kioslave/audiocd/audiocd.cpp kdemultimedia-3.1.4/kioslave/audiocd/audiocd.cpp
  --- kdemultimedia-3.1.4.orig/kioslave/audiocd/audiocd.cpp	2003-09-02 01:17:44.000000000 +0000
  +++ kdemultimedia-3.1.4/kioslave/audiocd/audiocd.cpp	2003-11-02 09:37:46.000000000 +0000
  @@ -54,6 +54,7 @@
      fallbacks for non-GNUisms.  Fortunately we (or other headers) don't
      need the swab routines.  */
   #define _LINUX_BYTEORDER_SWAB_H
  +typedef unsigned long long __u64;
   #include <linux/cdrom.h>
   #endif
   #include <sys/ioctl.h>
  diff -Naur kdemultimedia-3.1.4.orig/kscd/libwm/plat_linux.c kdemultimedia-3.1.4/kscd/libwm/plat_linux.c
  --- kdemultimedia-3.1.4.orig/kscd/libwm/plat_linux.c	2003-05-07 11:46:52.000000000 +0000
  +++ kdemultimedia-3.1.4/kscd/libwm/plat_linux.c	2003-11-02 09:37:46.000000000 +0000
  @@ -43,6 +43,8 @@
   #include <sys/wait.h>
   /* Try to get around bug #29274 */
   #include <linux/version.h>
  +#undef __GNUC__
  +typedef unsigned long long __u64;
   
   #include "include/wm_config.h"
   #include "include/wm_struct.h"
  
  
  



More information about the patches mailing list