usertags 589987 gsoc2010
thanks
On Thu, Jul 22, 2010 at 08:24:37PM +0200, Samuel Thibault wrote:
> bogl FTBFS on non-linux. This would look normal at first, but d-i uses
> reduce-font from libbogl-dev to save room on d-i images. This patch
> makes bogl at least build libbogl-dev shipping mergebdf and reduce-font
> on non-linux ports.
Hi,
I'd like to confirm that Samuel's patch works great, with the exception
of libbogl-dev depending on libbogl0, which is unavailable on non-Linux
(updated patch attached).
Thanks,
--
Jeremie Koenig <j...@jk.fr.eu.org>
http://jk.fr.eu.org
diff -ruN bogl-0.1.18/Makefile bogl-0.1.18.non-linux/Makefile
--- bogl-0.1.18/Makefile 2010-06-22 00:07:25.000000000 +0000
+++ bogl-0.1.18.non-linux/Makefile 2010-07-22 21:10:03.000000000 +0000
@@ -9,6 +9,7 @@
ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS)
architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+os := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS) \
$(LIBRSRCOBJECTS)
@@ -18,9 +19,12 @@
LIBRSRCOBJECTS = helvB10.o helvB12.o helvR10.o timBI18.o tux75.o
SOURCES_DEP = arrow.c bdftobogl.c bogl-cfb.c bogl-cfb.h bogl-cfb8.c \
-bogl-cfb8.h bogl-font.c bogl-font.h bogl-pcfb.c bogl-pcfb.h \
-bogl-tcfb.c bogl-tcfb.h bogl-test.c bogl.c bogl.h boglP.h boml.c \
-boml.h bowl-boxes.c bowl.c bowl.h pngtobogl.c
+bogl-cfb8.h bogl-font.c bogl-font.h \
+bogl-test.c bogl.h boglP.h boml.c \
+boml.h bowl.c bowl.h pngtobogl.c
+
+ifeq ($(os),linux)
+ SOURCES_DEP += bogl-pcfb.c bogl-pcfb.h bogl-tcfb.c bogl-tcfb.h bowl-boxes.c bogl.c
ifeq (,)
FBCFLAGS += -DBOGL_CFB_FB=1
@@ -32,13 +36,18 @@
LIBBOGLOBJECTS += bogl-vga16.o
SOURCES_DEP += bogl-vga16.c bogl-vga16.h
endif
+endif
OBJECTS = $(LIBOBJECTS) bowl-boxes.o
GENERATED = helvB10.c helvB12.c helvR10.c timBI18.c tux75.c
# libutf8/libutf8_plug.so unifont-reduced.bgf
-all: depend $(SHARED_LIB) $(LIB) bterm bdftobogl reduce-font
+all: depend
+ifeq ($(os),linux)
+all: $(SHARED_LIB) $(LIB) bterm bdftobogl pngtobogl
+endif
+all: reduce-font
%.lo: %.c
$(CC) $(ALLCFLAGS) -o $@ -fPIC -c $<
@@ -109,12 +118,16 @@
endif
install: all
- install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin
+ install -d $(DESTDIR)/usr/bin
+ifeq ($(os),linux)
+ install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl
install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB)
ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK)
ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SONAME)
install -m644 $(LIB) $(DESTDIR)/usr/lib/$(LIB)
install -m644 *.h $(DESTDIR)/usr/include/bogl
- install -m755 bdftobogl mergebdf bterm pngtobogl reduce-font $(DESTDIR)/usr/bin
+ install -m755 bdftobogl bterm pngtobogl $(DESTDIR)/usr/bin
install -d $(DESTDIR)/usr/share/terminfo
tic -o$(DESTDIR)/usr/share/terminfo bterm.ti
+endif
+ install -m755 mergebdf reduce-font $(DESTDIR)/usr/bin
diff -ruN bogl-0.1.18/debian/control bogl-0.1.18.non-linux/debian/control
--- bogl-0.1.18/debian/control 2010-06-22 00:15:11.000000000 +0000
+++ bogl-0.1.18.non-linux/debian/control 2010-07-22 21:10:18.000000000 +0000
@@ -8,7 +8,7 @@
Package: libbogl-dev
Section: libdevel
Architecture: any
-Depends: libbogl0 (= ${binary:Version}), libc6-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libbogl0 (= ${binary:Version}) [linux-any], libc6-dev, ${shlibs:Depends}, ${misc:Depends}
Description: Ben's Own Graphics Library - development files
Ben's Own Graphics Library is a small framebuffer library,
including basic widgets, support for text in multiple
@@ -19,7 +19,7 @@
Package: libbogl0
Section: libs
-Architecture: any
+Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Ben's Own Graphics Library - shared library
Ben's Own Graphics Library is a small framebuffer library,
@@ -30,7 +30,7 @@
Package: bogl-bterm
Section: utils
-Architecture: any
+Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Ben's Own Graphics Library - graphical terminal
Ben's Own Graphics Library is a small framebuffer library,
@@ -42,7 +42,7 @@
Package: bogl-bterm-udeb
XC-Package-Type: udeb
Section: debian-installer
-Architecture: any
+Architecture: linux-any
Priority: extra
Depends: ${shlibs:Depends}
Description: Ben's Own Graphics Library - graphical terminal
diff -ruN bogl-0.1.18/debian/libbogl-dev.files.hurd-i386 bogl-0.1.18.non-linux/debian/libbogl-dev.files.hurd-i386
--- bogl-0.1.18/debian/libbogl-dev.files.hurd-i386 1970-01-01 00:00:00.000000000 +0000
+++ bogl-0.1.18.non-linux/debian/libbogl-dev.files.hurd-i386 2010-07-22 21:10:03.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin/mergebdf
+usr/bin/reduce-font
diff -ruN bogl-0.1.18/debian/libbogl-dev.files.kfreebsd-amd64 bogl-0.1.18.non-linux/debian/libbogl-dev.files.kfreebsd-amd64
--- bogl-0.1.18/debian/libbogl-dev.files.kfreebsd-amd64 1970-01-01 00:00:00.000000000 +0000
+++ bogl-0.1.18.non-linux/debian/libbogl-dev.files.kfreebsd-amd64 2010-07-22 21:10:03.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin/mergebdf
+usr/bin/reduce-font
diff -ruN bogl-0.1.18/debian/libbogl-dev.files.kfreebsd-i386 bogl-0.1.18.non-linux/debian/libbogl-dev.files.kfreebsd-i386
--- bogl-0.1.18/debian/libbogl-dev.files.kfreebsd-i386 1970-01-01 00:00:00.000000000 +0000
+++ bogl-0.1.18.non-linux/debian/libbogl-dev.files.kfreebsd-i386 2010-07-22 21:10:03.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin/mergebdf
+usr/bin/reduce-font
diff -ruN bogl-0.1.18/debian/rules bogl-0.1.18.non-linux/debian/rules
--- bogl-0.1.18/debian/rules 2010-06-22 00:07:25.000000000 +0000
+++ bogl-0.1.18.non-linux/debian/rules 2010-07-22 21:10:03.000000000 +0000
@@ -14,6 +14,8 @@
#major=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
build: build-stamp
build-stamp:
dh_testdir
@@ -46,10 +48,12 @@
dh_movefiles
+ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/bogl-bterm-udeb/usr/bin
install -m 755 debian/bogl-bterm/usr/bin/bterm debian/bogl-bterm-udeb/usr/bin/bterm
install -d debian/bogl-bterm-udeb/usr/share/terminfo/b
install -m 644 debian/bogl-bterm/usr/share/terminfo/b/bterm debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm
+endif
dh_installdocs
dh_installexamples
