haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

libsdl2: Rename to libsdl 2.0.0

Browse Source 
* 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.
This commit is contained in:
Alexander von Gluck IV
2013-08-19 15:23:25 -05:00
committed by Oliver Tappe
parent 295b38ef1d
commit b0e932557c
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-libs/libsdl2/libsdl2-2.0.0.bep → media-libs/libsdl/libsdl-2.0.0.bep
View File

@@ -1,4 +1,4 @@
DESCRIPTION="Simple Direct Media Layer 2" DESCRIPTION="Simple Direct Media Layer"
HOMEPAGE="http://www.libsdl.org/" HOMEPAGE="http://www.libsdl.org/"
SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz"
CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7"

29
media-libs/libsdl2/patches/libsdl2-2.0.0.patch → media-libs/libsdl/patches/libsdl-2.0.0.patch
View File

@@ -1,20 +1,33 @@
diff -Naur SDL2-2.0.0/include/begin_code.h SDL2-2.0.0-haiku/include/begin_code.h 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/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 +++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-19 15:12:06.654049280 -0500
@@ -36,7 +36,9 @@ @@ -35,13 +35,7 @@
/* Some compilers use a special export keyword */ /* Some compilers use a special export keyword */
#ifndef DECLSPEC #ifndef DECLSPEC
# if defined(__BEOS__) || defined(__HAIKU__) -# if defined(__BEOS__) || defined(__HAIKU__)
-# if defined(__GNUC__) -# if defined(__GNUC__)
+# if defined(__GNUC__) && __GNUC__ >= 4 -# define DECLSPEC __declspec(dllexport)
+# define DECLSPEC __attribute__ ((visibility("default"))) -# 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 +# elif defined(__GNUC__) && __GNUC__ >= 2
# define DECLSPEC __declspec(dllexport) +# define DECLSPEC __declspec(dllexport)
# else # 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 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/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 @@ @@ -371,7 +371,7 @@