rpms/directfb/devel DirectFB-1.2.8-tweak.patch, NONE, 1.1 directfb.spec, 1.26, 1.27

Nicolas Chauvet kwizart at fedoraproject.org
Mon May 11 13:57:19 UTC 2009


Author: kwizart

Update of /cvs/pkgs/rpms/directfb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15099

Modified Files:
	directfb.spec 
Added Files:
	DirectFB-1.2.8-tweak.patch 
Log Message:
- Improve tty patch
- Conditionalize SDL experimental support.


DirectFB-1.2.8-tweak.patch:

--- NEW FILE DirectFB-1.2.8-tweak.patch ---
diff -up DirectFB-1.2.8/inputdrivers/keyboard/keyboard.c.tweak DirectFB-1.2.8/inputdrivers/keyboard/keyboard.c
--- DirectFB-1.2.8/inputdrivers/keyboard/keyboard.c.tweak	2009-03-31 14:38:33.000000000 +0200
+++ DirectFB-1.2.8/inputdrivers/keyboard/keyboard.c	2009-05-11 14:41:54.000000000 +0200
@@ -341,7 +341,7 @@ driver_get_available( void )
                return 0;
      }
 
-     fd = open( "/dev/tty0", O_RDWR | O_NOCTTY );
+     fd = open( "/dev/tty1", O_RDWR | O_NOCTTY );
      if (fd < 0)
           return 0;
 
@@ -391,9 +391,9 @@ driver_open_device( CoreInputDevice  *de
           }
      }
      else {
-          fd = open( "/dev/tty0", O_RDWR | O_NOCTTY );
+          fd = open( "/dev/tty1", O_RDWR | O_NOCTTY );
           if (fd < 0) {
-               D_PERROR( "DirectFB/Keyboard: Could not open() /dev/tty0!\n" );
+               D_PERROR( "DirectFB/Keyboard: Could not open() /dev/tty1!\n" );
                return DFB_INIT;
           }
      }
diff -up DirectFB-1.2.8/src/core/core_parts.c.tweak DirectFB-1.2.8/src/core/core_parts.c
diff -up DirectFB-1.2.8/systems/fbdev/vt.c.tweak DirectFB-1.2.8/systems/fbdev/vt.c
--- DirectFB-1.2.8/systems/fbdev/vt.c.tweak	2009-03-31 14:38:33.000000000 +0200
+++ DirectFB-1.2.8/systems/fbdev/vt.c	2009-05-07 15:21:23.000000000 +0200
@@ -109,7 +109,7 @@ dfb_vt_initialize( void )
           return D_OOM();
 
      setsid();
-     dfb_vt->fd0 = open( "/dev/tty0", O_RDONLY | O_NOCTTY );
+     dfb_vt->fd0 = open( "/dev/tty1", O_RDONLY | O_NOCTTY );
      if (dfb_vt->fd0 < 0) {
           if (errno == ENOENT) {
                dfb_vt->fd0 = open( "/dev/vc/0", O_RDONLY | O_NOCTTY );
@@ -130,7 +130,7 @@ dfb_vt_initialize( void )
                }
           }
           else {
-               D_PERROR( "DirectFB/core/vt: Error opening `/dev/tty0'!\n");
+               D_PERROR( "DirectFB/core/vt: Error opening `/dev/tty1'!\n");
 
                D_FREE( dfb_vt );
                dfb_vt = NULL;


Index: directfb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/directfb/devel/directfb.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- directfb.spec	21 Apr 2009 23:56:52 -0000	1.26
+++ directfb.spec	11 May 2009 13:56:49 -0000	1.27
@@ -1,12 +1,13 @@
 Summary: Graphics abstraction library for the Linux Framebuffer Device
 Name: directfb
 Version: 1.2.8
-Release: 1%{?dist}.1
+Release: 3%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://www.directfb.org/
 Source0: http://www.directfb.org/downloads/Core/DirectFB-%{version}.tar.gz
 Patch0: DirectFB-1.2.7-libv4l2.patch
+Patch1: DirectFB-1.2.8-tweak.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libtool
@@ -15,7 +16,7 @@ BuildRequires: libpng-devel
 BuildRequires: zlib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: freetype-devel
-BuildRequires: SDL-devel
+%{?_with_SDL:BuildRequires: SDL-devel}
 BuildRequires: libsysfs-devel
 BuildRequires: libv4l-devel
 BuildRequires: libvncserver-devel
@@ -38,6 +39,7 @@ for graphics under Linux.
 Non-default rpmbuild options:
 --with fusion:   Enable linux-fusion support
 --with tslib:    Enable tslib support
+--with SDL:      Enable SDL experimental support
 
 
 %package devel
@@ -56,6 +58,7 @@ Development files for DirectFB.
 %prep
 %setup -q -n DirectFB-%{version}
 %patch0 -p1 -b .libv4l2
+%patch1 -p1 -b .tweak
 
 #Disable ppc asm since compilation fails (and it seems better to use glibc)
 sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure
@@ -79,7 +82,7 @@ autoreconf -i -f
 %ifarch i386 i586
     --disable-mmx --disable-sse \
 %endif
-    --enable-sdl \
+%{?_with_fusion:--enable-sdl} \
     --enable-zlib \
 %{?_with_fusion:--enable-multi} \
     --enable-unique \
@@ -164,6 +167,13 @@ make check
 
 
 %changelog
+* Mon May 11 2009 kwizart < kwizart at gmail.com > - 1.2.8-3
+- Improve tty patch
+- Conditionalize SDL experimental support.
+
+* Thu May  7 2009 kwizart < kwizart at gmail.com > - 1.2.8-2
+- Change default tty to tty1
+
 * Tue Apr 21 2009 kwizart < kwizart at gmail.com > - 1.2.8-1
 - Update to 1.2.8
 - Disable mmx/sse on x86




More information about the fedora-extras-commits mailing list