Package: xserver-xorg-video-vesa
Version: 1:2.6.0-1
Severity: normal
Tags: patch ftbfs
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/source/format: Upgrade to "3.0 (quilt)" format also restores the file
contents to the upstream original copies.
* d/copyright: upgrade the copyright file to the DEP-5 format.
* d/p/fix-implicit-declarations.patch: add a patch to fix FTBFS
on multiple platforms (LP: #2062159).
* d/control: upgrade dh-compat level to 13.
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers noble-updates
APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'),
(100, 'noble-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.8.0-40-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru xserver-xorg-video-vesa-2.6.0/ChangeLog
xserver-xorg-video-vesa-2.6.0/ChangeLog
--- xserver-xorg-video-vesa-2.6.0/ChangeLog 2024-08-14 22:11:34.000000000
-0600
+++ xserver-xorg-video-vesa-2.6.0/ChangeLog 2022-12-09 13:27:31.000000000
-0700
@@ -1,3 +1,183 @@
+commit f6f1013dec5fcef1dfb0f9ad4878e8af364e2c42
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Dec 9 12:24:33 2022 -0800
+
+ xf86-video-vesa 2.6.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit f1895cc6dfdfcb0ac3b1250e88596938a5a664be
+Author: Jocelyn Falempe <jfale...@redhat.com>
+Date: Thu Apr 14 14:39:37 2022 +0200
+
+ Refuse to run if framebuffer or dri devices are present
+
+ The simpledrm driver, introduced in kernel 5.14,
+ can replace efifb to provide the efi framebuffer.
+
+ This fixes a bug on Fedora 36 (first version to use simpledrm driver):
+ https://bugzilla.redhat.com/show_bug.cgi?id=2074789
+
+ v2: check for framebuffer or dri devices instead of efi framebuffer
interface.
+
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+ Reviewed-by: Javier Martinez Canillas <javi...@redhat.com>
+ Signed-off-by: Jocelyn Falempe <jfale...@redhat.com>
+
+commit e285658e60d9cf772dda4b2c713ad2a0d4cef569
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Oct 17 11:48:57 2022 -0700
+
+ VESAValidMode: remove duplicate call to VESAGetRec
+
+ Found by cppcheck:
+
+ src/vesa.c:356:11: style: Redundant initialization for 'pVesa'. The
initialized value is overwritten before it is read. [redundantInitialization]
+ pVesa = VESAGetRec(pScrn);
+ ^
+ src/vesa.c:350:19: note: pVesa is initialized
+ VESAPtr pVesa = VESAGetRec(pScrn);
+ ^
+ src/vesa.c:356:11: note: pVesa is overwritten
+ pVesa = VESAGetRec(pScrn);
+ ^
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 2f2436b4fe70a1f1a47c4ed112e8aefba3c8efe3
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Oct 17 11:36:55 2022 -0700
+
+ VESADGASetMode: remove unused variable scrnIdx
+
+ vesa.c: In function ‘VESADGASetMode’:
+ vesa.c:1790:9: warning: unused variable ‘scrnIdx’ [-Wunused-variable]
+ int scrnIdx = pScrn->pScreen->myNum;
+ ^~~~~~~
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 5dee3ce85addc06f5f051158c768b993ace86baa
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Jul 28 17:30:21 2022 -0700
+
+ gitlab CI: stop requiring Signed-off-by in commits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 942499a7510a4df645d4de29f634e33118f44109
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 30 08:57:14 2022 -0800
+
+ gitlab CI: add a basic build test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 5e8eb2d8c9e9a51a8015a15d268578482589549d
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 30 08:53:56 2022 -0800
+
+ Fix spelling/wording issues
+
+ Found by using:
+ codespell --builtin clear,rare,usage,informal,code,names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 782c9800be3d2d9973fe2131c10556d9971f2d00
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Jan 30 08:52:56 2022 -0800
+
+ Build xz tarballs instead of bzip2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 68f2589c687c132fc9abfd1501930bf191701165
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu Sep 10 18:01:44 2020 -0400
+
+ vesa 2.5.0
+
+commit 51a73f2fc2548d9b699d2a9c016bf5892c41d48a
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed May 30 11:46:46 2018 -0400
+
+ Disable shadow by default on known-virtual GPUs
+
+ Device memory is the same domain as host memory, in this case, so the
+ shadow just introduces more memcpy.
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 53c7796e8ddc6aaaef79df8c852c0d9d151a8559
+Author: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
+Date: Fri May 10 08:40:05 2019 +0200
+
+ Refuse to run on UEFI machines running older kernels
+
+ Prior to kernel v3.12, the efi framebuffer driver was named "efifb".
+ This cause problem on RHEL 7 as the base kernel is 3.10.
+
+ "efi-framebuffer.0" was added by commit 2645e0aa for that reason
+ (don't run on UEFI machine).
+ The change from "efifb" to "efi-framebuffer" was done with commit
+ e6816a8 in the kernel
+
+ Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
+ [ofourdan: updated commit message with commit references]
+ Reviewed-by: Olivier Fourdan <ofour...@redhat.com>
+
+commit 634dae745cf71c257554b4c18bde7710cd1716e8
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Mar 6 12:45:11 2019 -0500
+
+ Try harder to avoid 24bpp
+
+ We're preferring depth 24 even if that means 24bpp. Newer servers don't
+ support 24bpp anymore, and even for old servers it's suboptimal. Change
+ the heuristic to only try 24bpp if the alternative is pseudocolor.
+
+ Fixes: xorg/driver/xf86-video-vesa#3
+
+commit 637c968d1a2fecfb25bd6d14e4fe285e3ceafc13
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Dec 7 19:19:22 2018 -0800
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 503665924c77a1a4c5f82651aa08b9e5c5e0d4f6
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Nov 18 16:43:51 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 2645e0aa9c17c2c966a0533e52ad00510311483e
+Author: Adam Jackson <a...@redhat.com>
+Date: Wed Aug 29 11:04:23 2018 -0400
+
+ Refuse to run on UEFI machines
+
+ No possible good can come of this.
+
+ v2: Check for .../efi-framebuffer.0 ("is there an EFI framebuffer")
+ instead of /sys/firmware/efi ("is this an EFI machine"). Suggested by
+ Peter Jones.
+
+ Reviewed-by: Peter Jones <pjo...@redhat.com>
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
+commit 366622333bc1b81cab6d4aa325a18fcd27bf5db4
+Author: Adam Jackson <a...@redhat.com>
+Date: Tue Aug 28 15:26:46 2018 -0400
+
+ Newline-terminate a few error messages
+
+ Signed-off-by: Adam Jackson <a...@redhat.com>
+
commit 07e4a0f0b3bd6308da2e000c12230b1e171e65a7
Author: Adam Jackson <a...@redhat.com>
Date: Thu Feb 15 14:33:38 2018 -0500
@@ -1126,7 +1306,7 @@
Update autogen.sh to one that does objdir != srcdir.
commit 3251a5e09646f88a80b40385d2bb8e5417bdc388
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Wed Aug 10 14:07:25 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
@@ -1147,19 +1327,19 @@
- Update modular Xorg version
commit dfe2847e4720793b4ff80d717aba31079a065392
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Wed Jul 13 21:51:06 2005 +0000
add Makefile.am
commit 8100f70d79c0d1a405eeb576898a182cef8d4c3b
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Wed Jul 13 21:50:33 2005 +0000
add Makefile.am
commit be230c6144ff1dd12b0d7acce4a2a478c0be3527
-Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
Date: Wed Jul 13 21:46:36 2005 +0000
Build system for vesa video driver
diff -Nru xserver-xorg-video-vesa-2.6.0/debian/control
xserver-xorg-video-vesa-2.6.0/debian/control
--- xserver-xorg-video-vesa-2.6.0/debian/control 2024-08-14
22:11:34.000000000 -0600
+++ xserver-xorg-video-vesa-2.6.0/debian/control 2024-07-01
15:09:55.000000000 -0600
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
pkg-config,
xserver-xorg-dev (>= 2:1.11),
x11proto-dev,
diff -Nru xserver-xorg-video-vesa-2.6.0/debian/copyright
xserver-xorg-video-vesa-2.6.0/debian/copyright
--- xserver-xorg-video-vesa-2.6.0/debian/copyright 2024-08-14
22:11:34.000000000 -0600
+++ xserver-xorg-video-vesa-2.6.0/debian/copyright 2024-07-01
15:00:06.000000000 -0600
@@ -1,28 +1,35 @@
-This package was downloaded from
-https://xorg.freedesktop.org/releases/individual/driver/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xf86-video-vesa
+Upstream-Contact: xorg-de...@lists.x.org
+Source: https://xorg.freedesktop.org/releases/individual/driver/
+Comment:
+ This package was downloaded from
+ https://xorg.freedesktop.org/releases/individual/driver/
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-Copyright 2008 Red Hat, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.
+Files: *
+Copyright:
+ Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
+ Copyright 2008 Red Hat, Inc.
+License: X11
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+ .
+ Except as contained in this notice, the name of Conectiva Linux shall
+ not be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Software without prior written authorization from
+ Conectiva Linux.
diff -Nru
xserver-xorg-video-vesa-2.6.0/debian/patches/fix-implicit-declarations.patch
xserver-xorg-video-vesa-2.6.0/debian/patches/fix-implicit-declarations.patch
---
xserver-xorg-video-vesa-2.6.0/debian/patches/fix-implicit-declarations.patch
1969-12-31 17:00:00.000000000 -0700
+++
xserver-xorg-video-vesa-2.6.0/debian/patches/fix-implicit-declarations.patch
2024-07-01 15:09:55.000000000 -0600
@@ -0,0 +1,28 @@
+Description: Fix implicit declarations on armhf
+ Those function are not exposed on armhf, the macro guards do not expose
+ the function prototypes on armhf and arm64 platforms.
+Author: Zixing Liu <zixing....@canonical.com>
+Bug-Ubuntu:
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-vesa/+bug/2062159
+Forwarded: no
+Last-Update: 2024-07-03
+---
+Index: xserver-xorg-video-vesa/src/vesa.c
+===================================================================
+--- xserver-xorg-video-vesa.orig/src/vesa.c
++++ xserver-xorg-video-vesa/src/vesa.c
+@@ -45,6 +45,15 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#if defined(__arm__) && __INTPTR_WIDTH__ == 32
++extern void outb(unsigned long, unsigned char);
++extern unsigned int inb(unsigned long);
++#elif defined(__arm__) && __INTPTR_WIDTH__ == 64
++extern void outb(unsigned short, unsigned char);
++extern unsigned int inb(unsigned short);
++#elif !defined(__amd64__) && !defined(__i386__) && !defined(__ia64__) &&
!defined(__powerpc__)
++#define DO_PROTOTYPES
++#endif
+ #include "vesa.h"
+
+ /* All drivers initialising the SW cursor need this */
diff -Nru xserver-xorg-video-vesa-2.6.0/debian/patches/series
xserver-xorg-video-vesa-2.6.0/debian/patches/series
--- xserver-xorg-video-vesa-2.6.0/debian/patches/series 2024-08-14
22:11:34.000000000 -0600
+++ xserver-xorg-video-vesa-2.6.0/debian/patches/series 2024-07-01
15:09:55.000000000 -0600
@@ -1 +1 @@
-# placeholder
+fix-implicit-declarations.patch
diff -Nru xserver-xorg-video-vesa-2.6.0/debian/rules
xserver-xorg-video-vesa-2.6.0/debian/rules
--- xserver-xorg-video-vesa-2.6.0/debian/rules 2024-08-14 22:11:34.000000000
-0600
+++ xserver-xorg-video-vesa-2.6.0/debian/rules 2024-07-01 15:09:55.000000000
-0600
@@ -22,4 +22,4 @@
dh_shlibdeps -- --warnings=6
%:
- dh $@ --with quilt,xsf --builddirectory=build/
+ dh $@ --with xsf --builddirectory=build/
diff -Nru xserver-xorg-video-vesa-2.6.0/debian/source/format
xserver-xorg-video-vesa-2.6.0/debian/source/format
--- xserver-xorg-video-vesa-2.6.0/debian/source/format 2024-08-14
22:11:34.000000000 -0600
+++ xserver-xorg-video-vesa-2.6.0/debian/source/format 2024-07-01
14:12:29.000000000 -0600
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru xserver-xorg-video-vesa-2.6.0/.gitlab-ci.yml
xserver-xorg-video-vesa-2.6.0/.gitlab-ci.yml
--- xserver-xorg-video-vesa-2.6.0/.gitlab-ci.yml 2024-08-14
22:11:34.000000000 -0600
+++ xserver-xorg-video-vesa-2.6.0/.gitlab-ci.yml 1969-12-31
17:00:00.000000000 -0700
@@ -1,98 +0,0 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
-#
-# This CI uses the freedesktop.org ci-templates.
-# Please see the ci-templates documentation for details:
-# https://freedesktop.pages.freedesktop.org/ci-templates/
-
-.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see
https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-
-include:
- # Arch container builder template
- - project: 'freedesktop/ci-templates'
- ref: *template_sha
- file: '/templates/arch.yml'
- - project: 'freedesktop/ci-templates'
- ref: *template_sha
- file: '/templates/ci-fairy.yml'
- - template: Security/SAST.gitlab-ci.yml
-
-
-stages:
- - prep # prep work like rebuilding the container images if there
is a change
- - build # for actually building and testing things in a container
- - test
- - deploy
-
-
-variables:
- FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-vesa'
- # The tag should be updated each time the list of packages is updated.
- # Changing a tag forces the associated image to be rebuilt.
- # Note: the tag has no meaning, we use a date format purely for readability
- FDO_DISTRIBUTION_TAG: '2022-01-30.0'
- FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make
xorg-util-macros xorgproto xorg-server-devel pixman libpciaccess'
-
-
-#
-# Verify that commit messages are as expected
-#
-check-commits:
- extends:
- - .fdo.ci-fairy
- stage: prep
- script:
- - ci-fairy check-commits --junit-xml=results.xml
- except:
- - master@xorg/driver/xf86-video-vesa
- variables:
- GIT_DEPTH: 100
- artifacts:
- reports:
- junit: results.xml
-
-#
-# Verify that the merge request has the allow-collaboration checkbox ticked
-#
-check-merge-request:
- extends:
- - .fdo.ci-fairy
- stage: deploy
- script:
- - ci-fairy check-merge-request --require-allow-collaboration
--junit-xml=results.xml
- artifacts:
- when: on_failure
- reports:
- junit: results.xml
- allow_failure: true
-
-
-#
-# Build a container with the given tag and the packages pre-installed.
-# This only happens if the tag changes, otherwise the existing image is
-# re-used.
-#
-container-prep:
- extends:
- - .fdo.container-build@arch
- stage: prep
- variables:
- GIT_STRATEGY: none
-
-
-#
-# The default build, runs on the image built above.
-#
-build:
- stage: build
- extends:
- - .fdo.distribution-image@arch
- script:
- - autoreconf -ivf
- - mkdir _builddir
- - pushd _builddir > /dev/null
- - ../configure --disable-silent-rules
- - make
- - make check
- - make distcheck
- - popd > /dev/null
