Skip to content

Commit

Permalink
libsdl: updated libsdl-* to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
aTc committed Feb 16, 2012
1 parent 82c2027 commit 1924205
Show file tree
Hide file tree
Showing 13 changed files with 1,382 additions and 14 deletions.
22 changes: 22 additions & 0 deletions recipes-missing/libsdl-mixer/libsdl-mixer/configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Index: SDL_mixer-1.2.12/configure.in
===================================================================
--- SDL_mixer-1.2.12.orig/configure.in
+++ SDL_mixer-1.2.12/configure.in
@@ -1,6 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(README)
-AC_CONFIG_AUX_DIR(build-scripts)

dnl Set various version strings - taken gratefully from the GTk sources

@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)

-dnl Detect the canonical build and host environments
-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
-dnl AC_CANONICAL_HOST
-
dnl Check for tools
AC_PROG_LIBTOOL
AC_PROG_CC
28 changes: 28 additions & 0 deletions recipes-missing/libsdl-mixer/libsdl-mixer/fix-flac-madness.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- /tmp/configure.in 2009-12-02 16:18:33.000000000 +0100
+++ SDL_mixer-1.2.11/configure.in 2009-12-02 16:20:02.000000000 +0100
@@ -413,24 +413,7 @@
[], [enable_music_flac_shared=yes])
if test x$enable_music_flac = xyes; then
AC_CHECK_HEADER([FLAC/export.h], [have_flac_export=yes])
- if test x$have_flac_export = xyes; then
- LIBS_SAVED="$LIBS"
- LIBS="-lFLAC"
- AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver])
- AC_TRY_RUN([
-#include "FLAC/export.h"
-#include "stdio.h"
-int main( int argc, char *argv[] ) {
-#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver)
- return 0;
-#else
- return 1;
-#endif
-}
-], have_flac_ver=yes, have_flac_ver=no)
- LIBS="$LIBS_SAVED"
- AC_MSG_RESULT($have_flac_ver)
- fi
+ have_flac_ver=yes

if test x$have_flac_ver = xyes; then
AC_CHECK_HEADER([FLAC/stream_decoder.h], [have_flac_hdr=yes])
38 changes: 38 additions & 0 deletions recipes-missing/libsdl-mixer/libsdl-mixer_1.2.12.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
DESCRIPTION = "Simple DirectMedia Layer mixer library."
SECTION = "libs"
DEPENDS = "virtual/libsdl flac libmikmod libvorbis ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d"

SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
file://configure.patch \
"

SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"

S = "${WORKDIR}/SDL_mixer-${PV}"

inherit autotools

EXTRA_AUTORECONF += "--include=acinclude"
EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}"

do_configure () {
# Remove old libtool macros.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
rm -f acinclude/$i
done
cp build-scripts/* . || true
rm -rf build-scripts/
export SYSROOT=$PKG_CONFIG_SYSROOT_DIR

autotools_do_configure

rm config.log
for i in $(find -name "Makefile") ; do
sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
done
}

41 changes: 41 additions & 0 deletions recipes-missing/libsdl-mixer/libsdl-mixer_1.2.12.bb~
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
DESCRIPTION = "Simple DirectMedia Layer mixer library."
SECTION = "libs"
DEPENDS = "virtual/libsdl flac libmikmod libvorbis ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d"

SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
file://configure.patch \
"
# file://fix-flac-madness.diff \
# file://configure.patch \
# "

SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"

S = "${WORKDIR}/SDL_mixer-${PV}"

inherit autotools

EXTRA_AUTORECONF += "--include=acinclude"
EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}"

do_configure () {
# Remove old libtool macros.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
rm -f acinclude/$i
done
cp build-scripts/* . || true
rm -rf build-scripts/
export SYSROOT=$PKG_CONFIG_SYSROOT_DIR

autotools_do_configure

rm config.log
for i in $(find -name "Makefile") ; do
sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
done
}

31 changes: 31 additions & 0 deletions recipes-missing/libsdl-ttf/libsdl-ttf_2.0.11.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
DESCRIPTION = "Simple DirectMedia Layer truetype font library."
SECTION = "libs"
DEPENDS = "virtual/libsdl freetype"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303"

PR = "r1"

SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
file://configure.patch \
"

S = "${WORKDIR}/SDL_ttf-${PV}"
EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config "

inherit autotools

TARGET_CC_ARCH += "${LDFLAGS}"

do_configure_prepend() {

MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"

for i in ${MACROS}; do
rm acinclude/$i
done

}

SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa"
SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
DESCRIPTION = "Simple DirectMedia Layer truetype font library."
SECTION = "libs"
DEPENDS = "virtual/libsdl freetype"
LICENSE = "LGPL"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
PR = "r2"

PR = "r1"

SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
file://configure.patch \
Expand All @@ -26,5 +27,5 @@ do_configure_prepend() {

}

SRC_URI[md5sum] = "814e6e17e8879254208d23b3b7e0354b"
SRC_URI[sha256sum] = "7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a"
SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa"
SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"

0 comments on commit 1924205

Please sign in to comment.