Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=interim.git;a=commitdiff;h=f73d32bd2d17b8b4599aa6e41b83ee5496d410b5

commit f73d32bd2d17b8b4599aa6e41b83ee5496d410b5
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Thu Aug 7 19:42:29 2008 +0200

splashy-0.3.11-2-i686
- build statically, this works around a directfb issue till splashy devs
fix the problem properly
- closes #3248

diff --git a/source/xapps/splashy/FrugalBuild b/source/xapps/splashy/FrugalBuild
index a136ec7..46d2ef7 100644
--- a/source/xapps/splashy/FrugalBuild
+++ b/source/xapps/splashy/FrugalBuild
@@ -6,10 +6,11 @@ pkgver=0.3.11
themever=0.7
# see http://alioth.debian.org/project/showfiles.php?group_id=30657
rel_id=2519
-pkgrel=1
+pkgrel=2
pkgdesc="A complete user-space boot splash system"
url="http://alioth.debian.org/projects/splashy/";
-depends=('glib2' 'directfb-input-keyboard>=1.2.0-1' 'libgcc' 'file')
+depends=('glib2' 'libgcc' 'file')
+makedepends=('directfb-input-keyboard')
replaces=('bootsplash')
conflicts=('bootsplash')
backup=(etc/splashy/config.xml)
@@ -19,7 +20,8 @@ up2date="lynx -dump $url |grep ' splashy '|sed 's/.*splashy 
\([^ ]*\) .*/\1/'"
source=(http://alioth.debian.org/download.php/$rel_id/splashy-$pkgver.tar.gz \
splashy-0.3.0-frugalware.diff \
rc.{zz-,}splash rc.splash-{de,hu,it}.po \
-       
http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.gz)
+       
http://ftp.frugalware.org/pub/other/artwork/splashy-theme/splashy-frugalware-$themever.tar.gz
 \
+       static.diff)
sha1sums=('9af69c57dd1e19b7912ddc701bfaf2c63411aa2f' \
'319e6edb46519414d9d3e7b620592ab162a5bc00' \
'006d65bb621d1108cbb994fb50712bad4d61b6d0' \
@@ -27,7 +29,8 @@ sha1sums=('9af69c57dd1e19b7912ddc701bfaf2c63411aa2f' \
'82c272166e89ecc840169fa76cc3fb45e2236712' \
'd86d3554aa64b129352e826d1e659a5a4611b47d' \
'c9da7e70efb6070e61ba2e6908a712ac524ae90b' \
-          '5834d1c3d1f0327f2c341f84d07e137afcbb86e2')
+          '5834d1c3d1f0327f2c341f84d07e137afcbb86e2' \
+          '3c99a10ecc63c75086bb1ceb496d913dfc93886d')

build()
{
@@ -38,7 +41,7 @@ build()
mv ../frugalware themes/
Fpatchall
Fautoreconf
-       Fmake
+       Fmake --enable-static
Fmakeinstall
Frm /etc/init.d
Frcd2 splash
diff --git a/source/xapps/splashy/static.diff b/source/xapps/splashy/static.diff
new file mode 100644
index 0000000..c427234
--- /dev/null
+++ b/source/xapps/splashy/static.diff
@@ -0,0 +1,45 @@
+diff --git a/configure.ac b/configure.ac
+index 409e5fd..dec388c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,8 +85,8 @@ AC_SUBST(DFB_LIBDIR)
+ # to modify src/Makefile.am where it says "STATIC"
+ # sample options to include to directfb-config below (before ' | sed ...'):
+ #--input=keyboard --imageprovider=png --font=ft2,default
+-DFB_LIBS="$(eval directfb-config --libs | sed 's/$/ \\/')"
+-#AC_DEFINE([DFB_LIBS], [$DFB_LIBS], [directfb libs])
++DFB_LIBS="$(eval directfb-config --libs --input=keyboard --imageprovider=png 
--font=ft2,default| sed 's/$/ \\/')"
++AC_DEFINE([DFB_LIBS], [$DFB_LIBS], [directfb libs])
+ AC_SUBST(DFB_LIBS)
+
+ # TODO slurp the doc/*.xml.in or .xml files and create xml_format.h
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a93a1f1..5e1e23f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -38,21 +38,21 @@ libsplashycnf_la_LDFLAGS = -export-symbols-regex 
splashy_.*\
+                          -version-info $(SPL_SONAME)
+
+ splashy_SOURCES = splashy_main.c splashy_functions.c
+-splashy_LDADD = libsplashycnf.la libsplashy.la -lpthread -lgcc_s -lm  
-lglib-2.0 @DFB_LIBS@
++splashy_LDADD = libsplashycnf.la libsplashy.la -lpthread -lm  -lglib-2.0 
@DFB_LIBS@
+
+ # '-lgcc_s' is provided with -static-libgcc and this is needed when compiling 
statically only
+ # uncomment the following for static builds:
+-#splashy_LDFLAGS = -all-static -static-libgcc $(DFBHACK)
++splashy_LDFLAGS = -all-static -static-libgcc $(DFBHACK)
+ # all other builds:
+ # FIXME doesn't DFB_LIBS provide this from configure.ac? $(shell 
directfb-config --libs)
+-splashy_LDFLAGS = -rpath 
$(libdir)/directfb-1.0-0/systems:$(libdir)/directfb-1.0-0/wm:/usr/lib64/directfb-1.0-0/interfaces/IDirectFBFont/:$(libdir)/directfb-1.0-0/interfaces/IDirectFBImageProvider:$(libdir)/directfb-1.0-0/inputdrivers
++#splashy_LDFLAGS = -rpath 
$(libdir)/directfb-1.0-0/systems:$(libdir)/directfb-1.0-0/wm:/usr/lib64/directfb-1.0-0/interfaces/IDirectFBFont/:$(libdir)/directfb-1.0-0/interfaces/IDirectFBImageProvider:$(libdir)/directfb-1.0-0/inputdrivers
+
+ splashy_config_SOURCES = splashy_config-main.c splashy_config-functions.c \
+       xml_functions.c
+ splashy_config_LDFLAGS = -lsplashycnf -lglib-2.0 -lmagic -lz
+
+ # uncomment the following if you need static builds for splashy_update as 
well:
+-#splashy_update_LDFLAGS = -all-static -static-libgcc
++splashy_update_LDFLAGS = -all-static -static-libgcc
+ splashy_update_SOURCES = splashy_update.c
+
+ install-exec-hook:
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to