[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, debian, updated. upstream/0.0.0+20091108.git9918e082-17-gd94adfc
Timo Jyrinki
timo.jyrinki at iki.fi
Sat Jan 9 13:51:20 UTC 2010
The following commit has been merged in the debian branch:
commit d94adfcd94cca031cf57329e1b08bda3edb6f104
Author: Timo Jyrinki <timo.jyrinki at iki.fi>
Date: Sat Jan 9 15:46:43 2010 +0200
New upstream version. KMS disabled since kernel/libdrm bits are not in.
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a0feb0a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+This package uses quilt patch system.
+
+For more information, see /usr/share/doc/quilt/README.source
+
diff --git a/debian/changelog b/debian/changelog
index c6e7650..d7a22a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xf86-video-glamo (0.0.0+20091108.git9918e082-1) unstable; urgency=low
+
+ * New upstream snapshot release.
+ * Update Standards-Version.
+ * Add README.source.
+ * Add 01-fix-unused-warning.patch from Ubuntu.
+ * Disable KMS by adding 02-force-kms-off.patch.
+
+ -- Timo Jyrinki <timo at debian.org> Sat, 09 Jan 2010 15:00:43 +0200
+
xf86-video-glamo (0.0.0+20090707.git98c012f7-1) unstable; urgency=low
[Luca Capello]
diff --git a/debian/control b/debian/control
index 2ab71af..4ed9897 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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, 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.1
+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
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
diff --git a/debian/patches/01-fix-unused-warning.patch b/debian/patches/01-fix-unused-warning.patch
new file mode 100644
index 0000000..fa1ec6d
--- /dev/null
+++ b/debian/patches/01-fix-unused-warning.patch
@@ -0,0 +1,56 @@
+Index: xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-driver.c
+===================================================================
+--- xf86-video-glamo-0.0.0+20090707.git98c012f7.orig/src/glamo-driver.c 2010-01-01 01:42:25.000000000 -0500
++++ xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-driver.c 2010-01-01 01:46:09.000000000 -0500
+@@ -688,11 +688,11 @@
+ volatile char *mmio = pGlamo->reg_base;
+ #endif
+ #if JBT6K74_SET_STATE
+- int fd;
++ int fd, unused;
+
+ fd = open(pGlamo->jbt6k74_state_path, O_RDONLY);
+ if (fd != -1) {
+- read(fd, pGlamo->saved_jbt6k74_state, 14);
++ unused = read(fd, pGlamo->saved_jbt6k74_state, 14);
+ close(fd);
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+@@ -723,7 +723,7 @@
+ volatile char *mmio = pGlamo->reg_base;
+ #endif
+ #ifdef JBT6K74_SET_STATE
+- int fd;
++ int fd, unused;
+ #endif
+
+ if (ioctl(pGlamo->fb_fd, FBIOPUT_VSCREENINFO, (void*)(&pGlamo->fb_saved_var)) == -1) {
+@@ -749,7 +749,7 @@
+ #ifdef JBT6K74_SET_STATE
+ fd = open(pGlamo->jbt6k74_state_path, O_WRONLY);
+ if (fd != -1) {
+- write(fd, pGlamo->saved_jbt6k74_state, 14);
++ unused = write(fd, pGlamo->saved_jbt6k74_state, 14);
+ close(fd);
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+Index: xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-output.c
+===================================================================
+--- xf86-video-glamo-0.0.0+20090707.git98c012f7.orig/src/glamo-output.c 2010-01-01 01:46:14.000000000 -0500
++++ xf86-video-glamo-0.0.0+20090707.git98c012f7/src/glamo-output.c 2010-01-01 01:46:50.000000000 -0500
+@@ -244,12 +244,12 @@
+ GlamoOutputCommit(xf86OutputPtr output) {
+ #ifdef JBT6K74_SET_STATE
+ GlamoPtr pGlamo = GlamoPTR(output->scrn);
+- int fd = open(pGlamo->jbt6k74_state_path, O_WRONLY);
++ int fd = open(pGlamo->jbt6k74_state_path, O_WRONLY), unused;
+ if (fd != -1) {
+ if(output->crtc->mode.HDisplay == 240 && output->crtc->mode.VDisplay == 320)
+- write(fd, jbt6k74_state_qvga, sizeof(jbt6k74_state_qvga));
++ unused = write(fd, jbt6k74_state_qvga, sizeof(jbt6k74_state_qvga));
+ else
+- write(fd, jbt6k74_state_vga, sizeof(jbt6k74_state_vga));
++ unused = write(fd, jbt6k74_state_vga, sizeof(jbt6k74_state_vga));
+ close(fd);
+ } else {
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
diff --git a/debian/patches/02-force-kms-off.patch b/debian/patches/02-force-kms-off.patch
new file mode 100644
index 0000000..44f34a0
--- /dev/null
+++ b/debian/patches/02-force-kms-off.patch
@@ -0,0 +1,56 @@
+diff --git a/src/glamo-driver.c b/src/glamo-driver.c
+index 283825e..6075195 100644
+--- a/src/glamo-driver.c
++++ b/src/glamo-driver.c
+@@ -34,7 +34,9 @@
+
+ #include "glamo.h"
+ #include "glamo-regs.h"
++#if 0
+ #include "glamo-kms-driver.h"
++#endif
+
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -325,7 +327,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
+ return foundScreen;
+ }
+
+-#ifdef ENABLE_KMS
++#if 0
+
+ static Bool
+ GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
+@@ -388,7 +390,7 @@ GlamoProbe(DriverPtr drv, int flags)
+ if (numDevSections <= 0) return FALSE;
+
+ /* Is today a good day to use KMS? */
+-#ifdef ENABLE_KMS
++#if 0
+ if ( GlamoKernelModesettingAvailable() ) {
+ foundScreen = GlamoKMSProbe(drv, devSections, numDevSections);
+ } else {
+diff --git a/src/glamo-kms-driver.h b/src/glamo-kms-driver.h
+index 7d67feb..1911924 100644
+--- a/src/glamo-kms-driver.h
++++ b/src/glamo-kms-driver.h
+@@ -32,3 +32,4 @@ extern Bool GlamoKMSEnterVT(int scrnIndex, int flags);
+ extern void GlamoKMSLeaveVT(int scrnIndex, int flags);
+ extern ModeStatus GlamoKMSValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
++
+diff --git a/src/glamo.h b/src/glamo.h
+index d335ce3..f449545 100644
+--- a/src/glamo.h
++++ b/src/glamo.h
+@@ -37,8 +37,10 @@
+ #include "xf86.h"
+ #include "exa.h"
+ #include <linux/fb.h>
++#if 0
+ #include <drm/drm.h>
+ #include <drm/glamo_bo.h>
++#endif
+
+ #define GLAMO_REG_BASE(c) ((c)->attr.address[0])
+ #define GLAMO_REG_SIZE(c) (0x2400)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2b01838
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-fix-unused-warning.patch
+02-force-kms-off.patch
diff --git a/debian/rules b/debian/rules
index d53453f..465dc9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ confflags += --disable-static
build: patch build-stamp
build-stamp:
dh_testdir
+ dh_quilt_patch
# upstream does not provide a tarball yet
autoreconf -i
@@ -51,6 +52,7 @@ build-stamp:
clean: xsfclean
dh_testdir
+ dh_quilt_unpatch
dh_testroot
rm -f build-stamp
--
xf86-video-glamo, SMedia Glamo video driver for X.Org
More information about the pkg-fso-commits
mailing list