From 8a5bc9ade8f37bdafcd1ed1ffdc406990ffb84ca Mon Sep 17 00:00:00 2001 From: pooka Date: Tue, 20 Jun 2000 21:13:59 +0000 Subject: Upgrade xsidplay to 1.3.9 Unfortunately no changelist available. --- audio/xsidplay/patches/patch-aa | 24 ++-- audio/xsidplay/patches/patch-ab | 256 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 12 deletions(-) create mode 100644 audio/xsidplay/patches/patch-ab (limited to 'audio/xsidplay/patches') diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa index 83c7e50c1ee..dd0564223cb 100644 --- a/audio/xsidplay/patches/patch-aa +++ b/audio/xsidplay/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2000/03/28 00:09:22 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.6 2000/06/20 21:14:05 pooka Exp $ ---- src/Makefile.in.orig Fri Jul 2 12:37:40 1999 -+++ src/Makefile.in Fri Dec 17 13:31:49 1999 -@@ -30,7 +30,7 @@ - LIBM = @LIBM@ - LIBIOS = @LIBIOS@ - LIBAUDIO = @LIBAUDIO@ --LIBS = @LIBS@ -lqt -lX11 -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO) -+LIBS = @LIBS@ -L${PREFIX}/qt1/lib -Wl,-R${PREFIX}/qt1/lib -lqt -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO) - - # Part of Qt. - MOC = @MOC@ +--- src/Makefile.in.orig Wed May 3 21:27:00 2000 ++++ src/Makefile.in Tue Jun 20 23:53:19 2000 +@@ -102,7 +102,7 @@ + + bin_PROGRAMS = xsidplay + +-xsidplay_LDADD = $(OBJMETA) AudioDriver.o @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt ++xsidplay_LDADD = $(OBJMETA) AudioDriver.o @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt -lX11 -lXext @LIBAUDIO@ + + + xsidplay_SOURCES = AudioConfig.h HistoryDialog.cpp StilDialog.h AudioDialog.cpp HistoryDialog.h StilDialogData.cpp AudioDialog.h HistoryDialogData.cpp StilDialogData.h AudioDialogData.cpp HistoryDialogData.h TextFile.cpp AudioDialogData.h HistoryFile.cpp TextFile.h ConfigFile.cpp HistoryFile.h TimeLCD.cpp ConfigFile.h HistoryItem.h TimeLCD.h EmuDialog.cpp LEDButton.cpp WaveViewDialog.cpp EmuDialog.h LEDButton.h WaveViewDialog.h EmuDialogData.cpp MainDialog.cpp WaveViewDialogData.cpp EmuDialogData.h MainDialog.h WaveViewDialogData.h FilterDialog.cpp MainDialogData.cpp myTimer.h FilterDialog.h MainDialogData.h stil.cpp FilterDialogData.cpp MixerConfig.h stil.h FilterDialogData.h MixerDialog.cpp stilcomm.cpp GlobalIcon.h MixerDialog.h stilcomm.h HVSCDialog.cpp MixerDialogData.cpp stildefs.h HVSCDialog.h MixerDialogData.h xsidplay.cpp HVSCDialogData.cpp PicButton.cpp xsidplay.h HVSCDialogData.h PicButton.h HVSCconfig.h StilDialog.cpp diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab new file mode 100644 index 00000000000..5777d7befb9 --- /dev/null +++ b/audio/xsidplay/patches/patch-ab @@ -0,0 +1,256 @@ +$NetBSD: patch-ab,v 1.5 2000/06/20 21:14:05 pooka Exp $ + +--- configure.orig Wed May 3 21:25:54 2000 ++++ configure Tue Jun 20 01:11:25 2000 +@@ -1837,10 +1837,48 @@ + done + + ++echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 ++echo "configure:1842: checking for main in -lossaudio" >&5 ++ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lossaudio $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ LIBAUDIO=-lossaudio ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ ++ + # Extract the first word of "cp", so it can be a program name with args. + set dummy cp; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1844: checking for $ac_word" >&5 ++echo "configure:1882: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1875,7 +1913,7 @@ + + + echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6 +-echo "configure:1879: checking which audio driver to install" >&5 ++echo "configure:1917: checking which audio driver to install" >&5 + my_have_audio_driver=no + case "$host" in + *linux*) my_have_audio_driver=yes +@@ -1993,7 +2031,7 @@ + fi + + echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1997: checking build system type" >&5 ++echo "configure:2035: checking build system type" >&5 + + build_alias=$build + case "$build_alias" in +@@ -2013,7 +2051,7 @@ + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2017: checking for $ac_word" >&5 ++echo "configure:2055: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2043,7 +2081,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2047: checking for $ac_word" >&5 ++echo "configure:2085: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2073,7 +2111,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2077: checking for $ac_word" >&5 ++echo "configure:2115: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2124,7 +2162,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2128: checking for $ac_word" >&5 ++echo "configure:2166: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2156,7 +2194,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:2160: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2198: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -2167,12 +2205,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 2171 "configure" ++#line 2209 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -2198,12 +2236,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:2202: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:2207: checking whether we are using GNU C" >&5 ++echo "configure:2245: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2212,7 +2250,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -2231,7 +2269,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:2235: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2273: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2274,7 +2312,7 @@ + if test "$ac_cv_prog_gcc" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 +-echo "configure:2278: checking for ld used by GCC" >&5 ++echo "configure:2316: checking for ld used by GCC" >&5 + ac_prog=`($CC -print-prog-name=ld) 2>&5` + case "$ac_prog" in + # Accept absolute paths. +@@ -2298,10 +2336,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +-echo "configure:2302: checking for GNU ld" >&5 ++echo "configure:2340: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +-echo "configure:2305: checking for non-GNU ld" >&5 ++echo "configure:2343: checking for non-GNU ld" >&5 + fi + if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2336,7 +2374,7 @@ + fi + test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } + echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 +-echo "configure:2340: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:2378: checking if the linker ($LD) is GNU ld" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2352,7 +2390,7 @@ + + + echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 +-echo "configure:2356: checking for BSD-compatible nm" >&5 ++echo "configure:2394: checking for BSD-compatible nm" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2388,7 +2426,7 @@ + echo "$ac_t""$NM" 1>&6 + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:2392: checking whether ln -s works" >&5 ++echo "configure:2430: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2442,8 +2480,8 @@ + case "$lt_target" in + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 2446 "configure"' > conftest.$ac_ext +- if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ echo '#line 2484 "configure"' > conftest.$ac_ext ++ if { (eval echo configure:2485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + LD="${LD-ld} -32" +@@ -2464,19 +2502,19 @@ + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 +-echo "configure:2468: checking whether the C compiler needs -belf" >&5 ++echo "configure:2506: checking whether the C compiler needs -belf" >&5 + if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + lt_cv_cc_needs_belf=yes + else +@@ -2764,6 +2802,7 @@ + s%@QT_INCLUDES@%$QT_INCLUDES%g + s%@QT_LDFLAGS@%$QT_LDFLAGS%g + s%@MOC@%$MOC%g ++s%@LIBAUDIO@%$LIBAUDIO%g + s%@CP@%$CP%g + s%@build@%$build%g + s%@build_alias@%$build_alias%g -- cgit v1.2.3