Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit xawtv
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 07 Aug 2007 09:30:35 +0200
  • Message-id: <20070807073035.69701678180@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xawtv
checked in at Tue Aug 7 09:30:35 CEST 2007.

--------
--- xawtv/xawtv.changes 2007-05-19 10:14:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/xawtv/xawtv.changes    2007-08-06 23:55:13.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug  6 23:54:57 CEST 2007 - olh@xxxxxxx
+
+- remove PAGE_SIZE useage and inclusion of asm/page.h
+
+-------------------------------------------------------------------

New:
----
  xawtv.PAGE_SIZE.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xawtv.spec ++++++
--- /var/tmp/diff_new_pack.Lt8963/_old  2007-08-07 09:29:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Lt8963/_new  2007-08-07 09:29:36.000000000 +0200
@@ -13,13 +13,13 @@
 Name:           xawtv
 BuildRequires:  aalib-devel alsa-devel freeglut-devel gcc-c++ libdrm-devel libjpeg-devel libpng-devel lirc openmotif openmotif-devel recode slang-devel update-desktop-files xorg-x11-devel zvbi-devel
 URL:            http://bytesex.org/xawtv/
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          Hardware/TV
 Requires:       v4l-conf, tv-common, tv-fonts, pia
 Conflicts:      xaw3dd
 Autoreqprov:    on
 Version:        3.95
-Release:        58
+Release:        81
 Summary:        Video4Linux TV application (Athena)
 Source:         http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.bz2
 Source1:        xawtv.desktop
@@ -27,6 +27,7 @@
 Patch:          xawtv-3.95.patch
 Patch1:         xawtv-strip.patch
 Patch2:         xawtv-pagemask.patch
+Patch3:         xawtv.PAGE_SIZE.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         permissions
 
@@ -147,6 +148,7 @@
 %patch
 %patch1
 %patch2
+%patch3 -p1
 
 %build
 autoreconf -fi
@@ -285,6 +287,8 @@
        rm -rf "%{buildroot}"
 
 %changelog
+* Mon Aug 06 2007 - olh@xxxxxxx
+- remove PAGE_SIZE useage and inclusion of asm/page.h
 * Sat May 19 2007 - coolo@xxxxxxx
 - remove translations from desktop files
 * Thu Apr 19 2007 - ro@xxxxxxx



++++++ xawtv.PAGE_SIZE.patch ++++++
---
 console/fbtools.c |    6 ------
 console/matrox.c  |    5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

--- a/console/fbtools.c
+++ b/console/fbtools.c
@@ -21,14 +21,8 @@
 #include <linux/vt.h>
 #include <linux/fb.h>
 
-#include <asm/page.h>
-
-#ifndef PAGE_SIZE
 #define PAGE_SIZE              getpagesize()
-#endif
-#ifndef PAGE_MASK
 #define PAGE_MASK              (~(PAGE_SIZE - 1))
-#endif
 
 #include "fbtools.h"
 
--- a/console/matrox.c
+++ b/console/matrox.c
@@ -9,7 +9,6 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-#include <asm/page.h> /* PAGE_SIZE */
 #include <linux/fb.h>
 
 #include "byteswap.h"
@@ -17,6 +16,8 @@
 #include "fbtools.h"
 #include "matrox.h"
 
+#define PAGE_SIZE              getpagesize()
+#define PAGE_MASK              (~(PAGE_SIZE - 1))
 /* ---------------------------------------------------------------------- */
 /* generic                                                                */
 
@@ -226,7 +227,7 @@ gfx_init(int fd)
        return -1;
     }
     off = (unsigned long)fb_fix.mmio_start -
-       ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));
+       ((unsigned long)fb_fix.mmio_start & PAGE_MASK);
     bmmio += off;
     mmio = (uint32_t*)bmmio;
     return 0;

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages