From c0c094a6fe09d94b73ca0318914ab919d4fc30fe Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Jan 03 2008 00:24:06 +0000 Subject: New upstream release. --- diff --git a/.cvsignore b/.cvsignore index 2630e91..a1123a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-video-openchrome-0.2.900.tar.bz2 +xf86-video-openchrome-0.2.901.tar.bz2 diff --git a/openchrome-this_is_0_2_900_release.patch b/openchrome-this_is_0_2_900_release.patch deleted file mode 100644 index 4fdeef4..0000000 --- a/openchrome-this_is_0_2_900_release.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: src/svnrelease.h -=================================================================== ---- src/svnrelease.h (revision 0) -+++ src/svnrelease.h (revision 0) -@@ -0,0 +1 @@ -+#define BUILDCOMMENT "(openchrome 0.2.900 release)\n" -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am (revision 425) -+++ src/Makefile.am (working copy) -@@ -23,7 +23,7 @@ - # -avoid-version prevents gratuitous .0.0.0 version numbers on the end - # _ladir passes a dummy rpath to libtool so the thing will actually link - # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. --EXTRA_DIST = svnversion.h -+EXTRA_DIST = svnversion.h svnrelease.h - CONFIG_CLEAN_FILES= svnversion.h - AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ - openchrome_drv_la_LTLIBRARIES = openchrome_drv.la diff --git a/openchrome-vt1625_720x576_pal.patch b/openchrome-vt1625_720x576_pal.patch deleted file mode 100644 index 6838bd8..0000000 --- a/openchrome-vt1625_720x576_pal.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: src/via_vt162x.h -=================================================================== ---- src/via_vt162x.h (revision 386) -+++ src/via_vt162x.h (working copy) -@@ -758,7 +758,7 @@ - { MODEPREFIX("640x480"), 30000, 640, 680, 808, 1000, 0, 480, 520, 523, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXPAL }, - { MODEPREFIX("800x600"), 34500, 800, 816, 880, 920, 0, 600, 604, 620, 750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIXPAL }, - { MODEPREFIX("1024x768"), 57000, 1024, 1040, 1112, 1200, 0, 768, 829, 840, 950, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXPAL }, -- { MODEPREFIX("720x576"), 28500, 720, 728, 744, 760, 0, 576, 635, 643, 750, 0, V_NHSYNC | V_PVSYNC, MODESUFFIXPAL }, -+ { MODEPREFIX("720x576"), 34500, 720, 766, 800, 1000, 0, 576, 576, 579, 690, 0, V_NHSYNC | V_PVSYNC, MODESUFFIXPAL }, - { MODEPREFIX("720x576Over"), 27000, 720, 768, 800, 864, 0, 576, 577, 579, 625, 0, V_NHSYNC | V_PVSYNC, MODESUFFIXPAL }, - - { MODEPREFIX("1280x720"), 74250, 1280, 1320, 1376, 1650, 0, 720, 722, 728, 750, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX720P }, -@@ -874,6 +874,25 @@ - /* Subcarrier 19,18,17,16, DotCrawl Subcarrier (set bit 3 of reg 11 then subcarrier) */ - 0x0, 0x0, - }, -+ -+ { "720x576", 720, 576, TVTYPE_PAL, 0, 0, -+ /* 00 0F */ -+ { 0x03, 0x00, 0x10, 0x1f, 0x03, 0x00, 0x00, 0xc9, 0x4c, 0x11, 0x7c, 0x00, 0x56, 0x57, 0x07, 0xbf, -+ 0x00, 0x80, 0x09, 0x08, 0x17, 0x24, 0xcb, 0x8a, 0x09, 0x2a, 0x06, 0x50, 0x01, 0x80, 0x00, 0x10, -+ 0x14, 0x0c, 0x32, 0x7e, 0x00, 0x5f, 0x34, 0x8c, 0x4f, 0x5e, 0x15, 0xa2, 0x22, 0x80, 0xd3, 0x10 -+ }, -+ /* 4A 4F 50 59 */ -+ { 0xc5, 0x0f, 0x00, 0x01, 0x00, 0x4b, 0xe7, 0xd2, 0x23, 0xb1, 0x22, 0x5f, 0x61, 0x7f, 0x23, 0x90, -+ /* 5A 5F 60 64 */ -+ 0xcd, 0x35, 0x83, 0x16, 0x4F, 0x76, 0x8d, 0xa9, 0xff, 0x4f, 0x04 }, -+ /* RBG 65,66,67,27,2b,2c */ -+ { 0x6A, 0x62, 0x65, 0x90, 0x99, 0 }, -+ /* Y-Cb-Cr 65,66,67 */ -+ { 0x58, 0x48, 0x49 }, -+ /* Subcarrier 19,18,17,16, DotCrawl Subcarrier (set bit 3 of reg 11 then subcarrier) */ -+ 0x2A098ACB, 0, -+ }, -+ - { "720x576Over", 720, 576, TVTYPE_PAL, 0, 0, - /* 00 0F */ - { 0x03, 0, 0x10, 0x1F, 0x03, 0, 0, 0x39, 0x19, 0x01, 0x88, 0x00, 0x55, 0x5E, 0x00, 0x9E, diff --git a/openchrome-vt1625_NTSC_modes2.patch b/openchrome-vt1625_NTSC_modes2.patch deleted file mode 100644 index ca26c75..0000000 --- a/openchrome-vt1625_NTSC_modes2.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: src/via_vt162x.h -=================================================================== ---- src/via_vt162x.h (revision 415) -+++ src/via_vt162x.h (revision 420) -@@ -765,6 +765,9 @@ - { MODEPREFIX("1920x1080"), 74250, 1920, 1960, 2016, 2200, 0, 1080, 1082, 1088, 1125, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX1080I }, - - { MODEPREFIX("640x480"), 24696, 640, 656, 744, 784, 0, 480, 482, 483, 525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC }, -+ { MODEPREFIX("720x480Under"), 34000, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC }, -+ { MODEPREFIX("720x480Fit"), 28980, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC }, -+ { MODEPREFIX("720x480Over"), 27025, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIXNTSC }, - - { MODEPREFIX("720x480Under"), 28224, 720, 728, 744, 784, 0, 480, 490, 496, 600, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX480P }, - { MODEPREFIX("720x480Fit"), 28980, 720, 728, 776, 840, 0, 480, 484, 499, 575, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX480P }, -@@ -791,6 +794,54 @@ - /* Subcarrier 19,18,17,16, DotCrawl Subcarrier (set bit 3 of reg 11 then subcarrier) */ - 0x21F07BD6, 0x21F087BE, - }, -+ { "720x480Under", 720, 480, TVTYPE_NTSC, 0, 0, -+ /* 00 0F */ -+ { 0x03, 0, 0x10, 0x1F, 0x00, 0, 0, 0x2A, 0x41, 0x0A, 0x7B, 0x15, 0x50, 0x57, 0, 0xB7, -+ 0, 0x80, 0xAB, 0x27, 0x70, 0x2C, 0xD6, 0x7B, 0xF0, 0x21, 0x02, 0x50, 0x41, 0x80, 0, 0x10, -+ 0x1C, 0x08, 0xCB, 0x77, 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -+ /* 4A 4F 50 59 */ -+ { 0xC5, 0x0F, 0x00, 0x01, 0x10, 0x4A, 0x0F, 0xCF, 0x23, 0x57, 0x22, 0x59, 0x83, 0x7F, 0x23, 0x91, -+ /* 5A 5F 60 64 */ -+ 0xD2, 0x13, 0x7A, 0x16, 0x49, 0xF1, 0x92, 0xA8, 0xFF, 0x7F, 0x03 }, -+ /* RBG 65,66,67,27,2b,2c */ -+ { 0x55, 0x37, 0x5C, 0, 0, 0 }, -+ /* Y-Cb-Cr 65,66,67 */ -+ { 0x55, 0x54, 0x56 }, -+ /* Subcarrier 19,18,17,16, DotCrawl Subcarrier (set bit 3 of reg 11 then subcarrier) */ -+ 0x21F07BD6, 0x21F04CC3, -+ }, -+ { "720x480Fit", 720, 480, TVTYPE_NTSC, 0, 0, -+ /* 00 0F */ -+ { 0x03, 0, 0x10, 0x1F, 0x00, 0, 0, 0x41, 0x3B, 0x0B, 0x7B, 0x15, 0x50, 0x57, 0, 0xB7, -+ 0, 0x80, 0xCD, 0x21, 0x73, 0x34, 0xD6, 0x7B, 0xF0, 0x21, 0x02, 0x50, 0x43, 0x80, 0, 0x10, -+ 0x1C, 0x08, 0xCA, 0x77, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -+ /* 4A 4F 50 59 */ -+ { 0xC5, 0x0F, 0, 0x01, 0x10, 0x4A, 0x47, 0xCF, 0x23, 0x3E, 0x22, 0x59, 0x8B, 0x7F, 0x23, 0x91, -+ /* 5A 5F 60 64 */ -+ 0xD2, 0x13, 0x7A, 0x16, 0x30, 0xD4, 0x8C, 0x28, 0xFF, 0x97, 0x03 }, -+ /* RBG 65,66,67,27,2b,2c */ -+ { 0x55, 0x37, 0x5C, 0, 0, 0 }, -+ /* Y-Cb-Cr 65,66,67 */ -+ { 0x55, 0x54, 0x56 }, -+ /* Subcarrier 19,18,17,16, DotCrawl Subcarrier (set bit 3 of reg 11 then subcarrier) */ -+ 0x21F07BD6, 0x21F0EBE8, -+ }, -+ { "720x480Over", 720, 480, TVTYPE_NTSC, 0, 0, -+ /* 00 0F */ -+ { 0x03, 0, 0x10, 0x1F, 0x00, 0, 0, 0x33, 0x1C, 0x06, 0x7B, 0x15, 0x50, 0x57, 0, 0x9E, -+ 0, 0x80, 0x04, 0x08, 0x08, 0x10, 0xD6, 0x7B, 0xF0, 0x21, 0x00, 0x50, 0x43, 0x80, 0, 0x10, -+ 0x1C, 0x08, 0xDC, 0x77, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -+ /* 4A 4F 50 59 */ -+ { 0xC5, 0x0F, 0, 0x01, 0x10, 0x4A, 0x59, 0xCF, 0x23, 0x0C, 0x22, 0x59, 0xCF, 0x7F, 0x23, 0x91, -+ /* 5A 5F 60 64 */ -+ 0xD2, 0xE1, 0x7D, 0x06, 0, 0, 0x80, 0x28, 0xFF, 0x59, 0x03 }, -+ /* RBG 65,66,67,27,2b,2c */ -+ { 0x55, 0x37, 0x5C, 0, 0, 0 }, -+ /* Y-Cb-Cr 65,66,67 */ -+ { 0x55, 0x54, 0x56 }, -+ /* Subcarrier 19,18,17,16, DotCrawl Subcarrier (set bit 3 of reg 11 then subcarrier) */ -+ 0x21F07BD6, 0x21F05C1E, -+ }, - { "720x480Under", 720, 480, TVTYPE_480P, 0, 0, - /* 00 0F */ - { 0x03, 0, 0x10, 0x40, 0x10, 0, 0, 0x2A, 0x41, 0x14, 0x7B, 0, 0x50, 0x57, 0, 0xB7, diff --git a/sources b/sources index c18aa19..9109434 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -598e54af7bd8a36c7a1746b547d05fbf xf86-video-openchrome-0.2.900.tar.bz2 +96576fcf874d8ee05de31dd7cf2c5f92 xf86-video-openchrome-0.2.901.tar.bz2 diff --git a/xorg-x11-drv-openchrome.spec b/xorg-x11-drv-openchrome.spec index 0687fb0..6d97fdb 100644 --- a/xorg-x11-drv-openchrome.spec +++ b/xorg-x11-drv-openchrome.spec @@ -14,8 +14,8 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome -Version: 0.2.900 -Release: 7%{?dist} +Version: 0.2.901 +Release: 1%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -24,9 +24,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2 Source1: openchrome.xinf -Patch1: openchrome-vt1625_NTSC_modes2.patch -Patch2: openchrome-vt1625_720x576_pal.patch -Patch3: openchrome-this_is_0_2_900_release.patch ExclusiveArch: %{ix86} x86_64 BuildRequires: pkgconfig @@ -59,9 +56,6 @@ X.Org X11 openchrome video driver XvMC development package. %prep %setup -q -n %{tarball}-%{version} -%patch1 -p0 -b .vt1625_NTSC_modes -%patch2 -p0 -b .vt1625_PAL_720x576 -%patch3 -p0 -b .release %build %configure --disable-static \ @@ -89,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc release_notes-0.3.0 +%doc release_notes-0.3.0 COPYING %{driverdir}/openchrome_drv.so %{_datadir}/hwdata/videoaliases/openchrome.xinf %if %{with_xvmc} @@ -109,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 02 2008 Xavier Bachelot - 0.2.901-1 +- Update to 0.2.901. +- Remove obsoleted patches. + * Fri Nov 02 2007 Xavier Bachelot - 0.2.900-7 - Replace broken VT1625 NTSC patch. - Add patch to announce as release not as development build.