[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, debian, updated. debian/0.0.0+20091108.git9918e082-1-1-g3c7b0c4

[Timo Jyrinki]

The following commit has been merged in the debian branch:
commit 3c7b0c416792192ebe5b619eb6a1243cdb4c0161
Author: Timo Jyrinki <timo at debian.org>
Date:   Sat Mar 13 10:57:02 2010 +0200

    Enable KMS support for pkg-fso repository. In addition to packaged
    libdrm-glamo, requires Glamo KMS/DRM enabled kernel which has not yet
    been packaged. Runtime detection, ie. works also in UMS mode.

diff --git a/debian/changelog b/debian/changelog
index d7a22a6..1fa6d48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xf86-video-glamo (0.0.0+20091108.git9918e082-2) unstable; urgency=low
+
+  * Enable runtime-detected KMS against pkg-fso's libdrm-glamo
+  - In addition to libdrm-glamo1, KMS requires Glamo KMS/DRM enabled kernel
+  - Upload to pkg-fso only until glamo support in official libdrm package
+  * Update Standards-Version
+
+ -- Timo Jyrinki <timo at debian.org>  Sat, 13 Mar 2010 09:59:42 +0200
+
 xf86-video-glamo (0.0.0+20091108.git9918e082-1) unstable; urgency=low
 
   * New upstream snapshot release.
diff --git a/debian/control b/debian/control
index 4ed9897..d42c5a1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: x11
 Priority: optional
 Maintainer: Debian freesmartphone.org Team <pkg-fso-maint at lists.alioth.debian.org>
 Uploaders: Luca Capello <luca at pca.it>, Timo Jyrinki <timo at debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.46-7~), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17), autoconf, automake, libtool, xutils-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.46-7~), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-video-dev, dpkg-dev (>= 1.14.17), autoconf, automake, libtool, xutils-dev, libdrm-dev, libdrm-glamo1
+Standards-Version: 3.8.4
 Vcs-Git: http://git.debian.org/git/pkg-fso/xf86-video-glamo.git
 Vcs-Browser: http://git.debian.org/?p=pkg-fso/xf86-video-glamo.git;a=summary
 
 Package: xserver-xorg-video-glamo
 Architecture: amd64 armel i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, libdrm-glamo1
 Provides: ${xviddriver:Provides}
 Description: X.Org X server -- SMedia Glamo display driver
  This package provides the driver for the SMedia Glamo 3362 chipset,
diff --git a/debian/patches/series b/debian/patches/series
index 2b01838..1a52d65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-fix-unused-warning.patch
-02-force-kms-off.patch
diff --git a/debian/rules b/debian/rules
index 465dc9c..4e950a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ build-stamp:
 	cd obj-$(DEB_BUILD_GNU_TYPE) && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info $(confflags) \
-	             CFLAGS="$(CFLAGS)" 
+	             CFLAGS="$(CFLAGS)" --enable-kms
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 
 	touch build-stamp

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org