summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch187
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb1
2 files changed, 188 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
new file mode 100644
index 0000000000..913baa92a0
--- /dev/null
+++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
@@ -0,0 +1,187 @@
1Rather than code which doesn't even work properly when cross compiling,
2lets just use pkg-config instead. Its a little simpler.
3
4RP 2014/6/20
5
6Upstream-Status: Pending
7
8Index: SDL-1.2.15/sdl.m4
9===================================================================
10--- SDL-1.2.15.orig/sdl.m4
11+++ SDL-1.2.15/sdl.m4
12@@ -12,174 +12,8 @@ dnl Test for SDL, and define SDL_CFLAGS
13 dnl
14 AC_DEFUN([AM_PATH_SDL],
15 [dnl
16-dnl Get the cflags and libraries from the sdl-config script
17-dnl
18-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
19- sdl_prefix="$withval", sdl_prefix="")
20-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
21- sdl_exec_prefix="$withval", sdl_exec_prefix="")
22-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
23- , enable_sdltest=yes)
24-
25- if test x$sdl_exec_prefix != x ; then
26- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
27- if test x${SDL_CONFIG+set} != xset ; then
28- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
29- fi
30- fi
31- if test x$sdl_prefix != x ; then
32- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
33- if test x${SDL_CONFIG+set} != xset ; then
34- SDL_CONFIG=$sdl_prefix/bin/sdl-config
35- fi
36- fi
37-
38- as_save_PATH="$PATH"
39- if test "x$prefix" != xNONE; then
40- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
41- fi
42- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
43- PATH="$as_save_PATH"
44 min_sdl_version=ifelse([$1], ,0.11.0,$1)
45- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
46- no_sdl=""
47- if test "$SDL_CONFIG" = "no" ; then
48- no_sdl=yes
49- else
50- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
51- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
52-
53- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
54- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
55- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
56- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
57- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
58- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
59- if test "x$enable_sdltest" = "xyes" ; then
60- ac_save_CFLAGS="$CFLAGS"
61- ac_save_CXXFLAGS="$CXXFLAGS"
62- ac_save_LIBS="$LIBS"
63- CFLAGS="$CFLAGS $SDL_CFLAGS"
64- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
65- LIBS="$LIBS $SDL_LIBS"
66-dnl
67-dnl Now check if the installed SDL is sufficiently new. (Also sanity
68-dnl checks the results of sdl-config to some extent
69-dnl
70- rm -f conf.sdltest
71- AC_TRY_RUN([
72-#include <stdio.h>
73-#include <stdlib.h>
74-#include <string.h>
75-#include "SDL.h"
76-
77-char*
78-my_strdup (char *str)
79-{
80- char *new_str;
81-
82- if (str)
83- {
84- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
85- strcpy (new_str, str);
86- }
87- else
88- new_str = NULL;
89-
90- return new_str;
91-}
92-
93-int main (int argc, char *argv[])
94-{
95- int major, minor, micro;
96- char *tmp_version;
97-
98- /* This hangs on some systems (?)
99- system ("touch conf.sdltest");
100- */
101- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
102-
103- /* HP/UX 9 (%@#!) writes to sscanf strings */
104- tmp_version = my_strdup("$min_sdl_version");
105- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
106- printf("%s, bad version string\n", "$min_sdl_version");
107- exit(1);
108- }
109-
110- if (($sdl_major_version > major) ||
111- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
112- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
113- {
114- return 0;
115- }
116- else
117- {
118- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
119- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
120- printf("*** best to upgrade to the required version.\n");
121- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
122- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
123- printf("*** config.cache before re-running configure\n");
124- return 1;
125- }
126-}
127-
128-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
129- CFLAGS="$ac_save_CFLAGS"
130- CXXFLAGS="$ac_save_CXXFLAGS"
131- LIBS="$ac_save_LIBS"
132- fi
133- fi
134- if test "x$no_sdl" = x ; then
135- AC_MSG_RESULT(yes)
136- ifelse([$2], , :, [$2])
137- else
138- AC_MSG_RESULT(no)
139- if test "$SDL_CONFIG" = "no" ; then
140- echo "*** The sdl-config script installed by SDL could not be found"
141- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
142- echo "*** your path, or set the SDL_CONFIG environment variable to the"
143- echo "*** full path to sdl-config."
144- else
145- if test -f conf.sdltest ; then
146- :
147- else
148- echo "*** Could not run SDL test program, checking why..."
149- CFLAGS="$CFLAGS $SDL_CFLAGS"
150- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
151- LIBS="$LIBS $SDL_LIBS"
152- AC_TRY_LINK([
153-#include <stdio.h>
154-#include "SDL.h"
155-
156-int main(int argc, char *argv[])
157-{ return 0; }
158-#undef main
159-#define main K_and_R_C_main
160-], [ return 0; ],
161- [ echo "*** The test program compiled, but did not run. This usually means"
162- echo "*** that the run-time linker is not finding SDL or finding the wrong"
163- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
164- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
165- echo "*** to the installed location Also, make sure you have run ldconfig if that"
166- echo "*** is required on your system"
167- echo "***"
168- echo "*** If you have an old version installed, it is best to remove it, although"
169- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
170- [ echo "*** The test program failed to compile or link. See the file config.log for the"
171- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
172- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
173- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
174- CFLAGS="$ac_save_CFLAGS"
175- CXXFLAGS="$ac_save_CXXFLAGS"
176- LIBS="$ac_save_LIBS"
177- fi
178- fi
179- SDL_CFLAGS=""
180- SDL_LIBS=""
181- ifelse([$3], , :, [$3])
182- fi
183+ PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version])
184 AC_SUBST(SDL_CFLAGS)
185 AC_SUBST(SDL_LIBS)
186- rm -f conf.sdltest
187 ])
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index f81d862cdc..e544b60eae 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -23,6 +23,7 @@ PR = "r3"
23SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 23SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
24 file://configure_tweak.patch \ 24 file://configure_tweak.patch \
25 file://libsdl-1.2.15-xdata32.patch \ 25 file://libsdl-1.2.15-xdata32.patch \
26 file://pkgconfig.patch \
26 " 27 "
27 28
28S = "${WORKDIR}/SDL-${PV}" 29S = "${WORKDIR}/SDL-${PV}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 14:23:54 +0000