[xawtv/f14/master] Bump to version 3.99.rc1

[mchehab]

commit 88a4f85c059052c60c68899d99a65943fd9ba859
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Sat Jan 29 09:59:04 2011 -0200

    Bump to version 3.99.rc1
    
    The main change from 3.95 is that several fixes were merged upstream,
    and V4L1/V4L2-old (up to kernel 2.6.5) drivers were removed.
    
    This patch also fixes radio application. For more details, see:
    	https://bugzilla.redhat.com/show_bug.cgi?id=673662
    
    Tested with an Avermedia m135 board.
    
    Most of the patches from Fedora were applied upstream, so we can just
    remove them. The other patches are:
        - xawtv-3.95-strip.patch:
        	Fedora-specific customization;
        - xawtv-3.95-libv4l2.patch:
       	libv4l2 patch (we prefer to keep this out-of-tree for now,
        	since pure-xawtv is useful for some tests. Maybe later,
        	we may have a separate driver for V4L2 and for libv4l2.
        - xawtv-3.95-font.patch
        	Not sure if this is fedora-specific, or if it is related to
        	pure upstream changes at Xorg fonts.
    
    We've removed patch xawtv-3.95-bpl.patch. This one were part of the fixes
    for a 2008 bugzilla:
    	https://bugzilla.redhat.com/show_bug.cgi?id=457796
    
    On that time, several kernel drivers were providing wrong values for the
    maximum number of bytes per line. So, this were a workaround in order to
    work with those broken devices. Nowadays, several old drivers were
    converted to V4L2, and those drivers got the proper fixes. So, this
    hack should not be needed anymore. However, if we ever find a bug
    with bytes-per-line again, the fix is to correct the kernel driver,
    and not adding a workaround at xawtv.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

 .gitignore                      |    3 +-
 sources                         |    2 +-
 xawtv-3.95-bpl.patch            |   85 -----------------
 xawtv-3.95-curses-utf8.patch    |   65 -------------
 xawtv-3.95-fixes.patch          |   72 ---------------
 xawtv-3.95-gcc4.patch           |   79 ----------------
 xawtv-3.95-man.patch            |  190 ---------------------------------------
 xawtv-3.95-no-dga.patch         |  120 ------------------------
 xawtv-3.95-no-double-exit.patch |   23 -----
 xawtv-3.95-open.patch           |   42 ---------
 xawtv-3.95-oss.patch            |   19 ----
 xawtv-3.95-pagesize.patch       |   41 ---------
 xawtv-3.95-region.patch         |   22 -----
 xawtv-3.95-scantv.patch         |   87 ------------------
 xawtv-3.95-v4l2-old-drop.patch  |   19 ----
 xawtv.spec                      |   47 +++-------
 16 files changed, 15 insertions(+), 901 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c817e19..3dd79a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-xawtv-3.95.tar.gz
+xawtv-3.98.tar.bz2
+/xawtv-3.99.rc1.tar.bz2
diff --git a/sources b/sources
index 024e5c3..6bfb3fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad25e03f7e128b318e392cb09f52207d  xawtv-3.95.tar.gz
+bab94421a7493ccd45e319e028138af4  xawtv-3.99.rc1.tar.bz2
diff --git a/xawtv.spec b/xawtv.spec
index 79188e8..5e864b0 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -2,30 +2,17 @@
 
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
-Version: 3.95
-Release: 14%{?dist}
+Version: 3.99.rc1
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
-URL: http://bytesex.org/xawtv/
+URL: http://git.linuxtv.org/xawtv3.git
 
-Source0: http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.gz
+Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2
 Source1: xawtv.desktop
 
 Patch0: xawtv-3.95-strip.patch
-Patch1: xawtv-3.95-curses-utf8.patch
-Patch2: xawtv-3.95-gcc4.patch
 Patch3: xawtv-3.95-font.patch
-Patch4: xawtv-3.95-region.patch
-Patch5: xawtv-3.95-pagesize.patch
-Patch6: xawtv-3.95-open.patch
-Patch7: xawtv-3.95-man.patch
-Patch8: xawtv-3.95-oss.patch
-Patch9: xawtv-3.95-scantv.patch
-Patch10: xawtv-3.95-fixes.patch
-Patch11: xawtv-3.95-no-dga.patch
-Patch12: xawtv-3.95-bpl.patch
-Patch13: xawtv-3.95-v4l2-old-drop.patch
-Patch14: xawtv-3.95-no-double-exit.patch
 
 #  add libv4l2 layer...
 Patch100: xawtv-3.95-libv4l2.patch
@@ -61,25 +48,9 @@ Xawtv also includes a grabber driver for vic.
 %prep
 %setup -q
 %patch0 -p1 -b .strip
-%patch1 -p1 -b .curses-utf8
-%patch2 -p1 -b .gcc4
 %patch3 -p1 -b .font
-%patch4 -p1 -b .region
-%patch5 -p1 -b .pagesize
-%patch6 -p1 -b .open
-%patch7 -p1 -b .man
-%patch8 -p1 -b .oss
-%patch9 -p1 -b .scantv
-%patch10 -p1 -b .fixes
-%patch11 -p1 -b .no-dga
-%patch12 -p1 -b .bpl
-%patch13 -p1 -b .v4l2-old-drop
-%patch14 -p1
 %{!?_without_libv4l:%patch100 -p1 -b .libv4l}
 
-sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac
-sed -i -e 's,/usr/X11R6/include/X11,%{_includedir}/X11,g' Makefile.in
-
 autoconf
 autoheader
 
@@ -88,8 +59,8 @@ autoheader
 
 export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 
-%configure --x-libraries=%{_libdir} --disable-motif --disable-quicktime
-make
+%configure --disable-motif --disable-quicktime
+make verbose=yes
 
 for man in `find man -name "*.[1-9]" -print`
 do
@@ -166,6 +137,12 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 28 2011 Mauro Carvalho Chehab <mchehab at redhat.com> 3.99.rc1.1
+- Update to Xawtv version 3.99.rc1
+- Removed V4L1 support
+- Applied some fixes upstream fixing radio application and also some
+  improvements from other patches that were found on Fedora.
+
 * Wed Nov 17 2010 Hans de Goede <hdegoede at redhat.com> 3.95-14
 - Protect the exit code from being called twice. This fixes a double
   free error when the user tries to exit twice when xawtv is stuck (#608344)