packages: libggi/libggi.spec, libggi/libggi-directfb.patch (NEW) - moved ta...

qboosh qboosh at pld-linux.org
Sat Jan 7 09:57:29 CET 2012


Author: qboosh                       Date: Sat Jan  7 08:57:29 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved target-related man pages to appropriate packages
- disable static library by default (building it causes all modules to be built into main
  library (both static and shared) and thus main library linked with all target dependencies;
  added static_modules bcond to switch it
- added directfb patch and bcond (off - directfb drivers support is slightly outdated)

---- Files affected:
packages/libggi:
   libggi.spec (1.92 -> 1.93) , libggi-directfb.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libggi/libggi.spec
diff -u packages/libggi/libggi.spec:1.92 packages/libggi/libggi.spec:1.93
--- packages/libggi/libggi.spec:1.92	Wed Aug 31 20:32:41 2011
+++ packages/libggi/libggi.spec	Sat Jan  7 09:57:24 2012
@@ -1,10 +1,12 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	glide	# with Glide support
-%bcond_with	kgicon	# with KGICon support
-%bcond_without	aalib	# without aalib support
-%bcond_with	svga	# without svgalib support
+%bcond_with	directfb	# DirectFB drivers support for fbdev [outdated, patch incomplete]
+%bcond_with	glide		# Glide support
+%bcond_with	kgicon		# KGICon support
+%bcond_without	aalib		# aalib support
+%bcond_with	svga		# svgalib support
+%bcond_with	static_modules	# build static library AND make all modules builtin (also in shared lib)
 #
 Summary:	GGI - Generic Graphics Interface
 Summary(pl.UTF-8):	GGI - Generic Graphics Interface
@@ -19,19 +21,22 @@
 Patch0:		%{name}-ppc.patch
 Patch1:		ac.patch
 Patch2:		link.patch
+Patch3:		%{name}-directfb.patch
 URL:		http://www.ggi-project.org/
+%{?with_directfb:BuildRequires:	DirectFB-devel >= 1.4.15}
 %{?with_aalib:BuildRequires:	aalib-devel}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_glide:BuildRequires:	glide-devel}
 BuildRequires:	libgii-devel >= 1.0.2
-BuildRequires:	libtool >= 1:1.4.2-9
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	ncurses-devel
 %{?with_svga:BuildRequires:	svgalib-devel}
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXxf86dga-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
+Requires:	libgii >= 1.0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,30 +58,6 @@
 współdziałania z KGI (GGI Kernel Graphic Interface) ale inne
 sterowniki wyświetlania mogą być łatwo używane.
 
-%package aa
-Summary:	aalib target for LibGGI
-Summary(pl.UTF-8):	Obsługa aalib dla LibGGI
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description aa
-LibGGI target for displaying graphics using ascii-art-library.
-
-%description aa -l pl.UTF-8
-Moduł LibGGI do obsługi grafiki poprzez bibliotekę ascii-art.
-
-%package svgalib
-Summary:	SVGALib target for LibGGI
-Summary(pl.UTF-8):	Obsługa SVGALib dla LibGGI
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description svgalib
-LibGGI target for displaying via SVGALib.
-
-%description svgalib -l pl.UTF-8
-Moduł LibGGI do obsługi grafiki poprzez bibliotekę SVGALib.
-
 %package X11
 Summary:	X11 targets for LibGGI
 Summary(pl.UTF-8):	Obsługa X11 dla LibGGI
@@ -95,6 +76,30 @@
  - xlib - grafika poprzez bibliotekę xlib
  - dga - grafika poprzez rozszerzenie X DGA
 
+%package aa
+Summary:	aalib target for LibGGI
+Summary(pl.UTF-8):	Obsługa aalib dla LibGGI
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description aa
+LibGGI target for displaying graphics using ascii-art-library.
+
+%description aa -l pl.UTF-8
+Moduł LibGGI do obsługi grafiki poprzez bibliotekę ascii-art.
+
+%package directfb
+Summary:	DirectFB drivers support for LibGGI fbdev target
+Summary(pl.UTF-8):	Obsługa sterowników DirectFB w sterowniku fbdev LibGGI
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description directfb
+DirectFB drivers support for LibGGI fbdev target.
+
+%description directfb -l pl.UTF-8
+Obsługa sterowników DirectFB w sterowniku LibGGI fbdev.
+
 %package glide
 Summary:	Glide (3DFX) target for LibGGI
 Summary(pl.UTF-8):	Obsługa Glide (3DFX) dla LibGGI
@@ -107,6 +112,18 @@
 %description glide -l pl.UTF-8
 Moduł do obsługi grafiki poprzez Glide.
 
+%package svgalib
+Summary:	SVGALib target for LibGGI
+Summary(pl.UTF-8):	Obsługa SVGALib dla LibGGI
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description svgalib
+LibGGI target for displaying via SVGALib.
+
+%description svgalib -l pl.UTF-8
+Moduł LibGGI do obsługi grafiki poprzez bibliotekę SVGALib.
+
 %package programs
 Summary:	Utilities and demos for GGI
 Summary(pl.UTF-8):	Programy narzędziowe i przykładowe dla LibGGI
@@ -126,6 +143,16 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	libgii-devel >= 1.0.2
+%if %{with static_modules}
+%{?with_aalib:Requires:	aalib-devel}
+%{?with_glide:Requires:	glide-devel}
+Requires:	ncurses-devel
+%{?with_svga:Requires:	svgalib-devel}
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXxf86dga-devel
+Requires:	xorg-lib-libXxf86vm-devel
+%endif
 
 %description devel
 Development part of LibGGI.
@@ -133,14 +160,26 @@
 %description devel -l pl.UTF-8
 Pliki potrzebne do programowania z wykorzystaniem LibGGI.
 
+%package static
+Summary:	Static libggi library
+Summary(pl.UTF-8):	Statyczna biblioteka libggi
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static libggi library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libggi.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
-rm -f m4/{libtool,ltdl}.m4
-rm acinclude.m4
+%{__rm} acinclude.m4 m4/{libtool,lt*}.m4
 
 %build
 %{__libtoolize}
@@ -148,16 +187,15 @@
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-CPPFLAGS="-I/usr/include/glide -I/usr/include/directfb -I/usr/include/directfb-internal"
+CPPFLAGS="%{rpmcppflags} %{?with_glibde:-I/usr/include/glide} %{?with_directfb:-I/usr/include/directfb -I/usr/include/directfb-internal}"
 %configure \
+	%{!?with_aalib:--disable-aa} \
 	%{!?debug:--disable-debug} \
 	%{!?with_glide:--disable-glide} \
-	%{!?with_kgicon:--disable-genkgi} \
-	--disable-directfb \
-	%{!?with_svga:--disable-svga --disable-vgagl} \
-	%{!?with_aalib:--disable-aa} \
-	--sysconfdir=%{_sysconfdir} \
-	--enable-threads
+	%{!?with_kgicon:--disable-kgi} \
+	%{!?with_directfb:--disable-directfb}%{?with_directfb:--with-directfb=%{_libdir}/directfb-1.4-6/gfxdrivers} \
+	%{!?with_static_modules:--disable-static} \
+	%{!?with_svga:--disable-svga --disable-vgagl}
 %{__make}
 
 %install
