rpms/directfb/devel DirectFB-0.9.25.1-sysfs.patch, NONE, 1.1 DirectFB-1.0.0-rc2-asmtypes.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 directfb.spec, 1.14, 1.15 sources, 1.5, 1.6 DirectFB-0.9.25.1-linux-compiler.patch, 1.1, NONE DirectFB-0.9.25.1-types.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Jan 17 11:42:03 UTC 2007
Author: thias
Update of /cvs/extras/rpms/directfb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv899
Modified Files:
.cvsignore directfb.spec sources
Added Files:
DirectFB-0.9.25.1-sysfs.patch
DirectFB-1.0.0-rc2-asmtypes.patch
Removed Files:
DirectFB-0.9.25.1-linux-compiler.patch
DirectFB-0.9.25.1-types.patch
Log Message:
Update to 1.0.0-rc2 + fixes and cleanups.
DirectFB-0.9.25.1-sysfs.patch:
--- NEW FILE DirectFB-0.9.25.1-sysfs.patch ---
--- DirectFB-0.9.25.1/directfb.pc.in.orig 2006-07-27 02:09:28.000000000 +0200
+++ DirectFB-0.9.25.1/directfb.pc.in 2006-07-27 02:09:37.000000000 +0200
@@ -7,5 +7,5 @@
Description: Graphics and windowing library for the Linux frame buffer device
Version: @VERSION@
Requires: fusion direct
-Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
+Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@ @OSX_LIBS@
Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
--- DirectFB-0.9.25.1/directfb-config.in.orig 2006-07-27 02:08:17.000000000 +0200
+++ DirectFB-0.9.25.1/directfb-config.in 2006-07-27 02:09:02.000000000 +0200
@@ -300,7 +300,7 @@
libs=-L at libdir@
if test "$lib_directfb" = "yes"; then
- libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@"
+ libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
if test -z "$echo_static"; then
libs="$libs @DYNLIB@"
DirectFB-1.0.0-rc2-asmtypes.patch:
--- NEW FILE DirectFB-1.0.0-rc2-asmtypes.patch ---
diff -Naupr DirectFB-1.0.0-rc2.orig/include/dfb_types.h DirectFB-1.0.0-rc2/include/dfb_types.h
--- DirectFB-1.0.0-rc2.orig/include/dfb_types.h 2006-10-23 11:15:49.000000000 +0200
+++ DirectFB-1.0.0-rc2/include/dfb_types.h 2007-01-17 11:58:02.000000000 +0100
@@ -1,6 +1,7 @@
#ifndef __DFB_TYPES_H__
#define __DFB_TYPES_H__
+#include <asm/types.h>
#ifdef USE_KOS
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 13 May 2006 16:36:12 -0000 1.5
+++ .cvsignore 17 Jan 2007 11:41:33 -0000 1.6
@@ -1 +1 @@
-DirectFB-0.9.25.1.tar.gz
+DirectFB-1.0.0-rc2.tar.gz
Index: directfb.spec
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- directfb.spec 15 Sep 2006 13:40:36 -0000 1.14
+++ directfb.spec 17 Jan 2007 11:41:33 -0000 1.15
@@ -1,22 +1,22 @@
-Name: directfb
-Version: 0.9.25.1
-Release: 3%{?dist}
-Summary: Graphics abstraction library for the Linux Framebuffer Device
-
-Group: System Environment/Libraries
-License: LGPL
-URL: http://www.directfb.org/
-Source: http://www.directfb.org/download/DirectFB/DirectFB-%{version}.tar.gz
-Patch0: DirectFB-0.9.25.1-types.patch
-Patch1: DirectFB-0.9.25.1-linux-compiler.patch
-Patch2: DirectFB-0.9.25.1-ppc.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libpng-devel
-BuildRequires: zlib-devel
-BuildRequires: libjpeg-devel
-BuildRequires: freetype-devel
-BuildRequires: SDL-devel
+%define prever rc2
+
+Summary: Graphics abstraction library for the Linux Framebuffer Device
+Name: directfb
+Version: 1.0.0
+Release: 0.1.%{prever}%{?dist}
+Group: System Environment/Libraries
+License: LGPL
+URL: http://www.directfb.org/
+Source: http://www.directfb.org/downloads/Core/DirectFB-%{version}-%{prever}.tar.gz
+Patch0: DirectFB-1.0.0-rc2-asmtypes.patch
+Patch1: DirectFB-0.9.25.1-ppc.patch
+Patch2: DirectFB-0.9.25.1-sysfs.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: libjpeg-devel
+BuildRequires: freetype-devel
+BuildRequires: SDL-devel
# Use sysfsutils-devel up to FC5, and libsysfs-devel for FC6+ and non-Fedora
%if %{!?fedora:6}%{?fedora} >= 6
BuildRequires: libsysfs-devel
@@ -24,8 +24,6 @@
BuildRequires: sysfsutils-devel
%endif
-%define oname DirectFB
-
%description
DirectFB is a thin library that provides hardware graphics acceleration,
input device handling and abstraction, integrated windowing system with
@@ -37,62 +35,60 @@
DirectFB adds graphical power to embedded systems and sets a new standard
for graphics under Linux.
-%package devel
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: zlib-devel
-
-%description devel
-The %{name}-devel package contains the static libraries and header files
-needed for development with %{name}.
+
+%package devel
+Summary: Development files for DirectFB
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: zlib-devel
+# Use sysfsutils-devel up to FC5, and libsysfs-devel for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
+Requires: libsysfs-devel
+%else
+Requires: sysfsutils-devel
+%endif
+
+%description devel
+Development files for DirectFB.
+
%prep
-%setup -q -n %{oname}-%{version}
-%patch0 -p1 -b .types
-%patch1 -p1 -b .linux-compiler
-%patch2 -p1 -b .ppc
+%setup -q -n DirectFB-%{version}-%{prever}
+%patch0 -p1 -b .asmtypes
+%patch1 -p1 -b .ppc
+%patch2 -p1 -b .sysfs
+
%build
+# Disable MMX on x86_64 otherwise some ASM fails for generic.o (1.0.0-rc2)
%configure \
- --disable-dependency-tracking \
- --enable-zlib \
- --enable-video4linux2 \
- --with-gfxdrivers=\
-ati128,cle266,cyber5k,i810,i830,mach64,matrox,neomagic,nsc,nvidia,radeon,\
-savage,tdfx,unichrome,sis315
+%ifarch x86_64
+ --disable-mmx \
+%endif
+ --disable-dependency-tracking \
+ --enable-zlib \
+ --enable-video4linux2
+%{__make} %{?_smp_mflags}
-make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
-# because of configure.in defining variables like MODULEDIR, DATADIR, ...
-# only a DESTDIR install will work
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
-make DESTDIR=$RPM_BUILD_ROOT install
-
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_libdir}/libdirectfb-*.so.*
-%{_libdir}/libdirect-*.so.*
-%{_libdir}/libfusion-*.so.*
-#%{_libdir}/directfb-%{version}
-#%{_datadir}/%{name}-%{version}
-# grrr, I hate it when projects do brown paper bag releases in a dirty way ...
-%{_libdir}/directfb-0.9.25/
-%{_datadir}/%{name}-0.9.25/
%{_bindir}/dfbg
%{_bindir}/dfbdump
%{_bindir}/dfbinfo
@@ -101,6 +97,16 @@
%{_bindir}/dfbpenmount
%{_bindir}/dfbscreen
%{_bindir}/dfbsummon
+%{_bindir}/mkdfiff
+%{_bindir}/mkdgiff
+%{_libdir}/libdirectfb-*.so.*
+%{_libdir}/libdirect-*.so.*
+%{_libdir}/libfusion-*.so.*
+#%{_libdir}/directfb-%{version}
+#%{_datadir}/%{name}-%{version}
+# Naming is brain dead here...
+%{_libdir}/directfb-1.0-0/
+%{_datadir}/directfb-1.0.0-rc2/
%{_mandir}/man1/dfbg.1*
%{_mandir}/man5/directfbrc.5*
@@ -111,16 +117,31 @@
%{_bindir}/directfb-csource
%{_includedir}/directfb/
%{_includedir}/directfb-internal/
-%{_mandir}/man1/directfb-csource.1*
%{_libdir}/pkgconfig/direct.pc
%{_libdir}/pkgconfig/directfb.pc
%{_libdir}/pkgconfig/directfb-internal.pc
%{_libdir}/pkgconfig/fusion.pc
+%exclude %{_libdir}/*.la
%{_libdir}/libdirectfb.so
%{_libdir}/libdirect.so
%{_libdir}/libfusion.so
+%{_mandir}/man1/directfb-csource.1*
+
%changelog
+* Wed Jan 17 2007 Matthias Saou <http://freshrpms.net/> 1.0.0-0.1.rc2
+- Update to 1.0.0-rc2.
+- Include sysfs patch from Eric Moret (#204568).
+- Require sysfs devel package in the devel sub-package.
+- Spec file cleanup.
+- Update asmtypes patch, required to get this rc2 to build.
+- Disable MMX on x86_64 since some asm code fails to build otherwise.
+- No longer pass an explicit list of drivers to configure since default is all.
+
+* Thu Oct 19 2006 Matthias Saou <http://freshrpms.net/> 1.0.0-0.1.rc1
+- Update to 1.0.0-rc1.
+- Include the new mkdfiff program (DirectFB Fast Image File Format).
+
* Thu Sep 14 2006 Matthias Saou <http://freshrpms.net/> 0.9.25.1-3
- FC6 rebuild.
- Remove gcc-c++ build requirement, it's a default now.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/directfb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 13 May 2006 16:36:12 -0000 1.5
+++ sources 17 Jan 2007 11:41:33 -0000 1.6
@@ -1 +1 @@
-b6d4ecf9cd3787bd2728af9110ed53cf DirectFB-0.9.25.1.tar.gz
+1996c8e90075b1177b847cd594122401 DirectFB-1.0.0-rc2.tar.gz
--- DirectFB-0.9.25.1-linux-compiler.patch DELETED ---
--- DirectFB-0.9.25.1-types.patch DELETED ---
More information about the scm-commits
mailing list