From 08658c22fbef21b0e16acb81d1738446b400a636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 9 Jan 2013 00:32:10 +0100
Subject: [PATCH] remove openal and physfs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* they are now in meta-oe/meta-multimedia.
* openal was replaced by openal-soft which is a further developed fork e.g
  supporting ARM neon / Intel SSE

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 dependencies/freealut/freealut_1.1.0.bb       |  4 ++--
 dependencies/openal/openal_0.0.8.bb           | 24 -------------------
 .../physfs/physfs-2.0.2/compile_fixes.patch   | 13 ----------
 dependencies/physfs/physfs_2.0.2.bb           | 19 ---------------
 recipes-gamelib/allegro4/allegro4_4.4.2.bb    |  4 ++--
 5 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100644 dependencies/openal/openal_0.0.8.bb
 delete mode 100644 dependencies/physfs/physfs-2.0.2/compile_fixes.patch
 delete mode 100644 dependencies/physfs/physfs_2.0.2.bb

diff --git a/dependencies/freealut/freealut_1.1.0.bb b/dependencies/freealut/freealut_1.1.0.bb
index 011a5c8..2a3a894 100644
--- a/dependencies/freealut/freealut_1.1.0.bb
+++ b/dependencies/freealut/freealut_1.1.0.bb
@@ -4,9 +4,9 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7ec51bd663119a90c3d50704d6051fae"
 
-PR = "r0"
+PR = "r1"
 
-DEPENDS = "openal"
+DEPENDS = "openal-soft"
 
 SRC_URI = "http://connect.creativelabs.com/openal/Downloads/ALUT/${PN}-${PV}.tar.gz"
 
diff --git a/dependencies/openal/openal_0.0.8.bb b/dependencies/openal/openal_0.0.8.bb
deleted file mode 100644
index ed35288..0000000
--- a/dependencies/openal/openal_0.0.8.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "OpenAL is a cross-platform 3D audio API."
-SECTION = "libs"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7ec51bd663119a90c3d50704d6051fae"
-
-PR = "r0"
-
-DEPENDS = "alsa-lib virtual/libsdl libvorbis"
-
-SRC_URI = "ftp://ftp.eenet.ee/pub/FreeBSD/distfiles/${PN}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "641cf53761f35ee979f3e888614797a0"
-SRC_URI[sha256sum] = "723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--enable-alsa --enable-sdl --enable-vorbis --disable-mp3 \
-                --disable-smpeg --disable-arts"
-
-do_configure_append () {
-        sed -i "s/@requirements@/alsa vorbis/" admin/pkgconfig/openal.pc
-}
diff --git a/dependencies/physfs/physfs-2.0.2/compile_fixes.patch b/dependencies/physfs/physfs-2.0.2/compile_fixes.patch
deleted file mode 100644
index f6bedd7..0000000
--- a/dependencies/physfs/physfs-2.0.2/compile_fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nurd physfs-2.0.2/archivers/wad.c physfs-2.0.2-/archivers/wad.c
---- physfs-2.0.2/archivers/wad.c	2011-02-18 23:17:31.000000000 +0200
-+++ physfs-2.0.2-/archivers/wad.c	2012-10-05 16:47:03.105547992 +0300
-@@ -245,9 +245,6 @@
-     PHYSFS_uint32 fileCount;
-     PHYSFS_uint32 directoryOffset;
-     WADentry *entry;
--    char lastDirectory[9];
--
--    lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */
- 
-     BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0);
-     info->entryCount = fileCount;
diff --git a/dependencies/physfs/physfs_2.0.2.bb b/dependencies/physfs/physfs_2.0.2.bb
deleted file mode 100644
index c314698..0000000
--- a/dependencies/physfs/physfs_2.0.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "PhysicsFS is a library to provide abstract access to various archives."
-SECTION = "libs"
-
-LICENSE = "zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ad5dfd37e76cb8e82b47c55a99097d5"
-
-PR = "r0"
-
-DEPENDS = "readline"
-
-SRC_URI = "http://icculus.org/physfs/downloads/physfs-${PV}.tar.gz \
- file://compile_fixes.patch \
-"
-SRC_URI[md5sum] = "4e8927c3d30279b03e2592106eb9184a"
-SRC_URI[sha256sum] = "ae296d3148228e03fd56cc9ea58af02f87dcbb1fadef125c18b709ab37f0bc09"
-
-S = "${WORKDIR}/physfs-${PV}"
-
-inherit cmake
diff --git a/recipes-gamelib/allegro4/allegro4_4.4.2.bb b/recipes-gamelib/allegro4/allegro4_4.4.2.bb
index 3abe39b..f3cead9 100644
--- a/recipes-gamelib/allegro4/allegro4_4.4.2.bb
+++ b/recipes-gamelib/allegro4/allegro4_4.4.2.bb
@@ -5,9 +5,9 @@ SECTION = "libs"
 LICENSE = "Allegro4"
 LIC_FILES_CHKSUM = "file://docs/txt/license.txt;md5=55ec083de776f786d0da79bbbb887c50"
 
-PR = "r0"
+PR = "r1"
 
-DEPENDS = "virtual/libgl libglu libx11 libxcursor physfs openal jpeg"
+DEPENDS = "virtual/libgl libglu libx11 libxcursor physfs openal-soft jpeg"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/alleg/allegro/${PV}/allegro-${PV}.tar.gz \
            file://avoid_lib_paths.patch \