@@ -178,6 +216,9 @@
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/ggi/{default,default/fbdev,display,helper}/*.la
 
+# displays not supported on Linux
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/display-{directx,quartz,vgl}.7
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -186,18 +227,15 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README NEWS doc/*.txt
-%dir %{_libdir}/ggi/default
-%dir %{_libdir}/ggi/default/fbdev
-%dir %{_libdir}/ggi/display
-
+%doc FAQ NEWS README doc/*.txt
 %dir %{_sysconfdir}/ggi
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/libggi.conf
 %dir %{_sysconfdir}/ggi/targets
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/targets/*.conf
-
-%attr(755,root,root) %{_libdir}/libggi.so.*.*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ggi/targets/fbdev.conf
+%attr(755,root,root) %{_libdir}/libggi.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libggi.so.2
+%dir %{_libdir}/ggi/default
+%dir %{_libdir}/ggi/default/fbdev
 %attr(755,root,root) %{_libdir}/ggi/default/fbdev/fbdev_m2164w.so
 %attr(755,root,root) %{_libdir}/ggi/default/fbdev/fbdev_mach64.so
 %attr(755,root,root) %{_libdir}/ggi/default/fbdev/fbdev_mga_g400.so
@@ -218,6 +256,7 @@
 %attr(755,root,root) %{_libdir}/ggi/default/stubs.so
 %attr(755,root,root) %{_libdir}/ggi/default/text_16.so
 %attr(755,root,root) %{_libdir}/ggi/default/text_32.so
+%dir %{_libdir}/ggi/display
 %attr(755,root,root) %{_libdir}/ggi/display/auto.so
 %attr(755,root,root) %{_libdir}/ggi/display/fbdev.so
 %attr(755,root,root) %{_libdir}/ggi/display/file.so
@@ -237,21 +276,21 @@
 %attr(755,root,root) %{_libdir}/ggi/display/tile.so
 %attr(755,root,root) %{_libdir}/ggi/display/trueemu.so
 %attr(755,root,root) %{_libdir}/ggi/display/vcsa.so
-
-%{_mandir}/man7/*
-
-%if %{with aalib}
-%files aa
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/ggi/display/aa.so
-%endif
-
-%if %{with svga}
-%files svgalib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/ggi/display/svga*.so
-%attr(755,root,root) %{_libdir}/ggi/display/vgagl.so
-%endif
+%{_mandir}/man7/display-auto.7*
+%{_mandir}/man7/display-fbdev.7*
+%{_mandir}/man7/display-file.7*
+%{_mandir}/man7/display-mansync.7*
+%{_mandir}/man7/display-memory.7*
+%{_mandir}/man7/display-monotext.7*
+%{_mandir}/man7/display-multi.7*
+%{_mandir}/man7/display-palemu.7*
+%{_mandir}/man7/display-sub.7*
+%{_mandir}/man7/display-tele.7*
+%{_mandir}/man7/display-terminfo.7*
+%{_mandir}/man7/display-tile.7*
+%{_mandir}/man7/display-trueemu.7*
+%{_mandir}/man7/display-vcsa.7*
+%{_mandir}/man7/libggi.7*
 
 %files X11
 %defattr(644,root,root,755)
@@ -262,11 +301,35 @@
 %attr(755,root,root) %{_libdir}/ggi/helper/helper_x_evi.so
 %attr(755,root,root) %{_libdir}/ggi/helper/helper_x_shm.so
 %attr(755,root,root) %{_libdir}/ggi/helper/helper_x_vidmode.so
+%{_mandir}/man7/display-x.7*
+
+%if %{with aalib}
+%files aa
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ggi/display/aa.so
+%{_mandir}/man7/display-aa.7*
+%endif
+
+%if %{with directfb}
+%files directfb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ggi/default/fbdev/fbdev_directfb.so
+%attr(755,root,root) %{_libdir}/ggi/default/fbdev/fbdev_directfbglobal.so
+%endif
 
 %if %{with glide}
 %files glide
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ggi/display/glide.so
+%{_mandir}/man7/display-glide.7*
+%endif
+
+%if %{with svga}
+%files svgalib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ggi/display/svgalib.so
+%attr(755,root,root) %{_libdir}/ggi/display/vgagl.so
+%{_mandir}/man7/display-svgalib.7*
 %endif
 
 %files programs
@@ -286,20 +349,34 @@
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
+%attr(755,root,root) %{_libdir}/libggi.so
+%{_libdir}/libggi.la
 %{_includedir}/ggi/*.h
 %{_includedir}/ggi/display
 %{_includedir}/ggi/internal/*.h
-%attr(755,root,root) %{_libdir}/libggi.so
-%{_libdir}/libggi.la
-%{_mandir}/man3/*
+%{_mandir}/man3/ggi*.3*
+%{_mandir}/man7/ggidev-triple-int.7*
 %{_examplesdir}/%{name}-%{version}
 
+%if %{with static_modules}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libggi.a
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2012/01/07 08:57:24  qboosh
+- moved target-related man pages to appropriate packages
+- disable static library by default (building it causes all modules to be built into main
+  library (both static and shared) and thus main library linked with all target dependencies;
+  added static_modules bcond to switch it
+- added directfb patch and bcond (off - directfb drivers support is slightly outdated)
+
 Revision 1.92  2011/08/31 18:32:41  arekm
 - release 6
 

================================================================
Index: packages/libggi/libggi-directfb.patch
diff -u /dev/null packages/libggi/libggi-directfb.patch:1.1
--- /dev/null	Sat Jan  7 09:57:29 2012
+++ packages/libggi/libggi-directfb.patch	Sat Jan  7 09:57:24 2012
@@ -0,0 +1,69 @@
+--- libggi-2.2.2/configure.in.orig	2012-01-06 21:31:21.671616777 +0100
++++ libggi-2.2.2/configure.in	2012-01-06 22:01:23.591677113 +0100
+@@ -766,7 +766,7 @@
+ 		[Define if you have <directfb.h> header file]),
+ 	build_directfb_renderer="no")
+ 
+-  AC_CHECK_HEADER(directfb-internal/directfb_version.h,
++  AC_CHECK_HEADER(directfb/directfb_version.h,
+ 	foo=bar, build_directfb_renderer="no")
+ fi
+ 
+--- libggi-2.2.2/default/fbdev/directfb/ggidirectfb.h.orig	2005-07-31 17:30:34.000000000 +0200
++++ libggi-2.2.2/default/fbdev/directfb/ggidirectfb.h	2012-01-07 09:00:00.806333628 +0100
+@@ -74,10 +74,28 @@
+ # undef dfb_config
+ #endif
+ 
++#ifdef _FBDEV_DIRECTFB_GLOBALS
++# define extern
++# define dfb_fbdev dfb_fbdev = NULL
++# include <directfb-internal/fbdev/fbdev.h>
++# undef dfb_fbdev
++# undef extern
++#else
++# define dfb_fbdev fbdev_directfb_dfb_fbdev_bogus
++# ifdef _FBDEV_DIRECTFB_BOGUS_GLOBALS
++#  define extern
++#  include <directfb-internal/fbdev/fbdev.h>
++#  undef extern
++# else
++#  include <directfb-internal/fbdev/fbdev.h>
++# endif
++# undef dfb_fbdev
++#endif
++
++#include <directfb/direct/list.h>
++#include <directfb/fusion/types.h>
+ #include <directfb-internal/core/coretypes.h>
+ #include <directfb-internal/core/gfxcard.h>
+-#include <directfb-internal/core/fusion/list.h>
+-#include <directfb-internal/core/fusion/fusion_types.h>
+ 
+ 
+ /* These structures are lurking in a .c file so we must provide. */
+@@ -123,24 +141,6 @@
+   } framebuffer;
+ };
+ 
+-#ifdef _FBDEV_DIRECTFB_GLOBALS
+-# define extern
+-# define dfb_fbdev dfb_fbdev = NULL
+-# include <directfb-internal/core/fbdev/fbdev.h>
+-# undef dfb_fbdev
+-# undef extern
+-#else
+-# define dfb_fbdev fbdev_directfb_dfb_fbdev_bogus
+-# ifdef _FBDEV_DIRECTFB_BOGUS_GLOBALS
+-#  define extern
+-#  include <directfb-internal/core/fbdev/fbdev.h>
+-#  undef extern
+-# else
+-#  include <directfb-internal/core/fbdev/fbdev.h>
+-# endif
+-# undef dfb_fbdev
+-#endif
+-
+ #include <directfb-internal/core/state.h>
+ #include <directfb-internal/core/surfaces.h>
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libggi/libggi.spec?r1=1.92&r2=1.93&f=u



More information about the pld-cvs-commit mailing list