Mailinglist Archive: opensuse-commit (1248 mails)
| < Previous | Next > |
commit DirectFB for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 07 Apr 2010 21:09:02 +0200
- Message-id: <20100407190902.419DA202A7@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package DirectFB for openSUSE:Factory
checked in at Wed Apr 7 21:09:02 CEST 2010.
--------
--- DirectFB/DirectFB.changes 2010-04-04 19:19:22.000000000 +0200
+++ DirectFB/DirectFB.changes 2010-04-07 13:57:14.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 7 10:54:05 UTC 2010 - mvyskocil@xxxxxxx
+
+- workaround for bnc#304995: splashy image not fullscreen or screwed-up while
suspending
+ SUSE_IGNORE_FBMODES can ignore the /etc/fb.modes
+- split libraries according Shared Library Policy
+- apply png14 patch only for openSUSE > 11.2 to enable backports
+- clean up the configure call and polish the spec
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
DirectFB-1.2.9-ignore-fbmodes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ DirectFB.spec ++++++
--- /var/tmp/diff_new_pack.GUbfJo/_old 2010-04-07 21:06:22.000000000 +0200
+++ /var/tmp/diff_new_pack.GUbfJo/_new 2010-04-07 21:06:22.000000000 +0200
@@ -19,23 +19,12 @@
Name: DirectFB
-BuildRequires: freetype2-devel xorg-x11-libX11-devel xorg-x11-libXext-devel
-BuildRequires: libjpeg-devel libpng-devel libstdc++-devel sysfsutils udev
-BuildRequires: zlib-devel
-%ifnarch s390 s390x
-BuildRequires: i2c-tools
-%endif
-# bug437293
-%ifarch ppc64
-Obsoletes: DirectFB-64bit
-%endif
-#
Url: http://www.directfb.org/
License: LGPLv2.1+
Group: System/Libraries
AutoReqProv: on
Version: 1.2.9
-Release: 3
+Release: 4
Summary: Graphics Library for Framebuffer Devices
Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
@@ -47,7 +36,24 @@
Patch8: DirectFB-1.2.9-comma.patch
Patch9: DirectFB-1.1.1.patch
Patch10: DirectFB-png14.patch
+Patch11: DirectFB-1.2.9-ignore-fbmodes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: freetype2-devel
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXext-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libstdc++-devel
+BuildRequires: sysfsutils udev
+BuildRequires: zlib-devel
+BuildRequires: pkg-config
+%ifnarch s390 s390x
+BuildRequires: i2c-tools
+%endif
+# bug437293
+%ifarch ppc64
+Obsoletes: DirectFB-64bit
+%endif
%description
DirectFB is a thin library that provides hardware graphics
@@ -116,19 +122,22 @@
%patch6
%patch8
%patch9
+%if 0%{?suse_version} >= 1120
%patch10
+%endif
+%patch11 -p1
%build
%ifarch s390 s390x
sed 's/-O3/-Os/' configure >c;chmod +x c;mv c configure;
%endif
-#autoreconf -f -i
%suse_update_libdir configure
-CC="gcc $RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \
- --prefix=/usr --mandir=%_mandir --libdir=%_libdir \
- --enable-zlib --enable-rgb332 \
+%{configure} \
+ --enable-zlib \
+ --enable-rgb332 \
%ifarch x86_64
- --enable-mmx --enable-sse \
+ --enable-mmx \
+ --enable-sse \
%endif
%ifarch ppc64 ppc
--with-gfxdrivers="ati128 cle266 cyber5k i810 mach64 matrox neomagic
nsc nvidia radeon sis315 tdfx unichrome" \
@@ -136,26 +145,29 @@
%ifarch s390 s390x
--with-gfxdrivers=none --with-inputdrivers=none --disable-video4linux
--disable-fbdev \
%endif
- --enable-linux-input --enable-x11 --enable-unique \
+ --enable-linux-input \
+ --enable-x11 \
+ --enable-unique \
+ --with-smooth-scaling \
--disable-gettid
-make
+
+%{__make}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-find $RPM_BUILD_ROOT -name '*.la' | xargs rm -v
+%{makeinstall}
+find %{buildroot} -name '*.la' | xargs rm -v
+
+%clean
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
-#%{_libdir}/directfb-1.0-0
-/usr/share/directfb-%{version}
+%{_datadir}/directfb-%{version}
%{_bindir}/dfbg
%{_bindir}/dfbdump
%{_bindir}/dfbinfo
@@ -168,16 +180,11 @@
%{_bindir}/uwmdump
%{_bindir}/dfbinput
%{_bindir}/dfbpenmount
-#%ifnarch s390 s390x ppc ppc64
-#%{_bindir}/sh7722_jpegtool
-#%{_libdir}/libsh7722_jpeg.*
-#%endif
%{_libdir}/libdirect*.so.*
%{_libdir}/libfusion*.so.*
%{_libdir}/libuniquewm*.so.*
%{_libdir}/directfb-1.2-9
%{_bindir}/mkd*iff
-%{_bindir}/directfb-config
%doc %_mandir/man1/dfbg.1.gz
%doc %_mandir/man1/directfb-csource.1.gz
%doc %_mandir/man5/directfbrc.5.gz
@@ -190,7 +197,7 @@
/usr/include/directfb-internal
/usr/include/directfb
%{_libdir}/pkgconfig/*
-#{_libdir}/lib*.la
+%{_bindir}/directfb-config
%files doc
%defattr(-,root,root)
++++++ DirectFB-1.2.9-ignore-fbmodes.patch ++++++
Index: DirectFB-1.2.9/include/directfb.h
===================================================================
--- DirectFB-1.2.9.orig/include/directfb.h
+++ DirectFB-1.2.9/include/directfb.h
@@ -6326,6 +6326,11 @@ DEFINE_INTERFACE( IDirectFBDataBuffer,
);
)
+static inline int ignore_fb_modes()
+{
+ return getenv("SUSE_IGNORE_FBMODES") != NULL;
+}
+
#ifdef __cplusplus
}
#endif
Index: DirectFB-1.2.9/systems/fbdev/fbdev.c
===================================================================
--- DirectFB-1.2.9.orig/systems/fbdev/fbdev.c
+++ DirectFB-1.2.9/systems/fbdev/fbdev.c
@@ -945,7 +945,9 @@ system_get_deviceid( unsigned int *ret_v
static DFBResult
init_modes( void )
{
- dfb_fbdev_read_modes();
+ if (!ignore_fb_modes()) {
+ dfb_fbdev_read_modes();
+ }
if (!dfb_fbdev->shared->modes) {
/* try to use current mode*/
Index: DirectFB-1.2.9/systems/sdl/sdl.c
===================================================================
--- DirectFB-1.2.9.orig/systems/sdl/sdl.c
+++ DirectFB-1.2.9/systems/sdl/sdl.c
@@ -96,7 +96,9 @@ system_initialize( CoreDFB *core, void *
dfb_sdl_core = core;
- dfb_fbdev_read_modes(); /* use same mode list as a fake */
+ if (!ignore_fb_modes()) {
+ dfb_fbdev_read_modes(); /* use same mode list as a fake */
+ }
driver = getenv( "SDL_VIDEODRIVER" );
if (driver && !strcasecmp( driver, "directfb" )) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |