diff options
Diffstat (limited to 'multimedia/kdemultimedia4/files')
6 files changed, 0 insertions, 143 deletions
diff --git a/multimedia/kdemultimedia4/files/patch-audiofile_artsplugin_audiofilearts.idl b/multimedia/kdemultimedia4/files/patch-audiofile_artsplugin_audiofilearts.idl deleted file mode 100644 index 32032ea676af..000000000000 --- a/multimedia/kdemultimedia4/files/patch-audiofile_artsplugin_audiofilearts.idl +++ /dev/null @@ -1,9 +0,0 @@ ---- audiofile_artsplugin/audiofilearts.idl.orig Sat Aug 21 15:03:32 2004 -+++ audiofile_artsplugin/audiofilearts.idl Sat Aug 21 15:04:33 2004 -@@ -1,5 +1,5 @@ --#include <kmedia2.idl> - #include <soundserver.idl> -+#include <kmedia2.idl> - - module Arts - { diff --git a/multimedia/kdemultimedia4/files/patch-configure.in b/multimedia/kdemultimedia4/files/patch-configure.in deleted file mode 100644 index 2e04bffa5e92..000000000000 --- a/multimedia/kdemultimedia4/files/patch-configure.in +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.in.orig 2008-03-27 18:04:50.000000000 +0100 -+++ configure.in 2008-03-27 18:06:26.000000000 +0100 -@@ -937,9 +937,9 @@ AC_DEFUN([AC_CHECK_LIBFLAC], - AC_LANG_SAVE - AC_LANG_C - have_libFLAC=no -- KDE_CHECK_HEADER(FLAC/metadata.h, -+ KDE_CHECK_HEADER(FLAC/stream_decoder.h, - [ -- KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single, -+ KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_init_ogg_stream, - have_libFLAC=yes) - - ]) -@@ -947,28 +947,10 @@ AC_DEFUN([AC_CHECK_LIBFLAC], - LIBFLAC="-lFLAC" - AC_DEFINE(HAVE_LIBFLAC, 1, - [Define if you have libFLAC (required for loading FLAC files)]) -- fi -- AC_SUBST(LIBFLAC) -- AC_LANG_RESTORE --]) -- --AC_DEFUN([AC_CHECK_LIBOGGFLAC], --[ -- AC_LANG_SAVE -- AC_LANG_C -- have_libOggFLAC=no -- KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h, -- [ -- KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single, -- have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC]) -- -- ]) -- if test "x$have_libOggFLAC" = "xyes"; then -- LIBOGGFLAC="-lOggFLAC" - AC_DEFINE(HAVE_LIBOGGFLAC, 1, - [Define if you have libOggFLAC (required for loading OggFLAC files)]) - fi -- AC_SUBST(LIBOGGFLAC) -+ AC_SUBST(LIBFLAC) - AC_LANG_RESTORE - ]) - -@@ -976,7 +958,6 @@ AC_ARG_WITH(flac,AC_HELP_STRING([--with- - - if test "x$flac_test" = "xyes" ; then - AC_CHECK_LIBFLAC -- AC_CHECK_LIBOGGFLAC - fi - dnl ======================================================= - dnl FILE: ./kmid/configure.in.in diff --git a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp deleted file mode 100644 index d718b1dd1209..000000000000 --- a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- kioslave/audiocd/plugins/flac/encoderflac.cpp.orig 2006-01-19 17:40:33.000000000 +0100 -+++ kioslave/audiocd/plugins/flac/encoderflac.cpp 2008-03-27 18:03:56.000000000 +0100 -@@ -47,7 +47,7 @@ public: - unsigned long data; - }; - --static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) -+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) - { - EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; - -@@ -109,9 +109,6 @@ unsigned long EncoderFLAC::size(long tim - long EncoderFLAC::readInit(long size) { - kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl; - d->data = 0; -- FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback); -- FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback); -- FLAC__stream_encoder_set_client_data(d->encoder, d); - - // The options match approximely those of flac compression-level-3 - FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true); -@@ -124,7 +121,7 @@ long EncoderFLAC::readInit(long size) { - if (size > 0) - FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4); - -- FLAC__stream_encoder_init(d->encoder); -+ FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d); - return d->data; - } - diff --git a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp deleted file mode 100644 index 3d11f3160e7e..000000000000 --- a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kioslave/audiocd/plugins/lame/encoderlame.cpp.orig 2007-10-25 14:58:32.000000000 +0200 -+++ kioslave/audiocd/plugins/lame/encoderlame.cpp 2007-10-25 14:58:42.000000000 +0200 -@@ -17,7 +17,7 @@ - */ - - #include <config.h> --#include <endian.h> -+#include <sys/endian.h> - #include "encoderlame.h" - #include "encoderlameconfig.h" - #include "audiocd_lame_encoder.h" -@@ -221,7 +221,7 @@ - // -x bitswap - // -r raw/pcm - // -s 44.1 (because it is raw you have to specify this) --#if __BYTE_ORDER == __LITTLE_ENDIAN -+#if BYTE_ORDER == LITTLE_ENDIAN - *(d->currentEncodeProcess) << "lame" << "--verbose" << "-x" << "-r" << "-s" << "44.1"; - #else - *(d->currentEncodeProcess) << "lame" << "--verbose" << "-r" << "-s" << "44.1"; diff --git a/multimedia/kdemultimedia4/files/patch-kmix_mixer_oss.cpp b/multimedia/kdemultimedia4/files/patch-kmix_mixer_oss.cpp deleted file mode 100644 index b5be16597dea..000000000000 --- a/multimedia/kdemultimedia4/files/patch-kmix_mixer_oss.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- kmix/mixer_oss.cpp Fri Sep 14 18:02:58 2007 -+++ kmix/mixer_oss.cpp Fri Sep 14 19:45:27 2007 -@@ -243,6 +243,18 @@ - if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) - errormsg(Mixer::ERR_READ); - -+ // If the record source is supposed to be on, but wasn't set, explicitly -+ // set the record source. Not all cards support multiple record sources. -+ // As a result, we also need to do the read & write again. -+ if (((i_recsrc & ( 1<<devnum)) == 0) && on) -+ { -+ oldrecsrc = i_recsrc = 1 << devnum; -+ if (ioctl(m_fd, SOUND_MIXER_WRITE_RECSRC, &i_recsrc) == -1) -+ errormsg (Mixer::ERR_WRITE); -+ if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) -+ errormsg(Mixer::ERR_READ); -+ } -+ - // PORTING: Hint: Do not forget to set i_recsrc to the new valid - // record source mask. - diff --git a/multimedia/kdemultimedia4/files/patch-kscd_libwm_include-wm_config.h b/multimedia/kdemultimedia4/files/patch-kscd_libwm_include-wm_config.h deleted file mode 100644 index 036aa466000d..000000000000 --- a/multimedia/kdemultimedia4/files/patch-kscd_libwm_include-wm_config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- kscd/libwm/include/wm_config.h.orig 2007-10-25 15:02:40.000000000 +0200 -+++ kscd/libwm/include/wm_config.h 2007-10-25 15:02:50.000000000 +0200 -@@ -131,6 +131,8 @@ - ******************************************************************/ - #if defined(__FreeBSD__) || defined(__FreeBSD) - -+#include <osreldate.h> -+ - #if __FreeBSD_version >= 500100 - #define DEFAULT_CD_DEVICE "/dev/acd0" - #else |