diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index dee7ebf21..7f01025c3 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Simple Direct Media Layer is a cross-platform development library d HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" -REVISION="1" +REVISION="2" LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/patches/libsdl-1.2.15.patchset b/media-libs/libsdl/patches/libsdl-1.2.15.patchset index b4adbd8ae..d36d015a9 100644 --- a/media-libs/libsdl/patches/libsdl-1.2.15.patchset +++ b/media-libs/libsdl/patches/libsdl-1.2.15.patchset @@ -1,4 +1,4 @@ -From db1b7894554a9d3460483d278b8dd50595e43135 Mon Sep 17 00:00:00 2001 +From 59cfb52a4c0564e1713c37be2ae6026f9e4e76a9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:38:56 +0100 Subject: Remove Alsa and ESD detection @@ -36,7 +36,7 @@ index 08c8e1e..84d9a55 100644 1.8.3.4 -From 4243b5c80de7a51abb05d6f4eb5a82984607024e Mon Sep 17 00:00:00 2001 +From b2657c374826ed213072b5e80263f59a42e76faf Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:39:26 +0100 Subject: Fix samples vs bytes issues @@ -67,7 +67,7 @@ index de635f8..7faf571 100644 1.8.3.4 -From 03c94f6b8dbaec508da9ec16fecbb3411f70c0c7 Mon Sep 17 00:00:00 2001 +From 847264a916bb4b9e3bfa1ff8217beed67b37b8a4 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 22 Nov 2013 23:40:12 +0100 Subject: Various fixes to the video code @@ -147,7 +147,7 @@ index c32b661..a26f18b 100644 1.8.3.4 -From b0294206194d97e8bb8a69a214e4c8bd3311ed03 Mon Sep 17 00:00:00 2001 +From 6a8dccbefe9522f65a07177441a93251cfcc8d9f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 23 Nov 2013 11:59:00 +0100 Subject: Actually fix the sample vs bytes problem in audio driver. @@ -200,3 +200,26 @@ index 7faf571..300bf03 100644 -- 1.8.3.4 + +From 112569083122d8d14b2571aaf2b73483ce3738db Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sun, 22 Dec 2013 18:37:30 -0700 +Subject: Remove Haiku from specialized DECLSPEC definition + + +diff --git a/include/begin_code.h b/include/begin_code.h +index 27e2f7b..d5e2f1f 100644 +--- a/include/begin_code.h ++++ b/include/begin_code.h +@@ -41,7 +41,7 @@ + * Some compilers use a special export keyword + */ + #ifndef DECLSPEC +-# if defined(__BEOS__) || defined(__HAIKU__) ++# if defined(__BEOS__) + # if defined(__GNUC__) + # define DECLSPEC + # else +-- +1.8.3.4 +