xserver-xorg-video-modesetting: Changes to 'debian-unstable'
debian/changelog |7 +++ src/drmmode_display.c | 13 - 2 files changed, 7 insertions(+), 13 deletions(-) New commits: commit ee630eff18d0ccc963b819772e7066ec83cad422 Author: Cyril Brulebois Date: Wed Jul 8 14:49:33 2015 +0200 release to jessie Having that in the debian-unstable branch is a bit of a misnomer but I hope we'll manage. diff --git a/debian/changelog b/debian/changelog index f737991..6368bd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-modesetting (0.9.0-2) UNRELEASED; urgency=medium +xserver-xorg-video-modesetting (0.9.0-2) jessie; urgency=medium * Merge from upstream master: + modesetting: Don't pretend to support rotation (closes: #791644) commit a4d4f0dcaf03faab1a2accb39086c5c3d659a07e Author: Cyril Brulebois Date: Wed Jul 8 14:47:37 2015 +0200 Bump changelog. diff --git a/debian/changelog b/debian/changelog index e7c6b04..f737991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-modesetting (0.9.0-2) UNRELEASED; urgency=medium + + * Merge from upstream master: ++ modesetting: Don't pretend to support rotation (closes: #791644) + + -- Cyril Brulebois Wed, 08 Jul 2015 14:42:57 +0200 + xserver-xorg-video-modesetting (0.9.0-1) unstable; urgency=medium * New upstream release. commit 91571cce03adc58a10b5d76307629efc7c994c3e Author: Rob Clark Date: Tue Aug 26 17:31:26 2014 -0400 modesetting: Don't pretend to support rotation It only ends in tears Signed-off-by: Rob Clark Reviewed-by: Alex Deucher diff --git a/src/drmmode_display.c b/src/drmmode_display.c index c533324..12aa987 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -568,17 +568,6 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) } #endif -static void *drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height) -{ - return NULL; -} - -static PixmapPtr drmmode_shadow_create(xf86CrtcPtr crtc, void *data, int width, - int height) -{ - return NULL; -} - static const xf86CrtcFuncsRec drmmode_crtc_funcs = { .dpms = drmmode_crtc_dpms, .set_mode_major = drmmode_set_mode_major, @@ -593,8 +582,6 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = { #ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT .set_scanout_pixmap = drmmode_set_scanout_pixmap, #endif -.shadow_allocate = drmmode_shadow_allocate, -.shadow_create = drmmode_shadow_create, }; static void -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1zcwzw-0005lt...@moszumanska.debian.org
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
configure.ac |4 - debian/changelog |6 ++ src/driver.c | 110 -- src/driver.h |2 src/drmmode_display.c | 40 ++ 5 files changed, 131 insertions(+), 31 deletions(-) New commits: commit 0a352bd93c4002af08b743e91bd140a6e3edacf6 Author: Maarten Lankhorst Date: Thu Jun 26 10:43:17 2014 +0200 release to unstable diff --git a/debian/changelog b/debian/changelog index 906d569..e7c6b04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-modesetting (0.9.0-1) UNRELEASED; urgency=low +xserver-xorg-video-modesetting (0.9.0-1) unstable; urgency=medium * New upstream release. commit b424cf723797a0469af8a6d4ee6799ca172c4c28 Author: Maarten Lankhorst Date: Thu Jun 26 10:42:30 2014 +0200 bump changelog diff --git a/debian/changelog b/debian/changelog index af9c12c..906d569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-modesetting (0.9.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Maarten Lankhorst Thu, 26 Jun 2014 10:41:50 +0200 + xserver-xorg-video-modesetting (0.8.1-2) unstable; urgency=medium * Add modprobe config file to enable cirrus and mgag200 kms drivers. commit 1e4cb922617990a3005ac23b0c90f89147c3564b Author: Maarten Lankhorst Date: Thu Jun 26 10:37:19 2014 +0200 bump to 0.9.0 diff --git a/configure.ac b/configure.ac index 0ec8e18..1c1a36d 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-modesetting], -[0.8.1], +[0.9.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-modesetting]) AC_CONFIG_SRCDIR([Makefile.am]) commit d1c6e27759ea1d2c30cabc62ff2bc315bbbec5fc Author: Adam Jackson Date: Wed May 21 10:16:39 2014 -0400 Use own thunk function instead of shadowUpdatePackedWeak I plan to remove the Weak functions from a future server. Signed-off-by: Adam Jackson diff --git a/src/driver.c b/src/driver.c index 21274a9..d99b027 100644 --- a/src/driver.c +++ b/src/driver.c @@ -810,6 +810,12 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode, return ((uint8_t *)ms->drmmode.front_bo->ptr + row * stride + offset); } +static void +msUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) +{ +shadowUpdatePacked(pScreen, pBuf); +} + static Bool CreateScreenResources(ScreenPtr pScreen) { @@ -842,7 +848,7 @@ CreateScreenResources(ScreenPtr pScreen) FatalError("Couldn't adjust screen pixmap\n"); if (ms->drmmode.shadow_enable) { - if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(), + if (!shadowAdd(pScreen, rootPixmap, msUpdatePacked, msShadowWindow, 0, 0)) return FALSE; } commit 07c5d9cb782fde2a073efdc437489d6c4b432d46 Author: Dave Airlie Date: Fri May 2 13:16:05 2014 +1000 modesetting: fix build regression against older servers. Signed-off-by: Dave Airlie diff --git a/src/driver.c b/src/driver.c index b5fcdaf..21274a9 100644 --- a/src/driver.c +++ b/src/driver.c @@ -217,7 +217,7 @@ static Bool probe_hw(const char *dev, struct xf86_platform_device *platform_dev) { int fd; -#if XSERVER_PLATFORM_BUS +#if XF86_PDEV_SERVER_FD if (platform_dev && (platform_dev->flags & XF86_PDEV_SERVER_FD)) { fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD, -1); if (fd == -1) commit 32fb5f2d821e5e13038eab7db35c5048ad807ccc Author: Dave Airlie Date: Fri May 2 13:14:30 2014 +1000 modesetting: fix use after free. Signed-off-by: Dave Airlie diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 28a4abb..c533324 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -778,11 +778,11 @@ drmmode_output_destroy(xf86OutputPtr output) drmModeFreeProperty(drmmode_output->props[i].mode_prop); free(drmmode_output->props[i].atoms); } + free(drmmode_output->props); for (i = 0; i < drmmode_output->mode_output->count_encoders; i++) { drmModeFreeEncoder(drmmode_output->mode_encoders[i]); - free(drmmode_output->mode_encoders); } - free(drmmode_output->props); + free(drmmode_output->mode_encoders); drmModeFreeConnector(drmmode_output->mode_output); free(drmmode_output); output->driver_private = NULL; commit 509dbe8cab339e44b02fed3728bbef7de5c60d05 Author: Hans de Goede Date: Tue Mar 18 15:48:22 2014 +0100 Add support for server managed fds Signed-off-by: Hans de Goede diff --git a/src/driver.c b/src/driver.c index 0f9190a..b5fcdaf 100644 --- a/src/driver.c +++ b/src/driver.c @@ -213,9 +213,20 @@ static int check_outputs(int fd) return ret; } -static Bool probe_hw(const char *dev) +sta
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f6805ed7a067d5f1e13cae13f72f3ef4aa574dc4 Author: Julien Cristau Date: Sun May 11 01:18:53 2014 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 48617b7..af9c12c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-modesetting (0.8.1-2) UNRELEASED; urgency=medium +xserver-xorg-video-modesetting (0.8.1-2) unstable; urgency=medium * Add modprobe config file to enable cirrus and mgag200 kms drivers. - -- Julien Cristau Sun, 11 May 2014 01:03:45 +0200 + -- Julien Cristau Sun, 11 May 2014 01:20:57 +0200 xserver-xorg-video-modesetting (0.8.1-1) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wjggt-0005zv...@moszumanska.debian.org
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/modesetting.conf |2 ++ debian/xserver-xorg-video-modesetting.install |1 + 3 files changed, 9 insertions(+) New commits: commit 04442fa091d9bad84a77d44af31e240fdb7cd6c4 Author: Julien Cristau Date: Sun May 11 01:04:39 2014 +0200 Add modprobe config file to enable cirrus and mgag200 kms drivers. diff --git a/debian/changelog b/debian/changelog index 42b6709..48617b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-modesetting (0.8.1-2) UNRELEASED; urgency=medium + + * Add modprobe config file to enable cirrus and mgag200 kms drivers. + + -- Julien Cristau Sun, 11 May 2014 01:03:45 +0200 + xserver-xorg-video-modesetting (0.8.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/modesetting.conf b/debian/modesetting.conf new file mode 100644 index 000..5ad44fc --- /dev/null +++ b/debian/modesetting.conf @@ -0,0 +1,2 @@ +options cirrus modeset=1 +options mgag200 modeset=1 diff --git a/debian/xserver-xorg-video-modesetting.install b/debian/xserver-xorg-video-modesetting.install index 0596acd..5cc8598 100644 --- a/debian/xserver-xorg-video-modesetting.install +++ b/debian/xserver-xorg-video-modesetting.install @@ -1,2 +1,3 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man +debian/modesetting.conf etc/modprobe.d -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wjgrq-0002jh...@moszumanska.debian.org
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
configure.ac |2 - debian/changelog |6 + src/driver.c | 16 +++-- src/drmmode_display.c | 60 ++ src/drmmode_display.h |4 +++ 5 files changed, 52 insertions(+), 36 deletions(-) New commits: commit 6371d4ae4225fc746e197b4a692116f34cddc7b5 Author: Maarten Lankhorst Date: Tue Dec 3 17:11:53 2013 +0100 release to unstable diff --git a/debian/changelog b/debian/changelog index f7501fd..42b6709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-modesetting (0.8.1-1) UNRELEASED; urgency=low +xserver-xorg-video-modesetting (0.8.1-1) unstable; urgency=low * New upstream release. - -- Maarten Lankhorst Tue, 03 Dec 2013 17:08:12 +0100 + -- Maarten Lankhorst Tue, 03 Dec 2013 17:11:43 +0100 xserver-xorg-video-modesetting (0.8.0-1) unstable; urgency=low commit a237e36a3f25b4266674ef79fd73a9813de53290 Author: Maarten Lankhorst Date: Tue Dec 3 17:09:16 2013 +0100 bump changelog diff --git a/debian/changelog b/debian/changelog index 614a04e..f7501fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-modesetting (0.8.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Maarten Lankhorst Tue, 03 Dec 2013 17:08:12 +0100 + xserver-xorg-video-modesetting (0.8.0-1) unstable; urgency=low [ Maarten Lankhorst ] commit da64ee70f96fcac32c08128559b293732b318a00 Author: Maarten Lankhorst Date: Tue Dec 3 17:01:28 2013 +0100 bump to 0.8.1 diff --git a/configure.ac b/configure.ac index 6f7a7be..0b04923 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-modesetting], -[0.8.0], +[0.8.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-modesetting]) AC_CONFIG_SRCDIR([Makefile.am]) commit c9f899bf34530d54eb96dda9f5e7d9135967fc11 Author: Thierry Reding Date: Tue Nov 26 17:08:03 2013 +0100 Properly identify DSI outputs Newer Linux kernels support DSI outputs. To be able to identify them properly, add DSI to the list of output names. Reviewed-by: Aaron Plattner Signed-off-by: Thierry Reding diff --git a/src/drmmode_display.c b/src/drmmode_display.c index a343778..25641ce 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -977,6 +977,7 @@ static const char * const output_names[] = { "None", "TV", "eDP", "Virtual", +"DSI", }; static void commit d2403d5a1fb17f925e907296398ba14e8b104e89 Author: Thierry Reding Date: Tue Nov 26 17:08:02 2013 +0100 Staticise and constify output names This array isn't used anywhere outside this file, so it can be made static. While at it, make the array const as well. Signed-off-by: Thierry Reding Reviewed-by: Aaron Plattner diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 773ec4c..a343778 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -961,22 +961,22 @@ static int subpixel_conv_table[7] = { 0, SubPixelUnknown, SubPixelVerticalBGR, SubPixelNone }; -const char *output_names[] = { "None", - "VGA", - "DVI", - "DVI", - "DVI", - "Composite", - "S-video", - "LVDS", - "CTV", - "DIN", - "DisplayPort", - "HDMI", - "HDMI", - "TV", - "eDP", - "Virtual" +static const char * const output_names[] = { "None", +"VGA", +"DVI", +"DVI", +"DVI", +"Composite", +"S-video", +"LVDS", +"CTV", +"DIN", +"DisplayPort", +"HDMI", +"HDMI", +"TV", +"eDP", +"Virtual", }; static void commit beca4dfb0e4d11d3729214967a1fe56e
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
debian/changelog |8 debian/control |2 +- debian/rules |1 - 3 files changed, 5 insertions(+), 6 deletions(-) New commits: commit d489dff2b2f68542f2ce2ebf9474039beb708c5e Author: Julien Cristau Date: Sun Sep 8 20:45:56 2013 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index e97ec71..614a04e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low +xserver-xorg-video-modesetting (0.8.0-1) unstable; urgency=low [ Maarten Lankhorst ] - * New upstream release. + * New upstream release ++ pci probing requires interface version 1.4 (closes: #683526) [ Michele Cane ] * Bump Standards-Version to 3.9.4, no changes needed. - -- Maarten Lankhorst Tue, 17 Jul 2012 17:11:17 +0200 + -- Julien Cristau Sun, 08 Sep 2013 20:43:57 +0200 xserver-xorg-video-modesetting (0.3.0-1) unstable; urgency=low commit f2c0ca47175cf1cdb642044ec8af9fbb7907b648 Author: Julien Cristau Date: Sun Sep 8 20:35:39 2013 +0200 Remove unused BUILDER variable from d/rules diff --git a/debian/rules b/debian/rules index 415efdd..fd5a3c9 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ SOURCE_NAME:= $(shell dpkg-parsechangelog | awk -F': ' '/^Source: / {print $$2}') SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print $$2}') -BUILDER:= $(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {print $$2}') # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: commit ce06d1d75145e8611508dfc7cb9e2e365d2dfca9 Author: Julien Cristau Date: Sun Aug 18 11:58:34 2013 +0200 Revert xserver build-dep bump diff --git a/debian/changelog b/debian/changelog index da3182e..e97ec71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] * New upstream release. - * Require x-server 1.13rc1 [ Michele Cane ] * Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/control b/debian/control index da5d4d4..e48f0b0 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.12.99.901), + xserver-xorg-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vik3b-00037s...@vasks.debian.org
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
Makefile.am |2 autogen.sh|5 configure.ac | 11 + debian/changelog | 11 + debian/control|4 src/Makefile.am |1 src/compat-api.h | 94 src/driver.c | 383 +- src/drmmode_display.c | 233 +- src/drmmode_display.h | 31 +++- 10 files changed, 667 insertions(+), 108 deletions(-) New commits: commit e88e2e0d6e52751a0b0095a69678efab57bcaa5d Author: Michele Cane Date: Thu Sep 5 22:47:44 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index 9a55573..da3182e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low + [ Maarten Lankhorst ] * New upstream release. * Require x-server 1.13rc1 + [ Michele Cane ] + * Bump Standards-Version to 3.9.4, no changes needed. + -- Maarten Lankhorst Tue, 17 Jul 2012 17:11:17 +0200 xserver-xorg-video-modesetting (0.3.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 65e412e..da5d4d4 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: libudev-dev [linux-any], quilt, xutils-dev (>= 1:7.5+4), -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-modesetting Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-modesetting.git commit 9949a0fdc3290717eed4f55a6cbee87ef74708b0 Author: Maarten Lankhorst Date: Wed Jun 12 14:34:36 2013 +0200 bump version diff --git a/debian/changelog b/debian/changelog index ac74449..9a55573 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-modesetting (0.7.0-1) UNRELEASED; urgency=low +xserver-xorg-video-modesetting (0.8.0-1) UNRELEASED; urgency=low * New upstream release. * Require x-server 1.13rc1 commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9 Author: Maarten Lankhorst Date: Wed Jun 12 14:11:53 2013 +0200 bump to 0.8.0 Signed-off-by: Maarten Lankhorst diff --git a/configure.ac b/configure.ac index f0c267f..6f7a7be 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-modesetting], -[0.7.0], +[0.8.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-modesetting]) AC_CONFIG_SRCDIR([Makefile.am]) commit a299400b8404f935e5e2bc6a5b9c17821844bd0d Author: Maarten Lankhorst Date: Wed Jun 12 14:05:19 2013 +0200 modesetting: probe only succeeds if connectors are detected This will prevent modesetting being used for outputless intel or nvidia cards. Signed-off-by: Maarten Lankhorst diff --git a/src/driver.c b/src/driver.c index c3d78be..cc526f6 100644 --- a/src/driver.c +++ b/src/driver.c @@ -201,12 +201,25 @@ static int open_hw(char *dev) return fd; } +static int check_outputs(int fd) +{ +drmModeResPtr res = drmModeGetResources(fd); +int ret; + +if (!res) +return FALSE; +ret = res->count_connectors > 0; +drmModeFreeResources(res); +return ret; +} + static Bool probe_hw(char *dev) { int fd = open_hw(dev); if (fd != -1) { +int ret = check_outputs(fd); close(fd); -return TRUE; +return ret; } return FALSE; } @@ -226,7 +239,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev) static Bool probe_hw_pci(char *dev, struct pci_device *pdev) { -int fd = open_hw(dev); +int ret = FALSE, fd = open_hw(dev); char *id, *devid; drmSetVersion sv; @@ -247,13 +260,12 @@ static Bool probe_hw_pci(char *dev, struct pci_device *pdev) devid = ms_DRICreatePCIBusID(pdev); close(fd); -if (!id || !devid) - return FALSE; - -if (!strcmp(id, devid)) - return TRUE; +if (id && devid && !strcmp(id, devid)) +ret = check_outputs(fd); -return FALSE; +free(id); +free(devid); +return ret; } static const OptionInfoRec * AvailableOptions(int chipid, int busid) commit a62d5e60896166be88fcf3778921b8d10baec2c1 Author: Dave Airlie Date: Tue Jun 11 10:29:25 2013 +1000 modesetting: fix adjust frame crash When SDL called this it was totally broken, actually hook up to the underlying drmmode function. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64808 Thanks to Peter Wu for harassing me. Signed-off-by: Dave Airlie diff --git a/src/driver.c b/src/driver.c index 742aadd..c3d78be 100644 --- a/src/driver.c +++ b/src/driver.c @@ -956,16 +956,9 @@ static void AdjustFrame(ADJUST_FRAME_ARGS_DECL) { SCRN_INFO_PTR(arg); -xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); -xf86OutputPtr output = config->output[config->co
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
debian/changelog |7 --- debian/control|4 ++-- debian/patches/series |1 + debian/watch |2 +- 4 files changed, 8 insertions(+), 6 deletions(-) New commits: commit b31469d9e97605b54a4b001e5993280745ad90df Author: Cyril Brulebois Date: Wed Jun 13 21:32:26 2012 + Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 272ed27..2132968 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -xserver-xorg-video-modesetting (0.3.0-1) UNRELEASED; urgency=low +xserver-xorg-video-modesetting (0.3.0-1) unstable; urgency=low + [ Timo Aaltonen ] * Initial release (Closes: #677425). - -- Timo Aaltonen Mon, 28 May 2012 10:47:30 +0300 + -- Cyril Brulebois Wed, 13 Jun 2012 21:32:23 + commit d0b3757762c61ae1e2da3db02e2d9c5c92128c5f Author: Cyril Brulebois Date: Wed Jun 13 21:32:19 2012 + Add placeholder quilt series file. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..fdffa2a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +# placeholder commit 89f4b08a5068fc0f6b920d52db4f9f652ed48260 Author: Cyril Brulebois Date: Wed Jun 13 21:31:43 2012 + Bump xserver-xorg-dev build-dep for xsf dh add-on. diff --git a/debian/control b/debian/control index fa8376f..00b70c2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev, + xserver-xorg-dev (>= 2:1.9.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, commit 906e860fd1cd065f81a0572d7cfbbb8f208c50da Author: Cyril Brulebois Date: Wed Jun 13 21:29:21 2012 + Fix ITP bug (Closes: #677425). diff --git a/debian/changelog b/debian/changelog index 1b1c337..272ed27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ xserver-xorg-video-modesetting (0.3.0-1) UNRELEASED; urgency=low - * Initial release. + * Initial release (Closes: #677425). -- Timo Aaltonen Mon, 28 May 2012 10:47:30 +0300 commit 86fc9bbdedf019c986a3995bafcdf8502e63ccd7 Author: Cyril Brulebois Date: Wed Jun 13 23:16:17 2012 +0200 Switch from bz2 to gz (source format 1.0 means gzip). diff --git a/debian/watch b/debian/watch index 9d4f08b..2f4ec07 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-video-modesetting version=3 -http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-modesetting-(.*)\.tar\.bz2 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-modesetting-(.*)\.tar\.gz commit 2724993c2d44ff0e483a80a3786482624b6bff61 Author: Cyril Brulebois Date: Wed Jun 13 23:15:45 2012 +0200 Fix tiny typo. diff --git a/debian/control b/debian/control index f25ac1d..fa8376f 100644 --- a/debian/control +++ b/debian/control @@ -46,6 +46,6 @@ Depends: Section: debug Priority: extra Description: X.Org X server -- Generic modesetting driver (debug symbols) - This driver provides support for the generic modesetting driver + This driver provides support for the generic modesetting driver. . This package provides debugging symbols for this Xorg X driver. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1sevfh-00012m...@vasks.debian.org
xserver-xorg-video-modesetting: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 8cc58b5755004ff5910ff80abd9ab8fee7b31e5a Author: Timo Aaltonen Date: Mon May 28 11:05:40 2012 +0300 initial packaging -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1syuxg-0001ek...@vasks.debian.org