* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-09-23 9:53 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2007-09-23 9:53 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-23 02:53:43 -0700 (Sun, 23 Sep 2007)
New Revision: 19957
Log:
Use correct library path for SDL
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2007-09-23 09:53:12 UTC (rev 19956)
+++ trunk/buildroot/package/sdl/sdl.mk 2007-09-23 09:53:43 UTC (rev 19957)
@@ -55,7 +55,7 @@
$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(STAGING_DIR)/include/directfb
$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
INCLUDE="-I./include -I$(STAGING_DIR)/usr/include/directfb" \
- LDFLAGS=-L$(STAGING_DIR)/usr \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR)
touch $@
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2009-01-22 7:51 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2009-01-22 7:51 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-22 07:51:28 +0000 (Thu, 22 Jan 2009)
New Revision: 24951
Log:
Make sure ln command does not break if link exist
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2009-01-22 07:39:12 UTC (rev 24950)
+++ trunk/buildroot/package/sdl/sdl.mk 2009-01-22 07:51:28 UTC (rev 24951)
@@ -75,7 +75,7 @@
ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
$(SDL_DIRECTFB_TARGET):
mkdir -p $(STAGING_DIR)/include
- ln -s ../usr/include/directfb $(SDL_DIRECTFB_TARGET)
+ ln -s -f ../usr/include/directfb $(SDL_DIRECTFB_TARGET)
endif
$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2009-01-11 20:24 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2009-01-11 20:24 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-11 20:24:24 +0000 (Sun, 11 Jan 2009)
New Revision: 24761
Log:
Make sure SDL finds DirectFB headers ,if used
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2009-01-11 20:21:04 UTC (rev 24760)
+++ trunk/buildroot/package/sdl/sdl.mk 2009-01-11 20:24:24 UTC (rev 24761)
@@ -9,6 +9,8 @@
SDL_CAT:=$(ZCAT)
SDL_DIR:=$(BUILD_DIR)/SDL-$(SDL_VERSION)
+SDL_EXTRA_CFLAGS = -I./include -D_GNU_SOURCE=1 -fvisibility=hidden -D_REENTRANT -D_REENTRANT -DHAVE_LINUX_VERSION_H
+
ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
SDL_FBCON=--enable-video-fbcon=yes
else
@@ -19,6 +21,7 @@
SDL_DIRECTFB=--enable-video-directfb=yes
SDL_DIRECTFB_TARGET:=$(STAGING_DIR)/include/directfb
SDL_DIRECTFB_INCLUDES:=-I$(STAGING_DIR)/usr/include/directfb
+SDL_EXTRA_CFLAGS += $(SDL_DIRECTFB_INCLUDES)
else
SDL_DIRECTFB=--enable-video-directfb=no
endif
@@ -71,12 +74,13 @@
ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
$(SDL_DIRECTFB_TARGET):
- ln -s ../usr/include/directfb $(STAGING_DIR)/include/directfb
+ mkdir -p $(STAGING_DIR)/include
+ ln -s ../usr/include/directfb $(SDL_DIRECTFB_TARGET)
endif
$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
- INCLUDE="-I./include $(SDL_DIRECTFB_INCLUDES)" \
+ EXTRA_CFLAGS="$(SDL_EXTRA_CFLAGS)" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR)
touch $@
@@ -94,6 +98,8 @@
SDL sdl: uclibc $(TARGET_DIR)/usr/lib/libSDL.so
+sdl-unpacked: $(SDL_DIR)/.unpacked
+
sdl-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_DIR) uninstall
-$(MAKE) -C $(SDL_DIR) clean
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2008-03-17 16:39 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-17 16:39 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-17 09:39:03 -0700 (Mon, 17 Mar 2008)
New Revision: 21369
Log:
sdl: Fix include files install.
Patch sdl-config rpath setting rather than setting exec-prefix and
using DESTDIR as the SDL makefile uses prefix for some files,
and exec-prefix for others leading to double $(STAGING_DIR) prefix.
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2008-03-17 15:28:07 UTC (rev 21368)
+++ trunk/buildroot/package/sdl/sdl.mk 2008-03-17 16:39:03 UTC (rev 21369)
@@ -56,7 +56,6 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR)/usr \
- --exec-prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-pulseaudio=no \
@@ -83,9 +82,9 @@
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install
-# sdl-config uses -Lexec_prefix/lib instead of -Lprefix/lib - fix it
- $(SED) 's^-L\$${exec_prefix}^-L\$${prefix}^' \
+ $(MAKE) -C $(SDL_DIR) install
+# use correct rpath for linking
+ $(SED) 's^libdir=\$${exec_prefix}^libdir=/usr^' \
$(STAGING_DIR)/usr/bin/sdl-config
touch -c $@
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2008-03-07 13:31 jacmet at uclibc.org
2008-03-14 1:05 ` Hebbar
2008-03-14 2:40 ` Hebbar
0 siblings, 2 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-07 13:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-07 05:31:24 -0800 (Fri, 07 Mar 2008)
New Revision: 21270
Log:
sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:16 UTC (rev 21269)
+++ trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:24 UTC (rev 21270)
@@ -55,18 +55,10 @@
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=/usr \
+ --prefix=$(STAGING_DIR)/usr \
--exec-prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/man \
- --infodir=/info \
--enable-pulseaudio=no \
--disable-arts \
--disable-esd \
@@ -91,11 +83,9 @@
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
- -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
- -e "s,-I/include/SDL,-I\'$(STAGING_DIR)/include/SDL\',g" \
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install
+# sdl-config uses -Lexec_prefix/lib instead of -Lprefix/lib - fix it
+ $(SED) 's^-L\$${exec_prefix}^-L\$${prefix}^' \
$(STAGING_DIR)/usr/bin/sdl-config
touch -c $@
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/sdl
2008-03-07 13:31 jacmet at uclibc.org
@ 2008-03-14 1:05 ` Hebbar
2008-03-17 16:47 ` Peter Korsgaard
2008-03-14 2:40 ` Hebbar
1 sibling, 1 reply; 24+ messages in thread
From: Hebbar @ 2008-03-14 1:05 UTC (permalink / raw)
To: buildroot
Hi,
With this commit, sdl header are not copied to $(STAGING_DIR)/usr/include
folder and sdl_mixer fails to build because of missing sdl.h and other sdl
related header files.
I think we need to maintain --includedir option.
Regards
Gururaja
/bin/sh ./libtool --mode=compile
/opt/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibcgnueabi-gcc -O0
-I/opt/buildroot/build_arm/staging_dir/usr/include
-I/opt/buildroot/build_arm/staging_dir/include
--sysroot=/opt/buildroot/build_arm/staging_dir/ -isysroot
/opt/buildroot/build_arm/staging_dir -mtune=arm9tdmi -D_GNU_SOURCE=1
-I/opt/buildroot/build_arm/staging_dir/usr/include/SDL -D_GNU_SOURCE=1
-D_REENTRANT -DCMD_MUSIC -DWAV_MUSIC -DMOD_MUSIC -I./mikmod -DMID_MUSIC
-DUSE_TIMIDITY_MIDI -I./timidity -c ./effect_position.c -o
build/effect_position.lo
mkdir build/.libs
/opt/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibcgnueabi-gcc
-O0 -I/opt/buildroot/build_arm/staging_dir/usr/include
-I/opt/buildroot/build_arm/staging_dir/include
--sysroot=/opt/buildroot/build_arm/staging_dir/ -isysroot
/opt/buildroot/build_arm/staging_dir -mtune=arm9tdmi -D_GNU_SOURCE=1
-I/opt/buildroot/build_arm/staging_dir/usr/include/SDL -D_GNU_SOURCE=1
-D_REENTRANT -DCMD_MUSIC -DWAV_MUSIC -DMOD_MUSIC -I./mikmod -DMID_MUSIC
-DUSE_TIMIDITY_MIDI -I./timidity -c ./effect_position.c -fPIC -DPIC -o
build/.libs/effect_position.o
./effect_position.c:31:17: error: SDL.h: No such file or directory
In file included from ./effect_position.c:32:
./SDL_mixer.h:28:23: error: SDL_types.h: No such file or directory
./SDL_mixer.h:29:23: error: SDL_rwops.h: No such file or directory
./SDL_mixer.h:30:23: error: SDL_audio.h: No such file or directory
./SDL_mixer.h:31:24: error: SDL_endian.h: No such file or directory
./SDL_mixer.h:32:25: error: SDL_version.h: No such file or directory
./SDL_mixer.h:33:24: error: begin_code.h: No such file or directory
In file included from ./effect_position.c:32:
./SDL_mixer.h:66: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'const'
./SDL_mixer.h:87: error: expected specifier-qualifier-list before 'Uint8'
./SDL_mixer.h:114: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'int'
./SDL_mixer.h:122: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'int'
./SDL_mixer.h:127: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'int'
./SDL_mixer.h:130: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'Mix_Chunk'
root at guru_vlinux:/opt/buildroot# ls -la
build_arm/staging_dir/usr/include/SDL
ls: build_arm/staging_dir/usr/include/SDL: No such file or directory
root at guru_vlinux:/opt/buildroot#
root at guru_vlinux:/opt/buildroot# ls -la
build_arm/staging_dir/usr/lib/libSDL*
lrwxrwxrwx 1 root root 20 Mar 14 12:50
build_arm/staging_dir/usr/lib/libSDL-1.2.so.0 -> libSDL-1.2.so.0.11.2
-rwxr-xr-x 1 root root 1053059 Mar 14 12:51
build_arm/staging_dir/usr/lib/libSDL-1.2.so.0.11.2
-rw-r--r-- 1 root root 1544098 Mar 14 12:50
build_arm/staging_dir/usr/lib/libSDL.a
-rwxr-xr-x 1 root root 1145 Mar 14 12:50
build_arm/staging_dir/usr/lib/libSDL.la
lrwxrwxrwx 1 root root 20 Mar 14 12:50
build_arm/staging_dir/usr/lib/libSDL.so -> libSDL-1.2.so.0.11.2
-rw-r--r-- 1 root root 1750 Mar 14 12:50
build_arm/staging_dir/usr/lib/libSDLmain.a
root at guru_vlinux:/opt/buildroot#
Peter Korsgaard-3 wrote:
>
> Log:
> sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib
>
>
> Modified:
> trunk/buildroot/package/sdl/sdl.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/sdl/sdl.mk
> ===================================================================
> --- trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:16 UTC (rev 21269)
> +++ trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:24 UTC (rev 21270)
> @@ -55,18 +55,10 @@
> --target=$(GNU_TARGET_NAME) \
> --host=$(GNU_TARGET_NAME) \
> --build=$(GNU_HOST_NAME) \
> - --prefix=/usr \
> + --prefix=$(STAGING_DIR)/usr \
> --exec-prefix=/usr \
> - --bindir=/bin \
> - --sbindir=/sbin \
> - --libdir=/lib \
> - --libexecdir=/lib \
> --sysconfdir=/etc \
> - --datadir=/share \
> --localstatedir=/var \
> - --includedir=/include \
> - --mandir=/man \
> - --infodir=/info \
> --enable-pulseaudio=no \
> --disable-arts \
> --disable-esd \
> @@ -91,11 +83,9 @@
> touch $@
>
> $(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
> - $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install
> - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
> - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
> - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
> - -e "s,-I/include/SDL,-I\'$(STAGING_DIR)/include/SDL\',g" \
> + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install
> +# sdl-config uses -Lexec_prefix/lib instead of -Lprefix/lib - fix it
> + $(SED) 's^-L\$${exec_prefix}^-L\$${prefix}^' \
> $(STAGING_DIR)/usr/bin/sdl-config
> touch -c $@
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
>
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-sdl-tp15896866p16042261.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/sdl
2008-03-14 1:05 ` Hebbar
@ 2008-03-17 16:47 ` Peter Korsgaard
0 siblings, 0 replies; 24+ messages in thread
From: Peter Korsgaard @ 2008-03-17 16:47 UTC (permalink / raw)
To: buildroot
>>>>> "Hebbar" == Hebbar <gururajakr@sanyo.co.in> writes:
Hebbar> Hi,
Hebbar> With this commit, sdl header are not copied to
Hebbar> $(STAGING_DIR)/usr/include folder and sdl_mixer fails to
Hebbar> build because of missing sdl.h and other sdl related header
Hebbar> files.
Sorry, my testing didn't catch that as I already had the headers
installed - Should be fixed now.
Hebbar> I think we need to maintain --includedir option.
I fixed it instead by skipping the exec-prefix stuff and instead
patching sdl-config after install.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
2008-03-07 13:31 jacmet at uclibc.org
2008-03-14 1:05 ` Hebbar
@ 2008-03-14 2:40 ` Hebbar
1 sibling, 0 replies; 24+ messages in thread
From: Hebbar @ 2008-03-14 2:40 UTC (permalink / raw)
To: buildroot
Hi,
Today i tried building buildroot for arm926ejs with yesterdays snapshot for
sdl & sdl mixer and what i found was that
1. make sdl will not create $(STAGING_DIR)/usr/include/SDL and will not copy
sdl header files to $(STAGING_DIR)/usr/include/SDL
2. and hence "make sdl_mixer" fails with missing sdl files
/bin/sh ./libtool --mode=compile
/opt/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibcgnueabi-gcc
-O0 -I/opt/buildroot/build_arm/staging_dir/usr/include
-I/opt/buildroot/build_arm/staging_dir/include
--sysroot=/opt/buildroot/build_arm/staging_dir/ -isysroot
/opt/buildroot/build_arm/staging_dir -mtune=arm9tdmi -D_GNU_SOURCE=1
-I/opt/buildroot/build_arm/staging_dir/include/SDL -D_GNU_SOURCE=1
-D_REENTRANT -DCMD_MUSIC -DWAV_MUSIC -DMOD_MUSIC -I./mikmod -DMID_MUSIC
-DUSE_TIMIDITY_MIDI -I./timidity -c ./effect_position.c -o
build/effect_position.lo mkdir build/.libs
/opt/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibcgnueabi-gcc
-O0 -I/opt/buildroot/build_arm/staging_dir/usr/include
-I/opt/buildroot/build_arm/staging_dir/include
--sysroot=/opt/buildroot/build_arm/staging_dir/ -isysroot
/opt/buildroot/build_arm/staging_dir -mtune=arm9tdmi -D_GNU_SOURCE=1
-I/opt/buildroot/build_arm/staging_dir/include/SDL -D_GNU_SOURCE=1
-D_REENTRANT -DCMD_MUSIC -DWAV_MUSIC -DMOD_MUSIC -I./mikmod -DMID_MUSIC
-DUSE_TIMIDITY_MIDI -I./timidity -c ./effect_position.c -fPIC -DPIC -o
build/.libs/effect_position.o
./effect_position.c:31:17: error: SDL.h: No such file or directory In file
included from ./effect_position.c:32:
./SDL_mixer.h:28:23: error: SDL_types.h: No such file or directory
./SDL_mixer.h:29:23: error: SDL_rwops.h: No such file or directory
./SDL_mixer.h:30:23: error: SDL_audio.h: No such file or directory
./SDL_mixer.h:31:24: error: SDL_endian.h: No such file or directory
./SDL_mixer.h:32:25: error: SDL_version.h: No such file or directory
./SDL_mixer.h:33:24: error: begin_code.h: No such file or directory In file
included from ./effect_position.c:32:
./SDL_mixer.h:66: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'const'
./SDL_mixer.h:87: error: expected specifier-qualifier-list before 'Uint8'
./SDL_mixer.h:114: error: expected '=', ',', ';', 'asm' or '__attribute__'
before 'int'
I reverted back the patch you had applied on
http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-sdl-ts158968
66.html and sdl builds correctly with header files copied to
$(STAGING_DIR)/usr/include/SDL.
but again sdl_mixer fails with the same error.
so i added CFLAGS to configure command as below and sdl_mixer is building
properly now,
$(SDL_MIXER_DIR)/.configured: $(SDL_MIXER_DIR)/.unpacked
$(STAGING_DIR)/usr/lib/libSDL.so
(cd $(SDL_MIXER_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CFLAGS+=-I$(STAGING_DIR)/usr/include/SDL \
<--------- i added this
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
<snip>
<snip>
<snip>
Kindly let me know if i need to change or add or update any files so as to
match your configs.
Regards
Gururaja
Author: jacmet
Date: 2008-03-07 05:31:24 -0800 (Fri, 07 Mar 2008)
New Revision: 21270
Log:
sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:16 UTC (rev 21269)
+++ trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:24 UTC (rev 21270)
@@ -55,18 +55,10 @@
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=/usr \
+ --prefix=$(STAGING_DIR)/usr \
--exec-prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/man \
- --infodir=/info \
--enable-pulseaudio=no \
--disable-arts \
--disable-esd \
@@ -91,11 +83,9 @@
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
- -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
- -e "s,-I/include/SDL,-I\'$(STAGING_DIR)/include/SDL\',g" \
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install
+# sdl-config uses -Lexec_prefix/lib instead of -Lprefix/lib - fix it
+ $(SED) 's^-L\$${exec_prefix}^-L\$${prefix}^' \
$(STAGING_DIR)/usr/bin/sdl-config
touch -c $@
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-sdl-tp15896866p16043054.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2008-03-07 13:31 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-07 13:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-07 05:31:16 -0800 (Fri, 07 Mar 2008)
New Revision: 21269
Log:
sdl: bump version
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:11 UTC (rev 21268)
+++ trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:16 UTC (rev 21269)
@@ -3,7 +3,7 @@
# SDL
#
#############################################################
-SDL_VERSION:=1.2.12
+SDL_VERSION:=1.2.13
SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
SDL_SITE:=http://www.libsdl.org/release
SDL_CAT:=$(ZCAT)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2008-03-07 13:31 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-07 13:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-07 05:31:11 -0800 (Fri, 07 Mar 2008)
New Revision: 21268
Log:
sdl: remove unused legacy patch
Removed:
trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch
Changeset:
Deleted: trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch
===================================================================
--- trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch 2008-03-07 13:31:07 UTC (rev 21267)
+++ trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch 2008-03-07 13:31:11 UTC (rev 21268)
@@ -1,59 +0,0 @@
-diff -urN SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c
---- SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c 2006-05-17 06:16:06.000000000 +0300
-+++ SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c 2007-06-24 22:19:41.000000000 +0300
-@@ -29,9 +29,17 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
--#include <asm/page.h> /* For definition of PAGE_SIZE */
- #include <linux/vt.h>
-
-+#if defined(linux)
-+#define HAS_MMAP_ANON
-+#include <sys/types.h>
-+#include <sys/mman.h>
-+#include <asm/page.h> /* PAGE_SIZE */
-+#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
-+#define HAS_GETPAGESIZE
-+#endif /* linux */
-+
- #include "SDL_video.h"
- #include "SDL_mouse.h"
- #include "../SDL_sysvideo.h"
-@@ -474,6 +482,7 @@
- unsigned int current_h;
- const char *SDL_fbdev;
- FILE *modesdb;
-+ int pagesize = -1;
-
- /* Initialize the library */
- SDL_fbdev = SDL_getenv("SDL_FBDEV");
-@@ -545,9 +554,27 @@
- }
- }
-
-+#if defined(_SC_PAGESIZE) && defined(HAS_SC_PAGESIZE)
-+ pagesize = sysconf(_SC_PAGESIZE);
-+#endif
-+#ifdef _SC_PAGE_SIZE
-+ if (pagesize == -1)
-+ pagesize = sysconf(_SC_PAGE_SIZE);
-+#endif
-+#ifdef HAS_GETPAGESIZE
-+ if (pagesize == -1)
-+ pagesize = getpagesize();
-+#endif
-+#ifdef PAGE_SIZE
-+ if (pagesize == -1)
-+ pagesize = PAGE_SIZE;
-+#endif
-+ if (pagesize == -1)
-+ pagesize = 4096;
-+
- /* Memory map the device, compensating for buggy PPC mmap() */
- mapped_offset = (((long)finfo.smem_start) -
-- (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
-+ (((long)finfo.smem_start)&~(pagesize-1)));
- mapped_memlen = finfo.smem_len+mapped_offset;
- mapped_mem = do_mmap(NULL, mapped_memlen,
- PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2008-03-07 13:31 jacmet at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: jacmet at uclibc.org @ 2008-03-07 13:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-03-07 05:31:07 -0800 (Fri, 07 Mar 2008)
New Revision: 21267
Log:
sdl: remove wrong comment
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2008-03-07 10:07:35 UTC (rev 21266)
+++ trunk/buildroot/package/sdl/sdl.mk 2008-03-07 13:31:07 UTC (rev 21267)
@@ -4,8 +4,6 @@
#
#############################################################
SDL_VERSION:=1.2.12
-# 1.2.12 is available, but depends on Pulse Audio 0.9
-# which is not available in buildroot (yet)
SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
SDL_SITE:=http://www.libsdl.org/release
SDL_CAT:=$(ZCAT)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-11-16 15:35 vanokuten at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: vanokuten at uclibc.org @ 2007-11-16 15:35 UTC (permalink / raw)
To: buildroot
Author: vanokuten
Date: 2007-11-16 07:35:14 -0800 (Fri, 16 Nov 2007)
New Revision: 20440
Log:
correct paths in sdl-config
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2007-11-16 15:33:46 UTC (rev 20439)
+++ trunk/buildroot/package/sdl/sdl.mk 2007-11-16 15:35:14 UTC (rev 20440)
@@ -94,6 +94,11 @@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
+ -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+ -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
+ -e "s,-I/include/SDL,-I\'$(STAGING_DIR)/include/SDL\',g" \
+ $(STAGING_DIR)/usr/bin/sdl-config
touch -c $@
$(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-11-16 12:37 vanokuten at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: vanokuten at uclibc.org @ 2007-11-16 12:37 UTC (permalink / raw)
To: buildroot
Author: vanokuten
Date: 2007-11-16 04:37:23 -0800 (Fri, 16 Nov 2007)
New Revision: 20434
Log:
update SDL to 1.2.12, allow video driver selection
Modified:
trunk/buildroot/package/sdl/Config.in
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/Config.in
===================================================================
--- trunk/buildroot/package/sdl/Config.in 2007-11-16 12:20:30 UTC (rev 20433)
+++ trunk/buildroot/package/sdl/Config.in 2007-11-16 12:37:23 UTC (rev 20434)
@@ -1,7 +1,27 @@
config BR2_PACKAGE_SDL
bool "SDL"
default n
- select BR2_PACKAGE_DIRECTFB
help
http://www.libsdl.org/
+
+menu "SDL options selection"
+ depends BR2_PACKAGE_SDL
+
+config BR2_PACKAGE_SDL_FBCON
+ bool "SDL framebuffer console video driver"
+ default y
+
+config BR2_PACKAGE_SDL_DIRECTFB
+ bool "SDL DirectFB video driver"
+ default n
+
+config BR2_PACKAGE_SDL_QTOPIA
+ bool "SDL Qtopia video driver"
+ default n
+
+config BR2_PACKAGE_SDL_X11
+ bool "SDL X11 video driver"
+ default n
+
+endmenu
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2007-11-16 12:20:30 UTC (rev 20433)
+++ trunk/buildroot/package/sdl/sdl.mk 2007-11-16 12:37:23 UTC (rev 20434)
@@ -3,7 +3,7 @@
# SDL
#
#############################################################
-SDL_VERSION:=1.2.11
+SDL_VERSION:=1.2.12
# 1.2.12 is available, but depends on Pulse Audio 0.9
# which is not available in buildroot (yet)
SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
@@ -11,6 +11,32 @@
SDL_CAT:=$(ZCAT)
SDL_DIR:=$(BUILD_DIR)/SDL-$(SDL_VERSION)
+ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
+SDL_FBCON=--enable-video-fbcon=yes
+else
+SDL_FBCON=--enable-video-fbcon=no
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
+SDL_DIRECTFB=--enable-video-directfb=yes
+SDL_DIRECTFB_TARGET:=$(STAGING_DIR)/include/directfb
+SDL_DIRECTFB_INCLUDES:=-I$(STAGING_DIR)/usr/include/directfb
+else
+SDL_DIRECTFB=--enable-video-directfb=no
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
+SDL_QTOPIA=--enable-video-qtopia=yes
+else
+SDL_QTOPIA=--enable-video-qtopia=no
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_X11),y)
+SDL_X11=--enable-video-x11=yes
+else
+SDL_X11=--enable-video-x11=no
+endif
+
$(DL_DIR)/$(SDL_SOURCE):
$(WGET) -P $(DL_DIR) $(SDL_SITE)/$(SDL_SOURCE)
@@ -43,18 +69,25 @@
--includedir=/include \
--mandir=/man \
--infodir=/info \
+ --enable-pulseaudio=no \
--disable-arts \
--disable-esd \
--disable-nasm \
- --disable-video-x11 )
+ $(SDL_FBCON) \
+ $(SDL_DIRECTFB) \
+ $(SDL_QTOPIA) \
+ $(SDL_X11) \
+ )
touch $@
-$(STAGING_DIR)/include/directfb:
+ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
+$(SDL_DIRECTFB_TARGET):
ln -s ../usr/include/directfb $(STAGING_DIR)/include/directfb
+endif
-$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(STAGING_DIR)/include/directfb
+$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
- INCLUDE="-I./include -I$(STAGING_DIR)/usr/include/directfb" \
+ INCLUDE="-I./include $(SDL_DIRECTFB_INCLUDES)" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR)
touch $@
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-08-12 23:31 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2007-08-12 23:31 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-12 16:31:36 -0700 (Sun, 12 Aug 2007)
New Revision: 19475
Log:
Cleanup of SDL to make it build
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2007-08-12 23:30:06 UTC (rev 19474)
+++ trunk/buildroot/package/sdl/sdl.mk 2007-08-12 23:31:36 UTC (rev 19475)
@@ -4,6 +4,8 @@
#
#############################################################
SDL_VERSION:=1.2.11
+# 1.2.12 is available, but depends on Pulse Audio 0.9
+# which is not available in buildroot (yet)
SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
SDL_SITE:=http://www.libsdl.org/release
SDL_CAT:=$(ZCAT)
@@ -16,7 +18,8 @@
$(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE)
$(SDL_CAT) $(DL_DIR)/$(SDL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl\*.patch
+ toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl-$(SDL_VERSION)\*.patch
+ $(CONFIG_UPDATE) $(SDL_DIR)
$(CONFIG_UPDATE) $(SDL_DIR)/build-scripts
touch $@
@@ -30,28 +33,34 @@
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
+ --bindir=/bin \
+ --sbindir=/sbin \
--libdir=/lib \
- --libexecdir=/usr/lib \
+ --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/usr/share \
+ --datadir=/share \
--localstatedir=/var \
--includedir=/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
+ --mandir=/man \
+ --infodir=/info \
--disable-arts \
--disable-esd \
--disable-nasm \
--disable-video-x11 );
touch $@
-$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured
- $(MAKE1) -C $(SDL_DIR)
+$(STAGING_DIR)/include/directfb:
+ ln -s ../usr/include/directfb $(STAGING_DIR)/include/directfb
+
+$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(STAGING_DIR)/include/directfb
+ $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
+ INCLUDE="-I./include -I$(STAGING_DIR)/usr/include/directfb" \
+ LDFLAGS=-L$(STAGING_DIR)/usr \
+ DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR)
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install;
+ $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install;
touch -c $@
$(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-08-11 22:09 ulf at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 22:09 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 15:09:09 -0700 (Sat, 11 Aug 2007)
New Revision: 19443
Log:
Fix mismatch in SDL patch naming convention
Added:
trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch
Removed:
trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch
Changeset:
Deleted: trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch
===================================================================
--- trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch 2007-08-11 22:01:13 UTC (rev 19442)
+++ trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch 2007-08-11 22:09:09 UTC (rev 19443)
@@ -1,59 +0,0 @@
-diff -urN SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c
---- SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c 2006-05-17 06:16:06.000000000 +0300
-+++ SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c 2007-06-24 22:19:41.000000000 +0300
-@@ -29,9 +29,17 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
--#include <asm/page.h> /* For definition of PAGE_SIZE */
- #include <linux/vt.h>
-
-+#if defined(linux)
-+#define HAS_MMAP_ANON
-+#include <sys/types.h>
-+#include <sys/mman.h>
-+#include <asm/page.h> /* PAGE_SIZE */
-+#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
-+#define HAS_GETPAGESIZE
-+#endif /* linux */
-+
- #include "SDL_video.h"
- #include "SDL_mouse.h"
- #include "../SDL_sysvideo.h"
-@@ -474,6 +482,7 @@
- unsigned int current_h;
- const char *SDL_fbdev;
- FILE *modesdb;
-+ int pagesize = -1;
-
- /* Initialize the library */
- SDL_fbdev = SDL_getenv("SDL_FBDEV");
-@@ -545,9 +554,27 @@
- }
- }
-
-+#if defined(_SC_PAGESIZE) && defined(HAS_SC_PAGESIZE)
-+ pagesize = sysconf(_SC_PAGESIZE);
-+#endif
-+#ifdef _SC_PAGE_SIZE
-+ if (pagesize == -1)
-+ pagesize = sysconf(_SC_PAGE_SIZE);
-+#endif
-+#ifdef HAS_GETPAGESIZE
-+ if (pagesize == -1)
-+ pagesize = getpagesize();
-+#endif
-+#ifdef PAGE_SIZE
-+ if (pagesize == -1)
-+ pagesize = PAGE_SIZE;
-+#endif
-+ if (pagesize == -1)
-+ pagesize = 4096;
-+
- /* Memory map the device, compensating for buggy PPC mmap() */
- mapped_offset = (((long)finfo.smem_start) -
-- (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
-+ (((long)finfo.smem_start)&~(pagesize-1)));
- mapped_memlen = finfo.smem_len+mapped_offset;
- mapped_mem = do_mmap(NULL, mapped_memlen,
- PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
Copied: trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch (from rev 19425, trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch)
===================================================================
--- trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch (rev 0)
+++ trunk/buildroot/package/sdl/sdl-1.2.11-patch_PAGE_SIZE.patch 2007-08-11 22:09:09 UTC (rev 19443)
@@ -0,0 +1,59 @@
+diff -urN SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c
+--- SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c 2006-05-17 06:16:06.000000000 +0300
++++ SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c 2007-06-24 22:19:41.000000000 +0300
+@@ -29,9 +29,17 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* For definition of PAGE_SIZE */
+ #include <linux/vt.h>
+
++#if defined(linux)
++#define HAS_MMAP_ANON
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <asm/page.h> /* PAGE_SIZE */
++#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
++#define HAS_GETPAGESIZE
++#endif /* linux */
++
+ #include "SDL_video.h"
+ #include "SDL_mouse.h"
+ #include "../SDL_sysvideo.h"
+@@ -474,6 +482,7 @@
+ unsigned int current_h;
+ const char *SDL_fbdev;
+ FILE *modesdb;
++ int pagesize = -1;
+
+ /* Initialize the library */
+ SDL_fbdev = SDL_getenv("SDL_FBDEV");
+@@ -545,9 +554,27 @@
+ }
+ }
+
++#if defined(_SC_PAGESIZE) && defined(HAS_SC_PAGESIZE)
++ pagesize = sysconf(_SC_PAGESIZE);
++#endif
++#ifdef _SC_PAGE_SIZE
++ if (pagesize == -1)
++ pagesize = sysconf(_SC_PAGE_SIZE);
++#endif
++#ifdef HAS_GETPAGESIZE
++ if (pagesize == -1)
++ pagesize = getpagesize();
++#endif
++#ifdef PAGE_SIZE
++ if (pagesize == -1)
++ pagesize = PAGE_SIZE;
++#endif
++ if (pagesize == -1)
++ pagesize = 4096;
++
+ /* Memory map the device, compensating for buggy PPC mmap() */
+ mapped_offset = (((long)finfo.smem_start) -
+- (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++ (((long)finfo.smem_start)&~(pagesize-1)));
+ mapped_memlen = finfo.smem_len+mapped_offset;
+ mapped_mem = do_mmap(NULL, mapped_memlen,
+ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-08-11 21:47 ulf at uclibc.org
2007-08-11 22:46 ` Ivan Kuten
0 siblings, 1 reply; 24+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 21:47 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 14:47:51 -0700 (Sat, 11 Aug 2007)
New Revision: 19439
Log:
Run $\(CONFIG_UPDATE\) in the unpack rules for sdl, Use $\(MAKE1\)
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2007-08-11 21:47:28 UTC (rev 19438)
+++ trunk/buildroot/package/sdl/sdl.mk 2007-08-11 21:47:51 UTC (rev 19439)
@@ -17,6 +17,7 @@
$(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE)
$(SDL_CAT) $(DL_DIR)/$(SDL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl\*.patch
+ $(CONFIG_UPDATE) $(SDL_DIR)/build-scripts
touch $@
$(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
@@ -46,7 +47,7 @@
touch $@
$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured
- $(MAKE) -C $(SDL_DIR)
+ $(MAKE1) -C $(SDL_DIR)
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
2007-08-11 21:47 ulf at uclibc.org
@ 2007-08-11 22:46 ` Ivan Kuten
0 siblings, 0 replies; 24+ messages in thread
From: Ivan Kuten @ 2007-08-11 22:46 UTC (permalink / raw)
To: buildroot
ulf at uclibc.org ?????:
> Author: ulf
> Date: 2007-08-11 14:47:51 -0700 (Sat, 11 Aug 2007)
> New Revision: 19439
>
> Log:
> Run $\(CONFIG_UPDATE\) in the unpack rules for sdl, Use $\(MAKE1\)
>
> Modified:
> trunk/buildroot/package/sdl/sdl.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/sdl/sdl.mk
> ===================================================================
> --- trunk/buildroot/package/sdl/sdl.mk 2007-08-11 21:47:28 UTC (rev 19438)
> +++ trunk/buildroot/package/sdl/sdl.mk 2007-08-11 21:47:51 UTC (rev 19439)
> @@ -17,6 +17,7 @@
> $(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE)
> $(SDL_CAT) $(DL_DIR)/$(SDL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl\*.patch
> + $(CONFIG_UPDATE) $(SDL_DIR)/build-scripts
> touch $@
>
> $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
> @@ -46,7 +47,7 @@
> touch $@
>
> $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured
> - $(MAKE) -C $(SDL_DIR)
> + $(MAKE1) -C $(SDL_DIR)
> touch $@
>
> $(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
Ulf,
please correct
toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl\*.patch
to
toolchain/patch-kernel.sh $(SDL_DIR) package/sdl SDL\*.patch
or rename
SDL-1.2.11-patch_PAGE_SIZE.patch to lowercase sdl-1.2.11-patch_PAGE_SIZE.patch
BR,
Ivan
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-07-25 17:39 ulf at uclibc.org
2007-07-25 22:39 ` Bernhard Fischer
0 siblings, 1 reply; 24+ messages in thread
From: ulf at uclibc.org @ 2007-07-25 17:39 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-25 10:39:26 -0700 (Wed, 25 Jul 2007)
New Revision: 19261
Log:
Make SDL seled DirectFB
Modified:
trunk/buildroot/package/sdl/Config.in
Changeset:
Modified: trunk/buildroot/package/sdl/Config.in
===================================================================
--- trunk/buildroot/package/sdl/Config.in 2007-07-25 17:37:50 UTC (rev 19260)
+++ trunk/buildroot/package/sdl/Config.in 2007-07-25 17:39:26 UTC (rev 19261)
@@ -1,6 +1,7 @@
config BR2_PACKAGE_SDL
bool "SDL"
default n
+ select BR2_PACKAGE_DIRECTFB
help
http://www.libsdl.org/
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
2007-07-25 17:39 ulf at uclibc.org
@ 2007-07-25 22:39 ` Bernhard Fischer
2007-07-25 23:47 ` Ulf Samuelsson
0 siblings, 1 reply; 24+ messages in thread
From: Bernhard Fischer @ 2007-07-25 22:39 UTC (permalink / raw)
To: buildroot
On Wed, Jul 25, 2007 at 10:39:27AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-07-25 10:39:26 -0700 (Wed, 25 Jul 2007)
>New Revision: 19261
>
>Log:
>Make SDL seled DirectFB
>
>Modified:
> trunk/buildroot/package/sdl/Config.in
>
>
>Changeset:
>Modified: trunk/buildroot/package/sdl/Config.in
>===================================================================
>--- trunk/buildroot/package/sdl/Config.in 2007-07-25 17:37:50 UTC (rev 19260)
>+++ trunk/buildroot/package/sdl/Config.in 2007-07-25 17:39:26 UTC (rev 19261)
>@@ -1,6 +1,7 @@
> config BR2_PACKAGE_SDL
> bool "SDL"
> default n
>+ select BR2_PACKAGE_DIRECTFB
Why? It's perfectly fine to build SDL without
a) FB support (any FB support)
b) with the stock FB (no directfb)
If you want directfb and directfb-support, the you should select it
manually, no?
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
2007-07-25 22:39 ` Bernhard Fischer
@ 2007-07-25 23:47 ` Ulf Samuelsson
2007-07-26 1:06 ` Rex Ashbaugh
0 siblings, 1 reply; 24+ messages in thread
From: Ulf Samuelsson @ 2007-07-25 23:47 UTC (permalink / raw)
To: buildroot
tor 2007-07-26 klockan 00:39 +0200 skrev Bernhard Fischer:
> On Wed, Jul 25, 2007 at 10:39:27AM -0700, ulf at uclibc.org wrote:
> >Author: ulf
> >Date: 2007-07-25 10:39:26 -0700 (Wed, 25 Jul 2007)
> >New Revision: 19261
> >
> >Log:
> >Make SDL seled DirectFB
> >
> >Modified:
> > trunk/buildroot/package/sdl/Config.in
> >
> >
> >Changeset:
> >Modified: trunk/buildroot/package/sdl/Config.in
> >===================================================================
> >--- trunk/buildroot/package/sdl/Config.in 2007-07-25 17:37:50 UTC (rev 19260)
> >+++ trunk/buildroot/package/sdl/Config.in 2007-07-25 17:39:26 UTC (rev 19261)
> >@@ -1,6 +1,7 @@
> > config BR2_PACKAGE_SDL
> > bool "SDL"
> > default n
> >+ select BR2_PACKAGE_DIRECTFB
>
> Why? It's perfectly fine to build SDL without
> a) FB support (any FB support)
> b) with the stock FB (no directfb)
>
The SDL compile failed since "directfb.h" could not be found
so I made the assumption, that it was neccessary.
Maybe I was wrong, but if it is not required, why the error message?
> If you want directfb and directfb-support, the you should select it
> manually, no?
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
2007-07-25 23:47 ` Ulf Samuelsson
@ 2007-07-26 1:06 ` Rex Ashbaugh
2007-07-26 6:55 ` Ulf Samuelsson
0 siblings, 1 reply; 24+ messages in thread
From: Rex Ashbaugh @ 2007-07-26 1:06 UTC (permalink / raw)
To: buildroot
DirectFB is not required.
SDL only needs the directfb.h header to build, in case directfb might be
invoked later at run time.
directfb is not used by default by SDL
-Rex
On 7/25/07, Ulf Samuelsson <ulf@atmel.com> wrote:
>
> tor 2007-07-26 klockan 00:39 +0200 skrev Bernhard Fischer:
> > On Wed, Jul 25, 2007 at 10:39:27AM -0700, ulf at uclibc.org wrote:
> > >Author: ulf
> > >Date: 2007-07-25 10:39:26 -0700 (Wed, 25 Jul 2007)
> > >New Revision: 19261
> > >
> > >Log:
> > >Make SDL seled DirectFB
> > >
> > >Modified:
> > > trunk/buildroot/package/sdl/Config.in
> > >
> > >
> > >Changeset:
> > >Modified: trunk/buildroot/package/sdl/Config.in
> > >===================================================================
> > >--- trunk/buildroot/package/sdl/Config.in 2007-07-25 17:37:50 UTC
> (rev 19260)
> > >+++ trunk/buildroot/package/sdl/Config.in 2007-07-25 17:39:26 UTC
> (rev 19261)
> > >@@ -1,6 +1,7 @@
> > > config BR2_PACKAGE_SDL
> > > bool "SDL"
> > > default n
> > >+ select BR2_PACKAGE_DIRECTFB
> >
> > Why? It's perfectly fine to build SDL without
> > a) FB support (any FB support)
> > b) with the stock FB (no directfb)
> >
>
> The SDL compile failed since "directfb.h" could not be found
> so I made the assumption, that it was neccessary.
> Maybe I was wrong, but if it is not required, why the error message?
>
>
> > If you want directfb and directfb-support, the you should select it
> > manually, no?
>
> Best Regards
> Ulf Samuelsson
>
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20070725/24f65d50/attachment.htm
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
2007-07-26 1:06 ` Rex Ashbaugh
@ 2007-07-26 6:55 ` Ulf Samuelsson
0 siblings, 0 replies; 24+ messages in thread
From: Ulf Samuelsson @ 2007-07-26 6:55 UTC (permalink / raw)
To: buildroot
>> The SDL compile failed since "directfb.h" could not be found
>> so I made the assumption, that it was neccessary.
>> Maybe I was wrong, but if it is not required, why the error message?
>>
>>
>> > If you want directfb and directfb-support, the you should select it
>> > manually, no?
>>
>> Best Regards
>> Ulf Samuelsson
>>
> DirectFB is not required.
> SDL only needs the directfb.h header to build, in case directfb might be
> invoked later at run time.
> directfb is not used by default by SDL
>
>
> -Rex
>
OK, so we need to download the DirectFB and install its headers.
SDL won't build in buildroot, unless we do.
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2007-06-25 11:12 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2007-06-25 11:12 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-25 04:12:51 -0700 (Mon, 25 Jun 2007)
New Revision: 18926
Log:
- use sysconf to obtain the pagesize (Ivan Kuten)
Added:
trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Added: trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch
===================================================================
--- trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch (rev 0)
+++ trunk/buildroot/package/sdl/SDL-1.2.11-patch_PAGE_SIZE.patch 2007-06-25 11:12:51 UTC (rev 18926)
@@ -0,0 +1,59 @@
+diff -urN SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c
+--- SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c 2006-05-17 06:16:06.000000000 +0300
++++ SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c 2007-06-24 22:19:41.000000000 +0300
+@@ -29,9 +29,17 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* For definition of PAGE_SIZE */
+ #include <linux/vt.h>
+
++#if defined(linux)
++#define HAS_MMAP_ANON
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <asm/page.h> /* PAGE_SIZE */
++#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
++#define HAS_GETPAGESIZE
++#endif /* linux */
++
+ #include "SDL_video.h"
+ #include "SDL_mouse.h"
+ #include "../SDL_sysvideo.h"
+@@ -474,6 +482,7 @@
+ unsigned int current_h;
+ const char *SDL_fbdev;
+ FILE *modesdb;
++ int pagesize = -1;
+
+ /* Initialize the library */
+ SDL_fbdev = SDL_getenv("SDL_FBDEV");
+@@ -545,9 +554,27 @@
+ }
+ }
+
++#if defined(_SC_PAGESIZE) && defined(HAS_SC_PAGESIZE)
++ pagesize = sysconf(_SC_PAGESIZE);
++#endif
++#ifdef _SC_PAGE_SIZE
++ if (pagesize == -1)
++ pagesize = sysconf(_SC_PAGE_SIZE);
++#endif
++#ifdef HAS_GETPAGESIZE
++ if (pagesize == -1)
++ pagesize = getpagesize();
++#endif
++#ifdef PAGE_SIZE
++ if (pagesize == -1)
++ pagesize = PAGE_SIZE;
++#endif
++ if (pagesize == -1)
++ pagesize = 4096;
++
+ /* Memory map the device, compensating for buggy PPC mmap() */
+ mapped_offset = (((long)finfo.smem_start) -
+- (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++ (((long)finfo.smem_start)&~(pagesize-1)));
+ mapped_memlen = finfo.smem_len+mapped_offset;
+ mapped_mem = do_mmap(NULL, mapped_memlen,
+ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2007-06-25 11:07:11 UTC (rev 18925)
+++ trunk/buildroot/package/sdl/sdl.mk 2007-06-25 11:12:51 UTC (rev 18926)
@@ -16,13 +16,12 @@
$(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE)
$(SDL_CAT) $(DL_DIR)/$(SDL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(SDL_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl\*.patch
+ touch $@
$(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
- (cd $(SDL_DIR); \
+ (cd $(SDL_DIR); rm -rf config.cache ; \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -43,15 +42,15 @@
--disable-esd \
--disable-nasm \
--disable-video-x11 );
- touch $(SDL_DIR)/.configured
+ touch $@
$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured
$(MAKE) -C $(SDL_DIR)
- touch $(SDL_DIR)/.compiled
+ touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install;
- touch -c $(STAGING_DIR)/usr/lib/libSDL.so
+ touch -c $@
$(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so
cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/sdl
@ 2006-11-30 9:06 aldot at uclibc.org
0 siblings, 0 replies; 24+ messages in thread
From: aldot at uclibc.org @ 2006-11-30 9:06 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-30 01:06:53 -0800 (Thu, 30 Nov 2006)
New Revision: 16737
Log:
- We don't provide the arts library, and it's checked for in a way not suitable for cross compiling.
Thanks to Pavel Roskin.
Modified:
trunk/buildroot/package/sdl/sdl.mk
Changeset:
Modified: trunk/buildroot/package/sdl/sdl.mk
===================================================================
--- trunk/buildroot/package/sdl/sdl.mk 2006-11-29 23:15:04 UTC (rev 16736)
+++ trunk/buildroot/package/sdl/sdl.mk 2006-11-30 09:06:53 UTC (rev 16737)
@@ -21,12 +21,13 @@
$(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
(cd $(SDL_DIR); \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) " \
+ CFLAGS="$(TARGET_CFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR)/usr \
+ --disable-arts \
--disable-esd \
--disable-nasm \
--disable-video-x11 );
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2009-01-22 7:51 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-23 9:53 [Buildroot] svn commit: trunk/buildroot/package/sdl ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-22 7:51 ulf at uclibc.org
2009-01-11 20:24 ulf at uclibc.org
2008-03-17 16:39 jacmet at uclibc.org
2008-03-07 13:31 jacmet at uclibc.org
2008-03-14 1:05 ` Hebbar
2008-03-17 16:47 ` Peter Korsgaard
2008-03-14 2:40 ` Hebbar
2008-03-07 13:31 jacmet at uclibc.org
2008-03-07 13:31 jacmet at uclibc.org
2008-03-07 13:31 jacmet at uclibc.org
2007-11-16 15:35 vanokuten at uclibc.org
2007-11-16 12:37 vanokuten at uclibc.org
2007-08-12 23:31 ulf at uclibc.org
2007-08-11 22:09 ulf at uclibc.org
2007-08-11 21:47 ulf at uclibc.org
2007-08-11 22:46 ` Ivan Kuten
2007-07-25 17:39 ulf at uclibc.org
2007-07-25 22:39 ` Bernhard Fischer
2007-07-25 23:47 ` Ulf Samuelsson
2007-07-26 1:06 ` Rex Ashbaugh
2007-07-26 6:55 ` Ulf Samuelsson
2007-06-25 11:12 aldot at uclibc.org
2006-11-30 9:06 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox