summaryrefslogtreecommitdiff
path: root/audio/kdemultimedia2/patches
diff options
context:
space:
mode:
Diffstat (limited to 'audio/kdemultimedia2/patches')
-rw-r--r--audio/kdemultimedia2/patches/patch-aa56
-rw-r--r--audio/kdemultimedia2/patches/patch-ag37
-rw-r--r--audio/kdemultimedia2/patches/patch-ah42
-rw-r--r--audio/kdemultimedia2/patches/patch-ai35
-rw-r--r--audio/kdemultimedia2/patches/patch-ak42
-rw-r--r--audio/kdemultimedia2/patches/patch-aq63
6 files changed, 34 insertions, 241 deletions
diff --git a/audio/kdemultimedia2/patches/patch-aa b/audio/kdemultimedia2/patches/patch-aa
index 834ceaa9365..c6ad9e00533 100644
--- a/audio/kdemultimedia2/patches/patch-aa
+++ b/audio/kdemultimedia2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
+$NetBSD: patch-aa,v 1.4 2001/10/15 22:45:55 skrll Exp $
---- configure.orig Wed Feb 21 11:01:31 2001
+--- configure.orig Sun Sep 9 06:07:45 2001
+++ configure
-@@ -7906,7 +7906,7 @@
+@@ -8178,7 +8178,7 @@
au_enable_sun=yes
;;
*-*-netbsd*)
@@ -11,7 +11,16 @@ $NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
;;
*)
echo "configure: warning: No --enable-audio=default audio for $target" 1>&2
-@@ -11216,6 +11216,7 @@
+@@ -8194,7 +8194,7 @@
+ echo "$ac_t""yes - <sys/soundcard.h>" 1>&6
+ else
+ case "$target" in
+- *linux*|*freebsd*|*bsdi*)
++ *linux*|*freebsd*|*bsdi*|*netbsd*)
+ echo "$ac_t""yes" 1>&6
+ ;;
+ *)
+@@ -11495,6 +11495,7 @@
case "$host" in
*-*-linux*) kscd_compile=yes;;
*-*-*bsdi*) kscd_compile=yes;;
@@ -19,16 +28,7 @@ $NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
*-*-*bsd*) kscd_compile=no;;
*) kscd_compile=yes;;
esac
-@@ -11339,7 +11340,7 @@
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+ac_try="$ac_cpp $all_includes conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:11344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-@@ -11366,7 +11367,7 @@
+@@ -11641,7 +11642,7 @@
fi
done
@@ -37,31 +37,7 @@ $NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -11879,13 +11880,16 @@
-
-
- case "$ARCH_TYPE" in
-- i?86)
-- echo "$ac_t""Found Intel enable MMX support" 1>&6
-- cat >> confdefs.h <<\EOF
--#define INTEL 1
--EOF
--
-- ;;
-+#
-+# The MMS code won't compile on NetBSD :-(
-+#
-+# i?86)
-+# echo "$ac_t""Found Intel enable MMX support" 1>&6
-+# cat >> confdefs.h <<\EOF
-+##define INTEL 1
-+#EOF
-+#
-+# ;;
-
- *)
- echo "$ac_t""Non Intel." 1>&6
-@@ -11897,6 +11901,9 @@
+@@ -12206,6 +12207,9 @@
kde_mpeglib_compiles=no
case "$OS_TYPE" in
@@ -71,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2001/04/17 16:03:19 skrll Exp $
Linux)
kde_mpeglib_compiles=yes
;;
-@@ -12105,6 +12112,7 @@
+@@ -12416,6 +12420,7 @@
NetBSD)
echo "$ac_t""NetBSD :Unknown hardware. You will have problems!!" 1>&6
OS_TYPE="BSD"
diff --git a/audio/kdemultimedia2/patches/patch-ag b/audio/kdemultimedia2/patches/patch-ag
index 70f05973f38..6e1c7475802 100644
--- a/audio/kdemultimedia2/patches/patch-ag
+++ b/audio/kdemultimedia2/patches/patch-ag
@@ -1,38 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2001/03/15 15:35:56 skrll Exp $
+$NetBSD: patch-ag,v 1.3 2001/10/15 22:45:56 skrll Exp $
---- mpeglib/lib/Makefile.in.orig Wed Feb 21 11:00:42 2001
+--- mpeglib/lib/Makefile.in.orig Thu Oct 4 15:27:20 2001
+++ mpeglib/lib/Makefile.in
-@@ -256,7 +256,8 @@
- SUBDIRS = util input output decoder splay mpegplay mpgplayer tplay yuv
-
-
--MMXFILES = mpegplay/copyFunctions.o mpegplay/mmxidct_asm.o util/render/dither/ditherer_mmx16.o util/render/dither/dither32mmx.o util/mmxflags_asm.o
-+#HF# The *.lo globs below already include these files:
-+#HF#MMXFILES = mpegplay/copyFunctions.o mpegplay/mmxidct_asm.o util/render/dither/ditherer_mmx16.o util/render/dither/dither32mmx.o util/mmxflags_asm.o
-
+@@ -278,7 +278,7 @@
EXTRA_DIST = README
-@@ -268,10 +269,10 @@
-
- libmpeg_la_SOURCES = dummy.cpp
-
--libmpeg_la_LDFLAGS = $(all_libraries) -module -release $(MPEGLIB_VERSION) -version-info $(MPEGLIB_MAJOR_VERSION):$(MPEGLIB_MINOR_VERSION):$(MPEGLIB_MICRO_VERSION)
-+libmpeg_la_LDFLAGS = $(all_libraries) -module -release $(MPEGLIB_VERSION) -version-info $(MPEGLIB_MAJOR_VERSION):$(MPEGLIB_MINOR_VERSION):$(MPEGLIB_MICRO_VERSION) $(LIBOSSAUDIO)
+-THIS_EXTRALIBS = mpgplayer/*.lo mpegplay/*.lo splay/*.lo oggvorbis/*.lo tplay/*.lo decoder/*.lo output/*.lo input/*.lo util/render/*.lo $(DISPLAY_VIDEO_DIR) util/render/dither/*.lo util/render/dither2YUV/*.lo util/audio/*.lo util/file/*.lo frame/*.lo util/*.lo yuv/*.lo util/abstract/*.lo
++THIS_EXTRALIBS = mpgplayer/*.lo mpegplay/*.lo splay/*.lo oggvorbis/*.lo tplay/*.lo decoder/*.lo output/*.lo input/*.lo util/render/*.lo $(DISPLAY_VIDEO_DIR) util/render/dither/*.lo util/render/dither2YUV/*.lo util/audio/libaudio.la util/file/*.lo frame/*.lo util/*.lo yuv/*.lo util/abstract/*.lo
--libmpeg_la_LIBADD = $(MPEG_EXTRALIBS) $(MMXFILES) $(MPEGLIB_LIBS)
-+libmpeg_la_LIBADD = $(MPEG_EXTRALIBS) $(MMXFILES) $(MPEGLIB_LIBS) $(LIBPTHREAD)
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = ../../config.h
-@@ -287,9 +288,7 @@
- libmpeg_la_DEPENDENCIES = mpgplayer/*.lo mpegplay/*.lo splay/*.lo \
- tplay/*.lo decoder/*.lo output/*.lo input/*.lo util/render/*.lo \
- util/render/dither/*.lo util/render/dither2YUV/*.lo util/audio/*.lo \
--util/*.lo yuv/*.lo util/abstract/*.lo mpegplay/copyFunctions.o \
--mpegplay/mmxidct_asm.o util/render/dither/ditherer_mmx16.o \
--util/render/dither/dither32mmx.o util/mmxflags_asm.o
-+util/*.lo yuv/*.lo util/abstract/*.lo
- #>- libmpeg_la_OBJECTS = dummy.lo
- #>+ 1
- libmpeg_la_OBJECTS = dummy.lo
+ lib_LTLIBRARIES = libmpeg.la
diff --git a/audio/kdemultimedia2/patches/patch-ah b/audio/kdemultimedia2/patches/patch-ah
deleted file mode 100644
index b38fcb7a6cc..00000000000
--- a/audio/kdemultimedia2/patches/patch-ah
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/03/14 16:14:06 skrll Exp $
-
---- mpeglib/lib/mpegplay/Makefile.in.orig Wed Feb 21 11:00:44 2001
-+++ mpeglib/lib/mpegplay/Makefile.in
-@@ -272,7 +272,7 @@
- libmpegplay_la_SOURCES = mpegVideoHeader.cpp mpegVideoStream.cpp globals.cpp jrevdct.cpp recon.cpp decoderClass.cpp decoderTables.cpp motionVector.cpp slice.cpp gop.cpp mpegPlugin.cpp mmxidct.cpp mpegSystemHeader.cpp mpegSystemStream.cpp picture.cpp mpegExtension.cpp macroBlock.cpp mpegVideoLength.cpp mpegVideoBitWindow.cpp videoDecoder.cpp copyFunctions_asm.cpp copyFunctions_mmx.cpp
-
-
--libmpegplay_la_LIBADD = mmxidct_asm.o copyFunctions.o
-+libmpegplay_la_LIBADD = mmxidct_asm.lo copyFunctions.lo
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
-@@ -285,7 +285,7 @@
- X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- libmpegplay_la_LDFLAGS =
--libmpegplay_la_DEPENDENCIES = mmxidct_asm.o copyFunctions.o
-+libmpegplay_la_DEPENDENCIES = mmxidct_asm.lo copyFunctions.lo
- #>- libmpegplay_la_OBJECTS = mpegVideoHeader.lo mpegVideoStream.lo \
- #>- globals.lo jrevdct.lo recon.lo decoderClass.lo decoderTables.lo \
- #>- motionVector.lo slice.lo gop.lo mpegPlugin.lo mmxidct.lo \
-@@ -544,15 +544,15 @@
- mostlyclean distclean maintainer-clean
-
-
--mmxidct_asm.o : mmxidct_asm.S
-+mmxidct_asm.lo : mmxidct_asm.S
- #>- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
- #>+ 1
- #>- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
- #>+ 1
-- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS) $(KDE_CXXFLAGS) $(KDE_CXXFLAGS)
-+ $(LTCXXCOMPILE) $(DEFS) -c -o $@ $< $(CXXFLAGS) $(KDE_CXXFLAGS) $(KDE_CXXFLAGS)
-
--copyFunctions.o : copyFunctions.cpp
-- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
-+copyFunctions.lo : copyFunctions.cpp
-+ $(LTCXXCOMPILE) $(DEFS) -c -o $@ $< $(CXXFLAGS)
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/audio/kdemultimedia2/patches/patch-ai b/audio/kdemultimedia2/patches/patch-ai
deleted file mode 100644
index f30bd15fb73..00000000000
--- a/audio/kdemultimedia2/patches/patch-ai
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/03/14 16:14:05 skrll Exp $
-
---- mpeglib/lib/util/Makefile.in.orig Wed Feb 21 11:00:46 2001
-+++ mpeglib/lib/util/Makefile.in
-@@ -272,7 +272,7 @@
- libutil_la_SOURCES = mmx.c timeStamp.cpp timeStampArray.cpp dynBuffer.cpp syncClock.cpp syncClockMPEG.cpp timeWrapper.cpp
-
-
--libutil_la_LIBADD = mmxflags_asm.o
-+libutil_la_LIBADD = mmxflags_asm.lo
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
-@@ -285,7 +285,7 @@
- X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- libutil_la_LDFLAGS =
--libutil_la_DEPENDENCIES = mmxflags_asm.o
-+libutil_la_DEPENDENCIES = mmxflags_asm.lo
- #>- libutil_la_OBJECTS = mmx.lo timeStamp.lo timeStampArray.lo dynBuffer.lo \
- #>- syncClock.lo syncClockMPEG.lo timeWrapper.lo
- #>+ 5
-@@ -617,10 +617,10 @@
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
--mmxflags_asm.o : mmxflags_asm.S
-+mmxflags_asm.lo : mmxflags_asm.S
- #>- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
- #>+ 1
-- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS) $(KDE_CXXFLAGS)
-+ $(LTCXXCOMPILE) $(DEFS) -c -o $@ $< $(CXXFLAGS) $(KDE_CXXFLAGS)
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/audio/kdemultimedia2/patches/patch-ak b/audio/kdemultimedia2/patches/patch-ak
deleted file mode 100644
index a5248f42ec3..00000000000
--- a/audio/kdemultimedia2/patches/patch-ak
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/03/14 16:14:05 skrll Exp $
-
---- mpeglib/lib/util/render/dither/Makefile.in.orig Wed Feb 21 11:00:48 2001
-+++ mpeglib/lib/util/render/dither/Makefile.in
-@@ -267,7 +267,7 @@
- libdither_la_SOURCES = ditherWrapper.cpp dither8Bit.cpp colorTable8Bit.cpp colorTableHighBit.cpp dither16Bit.cpp dither32Bit.cpp ditherRGB_flipped.cpp ditherRGB.cpp
-
-
--libdither_la_LIBADD = ditherer_mmx16.o dither32mmx.o
-+libdither_la_LIBADD = ditherer_mmx16.lo dither32mmx.lo
-
- libdither_la_HEADER = $(noinst_HEADERS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-@@ -282,7 +282,7 @@
- X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- libdither_la_LDFLAGS =
--libdither_la_DEPENDENCIES = ditherer_mmx16.o dither32mmx.o
-+libdither_la_DEPENDENCIES = ditherer_mmx16.lo dither32mmx.lo
- #>- libdither_la_OBJECTS = ditherWrapper.lo dither8Bit.lo colorTable8Bit.lo \
- #>- colorTableHighBit.lo dither16Bit.lo dither32Bit.lo ditherRGB_flipped.lo \
- #>- ditherRGB.lo
-@@ -518,15 +518,15 @@
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
--ditherer_mmx16.o : ditherer_mmx16.cpp
-+ditherer_mmx16.lo : ditherer_mmx16.cpp
- #>- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
- #>+ 1
- #>- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
- #>+ 1
-- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS) $(KDE_CXXFLAGS) $(KDE_CXXFLAGS)
-+ $(LTCXXCOMPILE) $(DEFS) -c -o $@ $< $(CXXFLAGS) $(KDE_CXXFLAGS) $(KDE_CXXFLAGS)
-
--dither32mmx.o : dither32mmx.cpp
-- $(CXX) $(DEFS) -c -o $@ $< $(CXXFLAGS)
-+dither32mmx.lo : dither32mmx.cpp
-+ $(LTCXXCOMPILE) $(DEFS) -c -o $@ $< $(CXXFLAGS)
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/audio/kdemultimedia2/patches/patch-aq b/audio/kdemultimedia2/patches/patch-aq
index 07a96dbcc7b..aba0541308f 100644
--- a/audio/kdemultimedia2/patches/patch-aq
+++ b/audio/kdemultimedia2/patches/patch-aq
@@ -1,52 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2001/04/19 06:47:00 skrll Exp $
+$NetBSD: patch-aq,v 1.3 2001/10/15 22:45:56 skrll Exp $
---- kscd/config.h.std.orig Wed Aug 23 06:31:58 2000
-+++ kscd/config.h.std
-@@ -120,18 +120,24 @@
-
- /*************************************************************************
- *
-- * FreeBSD/NetBSD
-+ * NetBSD
- *
- *************************************************************************/
-
--#if defined(__FreeBSD__) || defined(__NetBSD__)
--
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__)
-
- /* Is this the most commonly used cd device on FreeBSD ? */
- #define DEFAULT_CD_DEVICE "/dev/rmatcd0c"
-
--#else /* __NetBSD__ */
-+#endif
-+
-+/*************************************************************************
-+ *
-+ * NetBSD
-+ *
-+ *************************************************************************/
-+
-+#if defined(__NetBSD__)
-
- /* The raw partition on disk device is *d on i386, *c on everything else */
- #ifdef __i386__
-@@ -140,7 +146,7 @@
- #define DEFAULT_CD_DEVICE "/dev/rcd0c"
- #endif
-
--#endif /* __FreeBSD__ */
-+#endif /* __NetBSD__ */
-
- /* Please have a look at void KSCD::playClicked() in kscd.cpp. You will find
- there the following code:
-@@ -154,8 +160,6 @@
- Try either one there ( THAT IS IN kscd.cpp NOT HERE ), and tell me which version
- works for you. -- thanks !
- */
--
--#endif
-
-
- /*************************************************************************
+--- mpeglib/lib/util/audio/Makefile.in.orig Sun Sep 9 06:07:41 2001
++++ mpeglib/lib/util/audio/Makefile.in
+@@ -293,7 +293,7 @@
+ LIBS = @LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+-libaudio_la_LDFLAGS =
++libaudio_la_LDFLAGS = $(LIBOSSAUDIO)
+ libaudio_la_LIBADD =
+ #>- libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo
+ #>+ 4
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 15:07:46 +0000