From 23561de348d225aba3d01bb1b7355bbd43b309ba Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 16 Aug 2018 20:27:47 +0200 Subject: move all libsdl recipes in one folder and follow oe-core's folder for libsdl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../libsdl-image/libsdl-image/configure.patch | 43 ---------------------- .../libsdl-image/libsdl-image_1.2.12.bb | 32 ---------------- .../libsdl-image/libsdl2-image_2.0.1.bb | 31 ---------------- .../libsdl-mixer/libsdl-mixer/configure.patch | 21 ----------- .../libsdl-mixer/libsdl-mixer_1.2.12.bb | 39 -------------------- .../libsdl-mixer/libsdl2-mixer_2.0.2.bb | 27 -------------- 6 files changed, 193 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch delete mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb delete mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb delete mode 100644 meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb (limited to 'meta-oe/recipes-multimedia') diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch deleted file mode 100644 index 5299d378eb..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: SDL_image-1.2.12/configure.in -=================================================================== ---- SDL_image-1.2.12.orig/configure.in 2012-01-21 01:51:33.000000000 +0000 -+++ SDL_image-1.2.12/configure.in 2014-07-18 06:56:56.853466678 +0000 -@@ -1,5 +1,4 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(README) - - dnl Set various version strings - taken gratefully from the GTk sources - -@@ -11,12 +10,19 @@ - # if backwards compatibility has been broken, - # set BINARY_AGE and INTERFACE_AGE to 0. - --MAJOR_VERSION=1 --MINOR_VERSION=2 --MICRO_VERSION=12 -+m4_define([sdlimage_major_version],[1]) -+m4_define([sdlimage_minor_version],[2]) -+m4_define([sdlimage_micro_version],[12]) -+m4_define([sdlimage_version], [sdlimage_major_version.sdlimage_minor_version.sdlimage_micro_version]) -+ -+AC_INIT([SDL_image], [sdlimage_version]) -+ -+MAJOR_VERSION=sdlimage_major_version -+MINOR_VERSION=sdlimage_minor_version -+MICRO_VERSION=sdlimage_micro_version - INTERFACE_AGE=4 - BINARY_AGE=12 --VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION -+VERSION=sdlimage_version - - AC_SUBST(MAJOR_VERSION) - AC_SUBST(MINOR_VERSION) -@@ -42,7 +48,7 @@ - AC_CANONICAL_HOST - - dnl Setup for automake --AM_INIT_AUTOMAKE(SDL_image, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools - AC_PROG_LIBTOOL diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb deleted file mode 100644 index ea8e9eaa30..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer image library" -SECTION = "libs" - -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" - -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" - -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" -SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" - -S = "${WORKDIR}/SDL_image-${PV}" - -inherit autotools pkgconfig - -export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" - -# Disable the run-time loading of the libs and bring back the soname dependencies. -EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" - -do_configure_prepend() { - # Removing these files fixes a libtool version mismatch. - rm -f ${S}/acinclude/libtool.m4 - rm -f ${S}/acinclude/sdl.m4 - rm -f ${S}/acinclude/pkg.m4 - rm -f ${S}/acinclude/lt~obsolete.m4 - rm -f ${S}/acinclude/ltoptions.m4 - rm -f ${S}/acinclude/ltsugar.m4 - rm -f ${S}/acinclude/ltversion.m4 -} diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb deleted file mode 100644 index 1f9c794c73..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer image library v2" -SECTION = "libs" - -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=ec65b9778f5584a0bd8dfc17d6340ba0" - -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp" - -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" -SRC_URI[md5sum] = "d94b94555ba022fa249a53a021dc3606" -SRC_URI[sha256sum] = "3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64" - -S = "${WORKDIR}/SDL2_image-${PV}" - -inherit autotools pkgconfig - -# Disable the run-time loading of the libs and bring back the soname dependencies. -EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" - -do_configure_prepend() { - # make autoreconf happy - touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog - # Removing these files fixes a libtool version mismatch. - rm -f ${S}/acinclude/libtool.m4 - rm -f ${S}/acinclude/sdl2.m4 - rm -f ${S}/acinclude/pkg.m4 - rm -f ${S}/acinclude/lt~obsolete.m4 - rm -f ${S}/acinclude/ltoptions.m4 - rm -f ${S}/acinclude/ltsugar.m4 - rm -f ${S}/acinclude/ltversion.m4 -} diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch deleted file mode 100644 index 4c9e8d094c..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in ---- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200 -+++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200 -@@ -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_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 diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb deleted file mode 100644 index c83fcc8daa..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer mixer library" -SECTION = "libs" -DEPENDS = "virtual/libsdl flac libmikmod libvorbis" -LICENSE = "Zlib" -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-brokensep pkgconfig - -EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" - -PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" - -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 -} diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb deleted file mode 100644 index 718f3f5fde..0000000000 --- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer mixer library V2" -SECTION = "libs" -DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=95e0c3cf63f71b950911e698a54b7fc5" - -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" - -SRC_URI[md5sum] = "aaa0551393993c14a13f72b339c0ed6c" -SRC_URI[sha256sum] = "4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb" - -S = "${WORKDIR}/SDL2_mixer-${PV}" - -inherit autotools-brokensep pkgconfig - -EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" - -PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" - -do_configure_prepend () { - # 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 -} -- cgit 1.2.3-korg