summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-07-24 08:03:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-26 08:41:38 +0100
commitb369068d406f8689f2d8efa419af2449df8176e6 (patch)
tree988cb919d954677389c00aecccc0096439911dde /meta/recipes-graphics
parent385c1ccc189088d78b6c15575c7eb5e2bb78b097 (diff)
downloadpoky-b369068d406f8689f2d8efa419af2449df8176e6.tar.gz
libsdl: remove
All the users in OE-Core have moved to libsdl2. It will be moved to meta-oe. (From OE-Core rev: 4f967ade9001111c77ef298372e9b9e435414664) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch73
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch19
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch187
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb74
4 files changed, 0 insertions, 353 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
deleted file mode 100644
index ec8c0fd4fb..0000000000
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1From 44e4bb4cfb81024c8f5fd2e179e8a32c42756a2f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Jul 2017 16:52:43 -0700
4Subject: [PATCH] build: Pass --tag=CC explictly when using libtool
5
6Do not depend solely on libtool heuristics which fail
7in OE case when building with external compiler and
8hardening flags
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 Makefile.in | 4 ++--
15 build-scripts/makedep.sh | 8 ++++----
16 2 files changed, 6 insertions(+), 6 deletions(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index ab51035..743ce30 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -72,10 +72,10 @@ depend:
23 include $(depend)
24
25 $(objects)/$(TARGET): $(OBJECTS)
26- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
27+ $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
28
29 $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
30- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
31+ $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
32
33
34 install: all install-bin install-hdrs install-lib install-data install-man
35diff --git a/build-scripts/makedep.sh b/build-scripts/makedep.sh
36index 3b3863b..dba28f2 100755
37--- a/build-scripts/makedep.sh
38+++ b/build-scripts/makedep.sh
39@@ -51,19 +51,19 @@ do echo "Generating dependencies for $src"
40 case $ext in
41 c) cat >>${output}.new <<__EOF__
42
43- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
44+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
45
46 __EOF__
47 ;;
48 cc) cat >>${output}.new <<__EOF__
49
50- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
51+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
52
53 __EOF__
54 ;;
55 m) cat >>${output}.new <<__EOF__
56
57- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
58+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
59
60 __EOF__
61 ;;
62@@ -75,7 +75,7 @@ __EOF__
63 ;;
64 S) cat >>${output}.new <<__EOF__
65
66- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
67+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
68
69 __EOF__
70 ;;
71--
722.13.3
73
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
deleted file mode 100644
index f98b927522..0000000000
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1libX11-1.5.99.901 has changed prototype of _XData32
2
3Upstream-Status: Backport
4<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
9--- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800
10+++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100
11@@ -165,7 +165,7 @@
12 */
13 #ifdef LONG64
14 SDL_X11_MODULE(IO_32BIT)
15-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
16+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
17 SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
18 #endif
19
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
deleted file mode 100644
index 913baa92a0..0000000000
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
+++ /dev/null
@@ -1,187 +0,0 @@
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
deleted file mode 100644
index 7718d11919..0000000000
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ /dev/null
@@ -1,74 +0,0 @@
1SUMMARY = "Simple DirectMedia Layer"
2DESCRIPTION = "Simple DirectMedia Layer is a cross-platform multimedia \
3library designed to provide low level access to audio, keyboard, mouse, \
4joystick, 3D hardware via OpenGL, and 2D video framebuffer."
5HOMEPAGE = "http://www.libsdl.org"
6BUGTRACKER = "http://bugzilla.libsdl.org/"
7
8SECTION = "libs"
9
10LICENSE = "LGPLv2.1"
11LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
12
13PROVIDES = "virtual/libsdl"
14
15PR = "r3"
16
17SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
18 file://libsdl-1.2.15-xdata32.patch \
19 file://pkgconfig.patch \
20 file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \
21 "
22
23UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
24
25S = "${WORKDIR}/SDL-${PV}"
26
27SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85"
28SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
29
30BINCONFIG = "${bindir}/sdl-config"
31
32inherit autotools lib_package binconfig-disabled pkgconfig
33
34CVE_PRODUCT = "simple_directmedia_layer sdl"
35
36EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
37 --enable-file --disable-oss --disable-esd --disable-arts \
38 --disable-diskaudio --disable-nas \
39 --disable-mintaudio --disable-nasm --disable-video-dga \
40 --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
41 --disable-xbios --disable-gem --disable-video-dummy \
42 --enable-input-events --enable-pthreads \
43 --disable-video-svga \
44 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
45 --disable-rpath"
46
47PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
49PACKAGECONFIG_class-native = "x11"
50PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
51
52PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib"
53PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
54PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib"
55PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb"
56PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu"
57PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender"
58
59# The following two options should only enabled with mingw support
60PACKAGECONFIG[stdio-redirect] = "--enable-stdio-redirect,--disable-stdio-redirect"
61PACKAGECONFIG[directx] = "--enable-directx,--disable-directx"
62
63EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
64
65do_configure_prepend() {
66 # Remove old libtool macros.
67 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
68 for i in ${MACROS}; do
69 rm -f ${S}/acinclude/$i
70 done
71 export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
72}
73
74BBCLASSEXTEND = "native nativesdk"