From 79f735cb8bdd869bc0b0e350a956f2a7bda6e58b Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 19 Aug 2013 15:23:25 -0500 Subject: [PATCH] libsdl2: Rename to libsdl 2.0.0 * As per our mailing list discussion, package management will support multiple versions of the same package being installed at the same time, so this *should* work like this in theory. * Adjust patch to match 1:1 SDL changes accepted upstream. --- .../libsdl-2.0.0.bep} | 2 +- .../patches/libsdl-2.0.0.patch} | 29 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) rename media-libs/{libsdl2/libsdl2-2.0.0.bep => libsdl/libsdl-2.0.0.bep} (93%) rename media-libs/{libsdl2/patches/libsdl2-2.0.0.patch => libsdl/patches/libsdl-2.0.0.patch} (53%) diff --git a/media-libs/libsdl2/libsdl2-2.0.0.bep b/media-libs/libsdl/libsdl-2.0.0.bep similarity index 93% rename from media-libs/libsdl2/libsdl2-2.0.0.bep rename to media-libs/libsdl/libsdl-2.0.0.bep index 6175dca16..6f7de2ebd 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.bep +++ b/media-libs/libsdl/libsdl-2.0.0.bep @@ -1,4 +1,4 @@ -DESCRIPTION="Simple Direct Media Layer 2" +DESCRIPTION="Simple Direct Media Layer" HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" diff --git a/media-libs/libsdl2/patches/libsdl2-2.0.0.patch b/media-libs/libsdl/patches/libsdl-2.0.0.patch similarity index 53% rename from media-libs/libsdl2/patches/libsdl2-2.0.0.patch rename to media-libs/libsdl/patches/libsdl-2.0.0.patch index 51471a4ba..dae2a97bf 100644 --- a/media-libs/libsdl2/patches/libsdl2-2.0.0.patch +++ b/media-libs/libsdl/patches/libsdl-2.0.0.patch @@ -1,20 +1,33 @@ diff -Naur SDL2-2.0.0/include/begin_code.h SDL2-2.0.0-haiku/include/begin_code.h --- SDL2-2.0.0/include/begin_code.h 2013-08-11 21:57:54.011796480 -0500 -+++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-18 21:04:46.580386816 -0500 -@@ -36,7 +36,9 @@ ++++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-19 15:12:06.654049280 -0500 +@@ -35,13 +35,7 @@ + /* Some compilers use a special export keyword */ #ifndef DECLSPEC - # if defined(__BEOS__) || defined(__HAIKU__) +-# if defined(__BEOS__) || defined(__HAIKU__) -# if defined(__GNUC__) -+# if defined(__GNUC__) && __GNUC__ >= 4 -+# define DECLSPEC __attribute__ ((visibility("default"))) +-# define DECLSPEC __declspec(dllexport) +-# else +-# define DECLSPEC __declspec(export) +-# endif +-# elif defined(__WIN32__) ++# if defined(__WIN32__) + # ifdef __BORLANDC__ + # ifdef BUILD_SDL + # define DECLSPEC +@@ -54,6 +48,8 @@ + # else + # if defined(__GNUC__) && __GNUC__ >= 4 + # define DECLSPEC __attribute__ ((visibility("default"))) +# elif defined(__GNUC__) && __GNUC__ >= 2 - # define DECLSPEC __declspec(dllexport) ++# define DECLSPEC __declspec(dllexport) # else - # define DECLSPEC __declspec(export) + # define DECLSPEC + # endif diff -Naur SDL2-2.0.0/src/main/beos/SDL_BApp.h SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h --- SDL2-2.0.0/src/main/beos/SDL_BApp.h 2013-08-11 21:57:54.058982400 -0500 -+++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-18 21:05:04.364642304 -0500 ++++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-19 15:10:50.412876800 -0500 @@ -371,7 +371,7 @@