Skip to content

Commit

Permalink
SDL_Mixer: Fix building resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alexpux
Alexpux committed Mar 17, 2016
1 parent 1b245c6 commit 3c4a7a7
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 31 deletions.
6 changes: 5 additions & 1 deletion mingw-w64-SDL_mixer/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sha256sums=('1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a'
'7a0fd237def865ec8376ec0f534e75ad4bc1ba6dff66774112cd2f2700ae9a9c'
'1cc663048ef57c9238a10109bbbbef3b49e2c9d2dbd7c71c7c2f0673a6417e14'
'912d5b8342eec3626fe61389531f7fe941c9aa6f463cf2681948a739d3c53f35'
'7f5a99cde428cc5867b4673d725b2847169ad67bccd60d880528ca47442524ed')
'b204e67c0489dfa9dba32e6f5a6ed554fca6c61d155701af35a41fea5b4db589')
noextract=(${_realname}-${pkgver}.tar.gz)

prepare() {
Expand All @@ -50,12 +50,16 @@ prepare() {
# -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
# -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \
# -i timidity/config.h

autoreconf -fiv
}

build() {
[[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
mkdir -p "${srcdir}/build-${MINGW_CHOST}"
cd "${srcdir}/build-${MINGW_CHOST}"

export lt_cv_deplibs_check_method='pass_all'
../${_realname}-${pkgver}/configure \
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \
Expand Down
87 changes: 57 additions & 30 deletions mingw-w64-SDL_mixer/SDL_mixer-find_lib.mingw.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
diff --git a/configure b/configure
index e7c8c97..f6b9ad1 100755
--- a/configure
+++ b/configure
@@ -11850,12 +11850,13 @@ find_lib()
gcc_bin_path=`$CC -print-search-dirs 2>/dev/null | fgrep programs: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`
gcc_lib_path=`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`
env_lib_path=`echo $LIBS $LDFLAGS $* | sed 's/-L[ ]*//g'`
--- a/configure.in
+++ b/configure.in
@@ -116,7 +116,7 @@
#VERSION_SOURCES="$srcdir/version.rc"
EXE=".exe"
;;
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
VERSION_SOURCES="$srcdir/version.rc"
EXE=".exe"
if test "$build" != "$host"; then # cross-compiling
@@ -181,12 +181,13 @@
gcc_bin_path=[`$CC -print-search-dirs 2>/dev/null | fgrep programs: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
env_lib_path=[`echo $LIBS $LDFLAGS $* | sed 's/-L[ ]*//g'`]
+ env_path=`echo $PATH | sed 's/:/ /g'`
if test "$cross_compiling" = yes; then
host_lib_path=""
Expand All @@ -14,19 +23,19 @@ index e7c8c97..f6b9ad1 100755
fi
- for path in $gcc_bin_path $gcc_lib_path $env_lib_path $host_lib_path; do
+ for path in $gcc_bin_path $gcc_lib_path $env_lib_path $env_path $host_lib_path; do
lib=`ls -- $path/$1 2>/dev/null | sort | sed 's/.*\/\(.*\)/\1/; q'`
lib=[`ls -- $path/$1 2>/dev/null | sort | sed 's/.*\/\(.*\)/\1/; q'`]
if test x$lib != x; then
echo $lib
@@ -12727,7 +12728,7 @@ fi
@@ -284,7 +285,7 @@
*-*-darwin*)
mikmod_lib=`find_lib libmikmod.dylib`
mikmod_lib=[`find_lib libmikmod.dylib`]
;;
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
mikmod_lib=`find_lib "libmikmod*.dll"`
mikmod_lib=[`find_lib "libmikmod*.dll"`]
;;
*)
@@ -12916,7 +12917,7 @@ fi
@@ -350,7 +351,7 @@
*mingw32ce*)
use_music_native_midi=no
;;
Expand All @@ -35,58 +44,76 @@ index e7c8c97..f6b9ad1 100755
use_music_native_midi=yes
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lwinmm"
;;
@@ -13159,8 +13160,11 @@ fi
fluidsynth_lib=`find_lib libfluidsynth.[0-9]*`
@@ -392,8 +393,11 @@
fluidsynth_lib=[`find_lib libfluidsynth.[0-9]*`]
fi
;;
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
fluidsynth_lib=`find_lib "fluidsynth*.dll"`
fluidsynth_lib=[`find_lib "fluidsynth*.dll"`]
+ if test x$fluidsynth_lib = x; then
+ fluidsynth_lib=`find_lib "libfluidsynth*.dll"`
+ fi
;;
*)
fluidsynth_lib=`find_lib "libfluidsynth.so.[0-9]"`
@@ -13415,8 +13419,11 @@ fi
ogg_lib=`find_lib libvorbisidec.[0-9]*`
fluidsynth_lib=[`find_lib "libfluidsynth.so.[0-9]"`]
@@ -441,8 +445,11 @@
ogg_lib=[`find_lib libvorbisidec.[0-9]*`]
fi
;;
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
ogg_lib=`find_lib "vorbisidec*.dll"`
ogg_lib=[`find_lib "vorbisidec*.dll"`]
+ if test x$ogg_lib = x; then
+ ogg_lib=`find_lib "libvorbisidec*.dll"`
+ fi
;;
*)
ogg_lib=`find_lib "libvorbisidec.so.[0-9]"`
@@ -13640,7 +13647,7 @@ fi
ogg_lib=[`find_lib "libvorbisidec.so.[0-9]"`]
@@ -471,8 +478,11 @@
*-*-darwin*)
ogg_lib=`find_lib libvorbisfile.dylib`
ogg_lib=[`find_lib libvorbisfile.dylib`]
;;
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
ogg_lib=`find_lib "libvorbisfile*.dll"`
ogg_lib=[`find_lib "libvorbisfile*.dll"`]
+ if test x$ogg_lib = x; then
+ ogg_lib=`find_lib "libvorbisfile*.dll"`
+ fi
;;
*)
@@ -14073,8 +14080,8 @@
ogg_lib=[`find_lib "libvorbisfile.so.[0-9]"`]
@@ -531,8 +541,8 @@
*-*-darwin*)
flac_lib=`find_lib libFLAC.dylib`
flac_lib=[`find_lib libFLAC.dylib`]
;;
- *-*-cygwin* | *-*-mingw32*)
- flac_lib=`find_lib "libFLAC*.dll"`
- flac_lib=[`find_lib "libFLAC*.dll"`]
+ *-*-cygwin* | *-*-mingw*)
+ flac_lib=`find_lib "libFLAC-*.dll"`
+ flac_lib=[`find_lib "libFLAC-*.dll"`]
;;
*)
flac_lib=`find_lib "libFLAC.so.[0-9]"`
@@ -14649,7 +14656,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
flac_lib=[`find_lib "libFLAC.so.[0-9]"`]
@@ -573,7 +583,7 @@
*-*-darwin*)
smpeg_lib=`find_lib libsmpeg.dylib`
smpeg_lib=[`find_lib libsmpeg.dylib`]
;;
- *-*-cygwin* | *-*-mingw32*)
+ *-*-cygwin* | *-*-mingw*)
smpeg_lib=`find_lib "smpeg*.dll"`
smpeg_lib=[`find_lib "smpeg*.dll"`]
;;
*)
@@ -653,10 +653,10 @@

VERSION_OBJECTS=`echo $VERSION_SOURCES`
VERSION_DEPENDS=`echo $VERSION_SOURCES`
-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.rc,\\
-$(objects)/\2.o: \1/\2.rc\\
- \$(WINDRES) \$< \$@,g'`
+$(objects)/\2.lo: \1/\2.rc\\
+ \$(LIBTOOL) --mode=compile \$(WINDRES) \$< -o \$@,g'`
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'`

PLAYWAVE_SOURCES="$srcdir/playwave.c"

0 comments on commit 3c4a7a7

Please sign in to comment.