[arch-commits] Commit in xf86-video-fbdev/trunk (PKGBUILD git-fixes.patch)

[Jan de Groot]

Date: Sunday, November 12, 2017 @ 22:39:35
  Author: jgc
Revision: 309685

upgpkg: xf86-video-fbdev 0.4.4+12+ge0bce0d-1

Update to last git snapshot, drop patch

Modified:
  xf86-video-fbdev/trunk/PKGBUILD
Deleted:
  xf86-video-fbdev/trunk/git-fixes.patch

-+
 PKGBUILD|   34 -
 git-fixes.patch |  307 --
 2 files changed, 23 insertions(+), 318 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 22:28:27 UTC (rev 309684)
+++ PKGBUILD2017-11-12 22:39:35 UTC (rev 309685)
@@ -2,28 +2,38 @@
 #Maintainer: Jan de Groot 
 
 pkgname=xf86-video-fbdev
-pkgver=0.4.4
-pkgrel=7
+pkgver=0.4.4+12+ge0bce0d
+pkgrel=1
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="https://xorg.freedesktop.org/;
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23' git)
 conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
 groups=('xorg-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git-fixes.patch)
-sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b'
-'cbf66effa928b57610eb85441bc81dda337f03a1a8de37aa63eea78501dd072c')
+_commit=e0bce0d017c5e1597aa8269551355e1ddeb3c8fb  # master
+source=("git+https://anongit.freedesktop.org/git/xorg/driver/xf86-video-fbdev#commit=$_commit;)
+sha256sums=('SKIP')
 
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^xf86-video-fbdev-//;s/-/+/g'
+}
+
 prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../git-fixes.patch
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
+check() {
+  cd $pkgname
+  make check
+}
+
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname
 
   # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
   # With them, module fail to load with undefined symbol.
@@ -37,8 +47,10 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+
+

Deleted: git-fixes.patch
===
--- git-fixes.patch 2017-11-12 22:28:27 UTC (rev 309684)
+++ git-fixes.patch 2017-11-12 22:39:35 UTC (rev 309685)
@@ -1,307 +0,0 @@
-From dd1cf1028c3f0de77d075c4a169011518baab0f4 Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-Date: Fri, 21 Mar 2014 12:20:01 -0400
-Subject: [PATCH 1/4] Default to 32bpp if the console is 8bpp (and we weren't
- told otherwise)
-
-You can still override this on the command line or in the config file.
-Without this we'll come up at 8bpp on matroxfb (and probably others),
-which among other things breaks the default desktop since gnome-shell
-wants GLX and GLX doesn't support pseudocolor anymore.
-
-Signed-off-by: Adam Jackson 

- src/fbdev.c | 26 ++
- 1 file changed, 26 insertions(+)
-
-diff --git a/src/fbdev.c b/src/fbdev.c
-index f5a7378..a73565f 100644
 a/src/fbdev.c
-+++ b/src/fbdev.c
-@@ -38,6 +38,9 @@
- #include 
- #endif
- 
-+/* for xf86{Depth,FbBpp}. i am a terrible person, and i am sorry. */
-+#include "xf86Priv.h"
-+
- static Bool debug = 0;
- 
- #define TRACE_ENTER(str) \
-@@ -427,6 +430,29 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
-   if 
(!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))
-   return FALSE;
-   default_depth = fbdevHWGetDepth(pScrn,);
-+
-+  if (default_depth == 8) do {
-+  /* trust the command line */
-+  if (xf86FbBpp > 0 || xf86Depth > 0)
-+  break;
-+
-+  /* trust the config file's Screen stanza */
-+  if (pScrn->confScreen->defaultfbbpp > 0 ||
-+  pScrn->confScreen->defaultdepth > 0)
-+  break;
-+
-+  /* trust our Device stanza in the config file */
-+  if (xf86FindOption(fPtr->pEnt->device->options, "DefaultDepth") ||
-+  xf86FindOption(fPtr->pEnt->device->options, "DefaultFbBpp"))
-+  break;
-+
-+  /* otherwise, lol no */
-+  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+ "Console is 8bpp, defaulting to 32bpp\n");
-+  default_depth = 24;
-+  fbbpp = 32;
-+  } while (0);
-+
-   if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,
-Support24bppFb | Support32bppFb | 
SupportConvert32to24 | SupportConvert24to32))
-   return FALSE;
--- 
-2.10.2
-
-
-From 2673e727063fe28310836f1e6e9eda552930218a Mon Sep 17 00:00:00 2001
-From: Adam Jackson 
-Date: Wed, 21 May 2014 09:49:56 -0400
-Subject: [PATCH 2/4] Use own thunk functions 

[arch-commits] Commit in xf86-video-fbdev/trunk (PKGBUILD git-fixes.patch)

[Laurent Carlier]

Date: Tuesday, November 22, 2016 @ 05:28:14
  Author: lcarlier
Revision: 281793

upgpkg: xf86-video-fbdev 0.4.4-6

xorg-server-1.19 rebuild

Added:
  xf86-video-fbdev/trunk/git-fixes.patch
Modified:
  xf86-video-fbdev/trunk/PKGBUILD

-+
 PKGBUILD|   21 ++-
 git-fixes.patch |  307 ++
 2 files changed, 321 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-21 23:28:14 UTC (rev 281792)
+++ PKGBUILD2016-11-22 05:28:14 UTC (rev 281793)
@@ -3,18 +3,25 @@
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.4
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64)
 license=('custom')
-url="http://xorg.freedesktop.org/;
+url="https://xorg.freedesktop.org/;
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
-conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b'
+'cbf66effa928b57610eb85441bc81dda337f03a1a8de37aa63eea78501dd072c')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../git-fixes.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2016-11-22 05:28:14 UTC (rev 281793)
@@ -0,0 +1,307 @@
+From dd1cf1028c3f0de77d075c4a169011518baab0f4 Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Fri, 21 Mar 2014 12:20:01 -0400
+Subject: [PATCH 1/4] Default to 32bpp if the console is 8bpp (and we weren't
+ told otherwise)
+
+You can still override this on the command line or in the config file.
+Without this we'll come up at 8bpp on matroxfb (and probably others),
+which among other things breaks the default desktop since gnome-shell
+wants GLX and GLX doesn't support pseudocolor anymore.
+
+Signed-off-by: Adam Jackson 
+---
+ src/fbdev.c | 26 ++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/src/fbdev.c b/src/fbdev.c
+index f5a7378..a73565f 100644
+--- a/src/fbdev.c
 b/src/fbdev.c
+@@ -38,6 +38,9 @@
+ #include 
+ #endif
+ 
++/* for xf86{Depth,FbBpp}. i am a terrible person, and i am sorry. */
++#include "xf86Priv.h"
++
+ static Bool debug = 0;
+ 
+ #define TRACE_ENTER(str) \
+@@ -427,6 +430,29 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
+   if 
(!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev")))
+   return FALSE;
+   default_depth = fbdevHWGetDepth(pScrn,);
++
++  if (default_depth == 8) do {
++  /* trust the command line */
++  if (xf86FbBpp > 0 || xf86Depth > 0)
++  break;
++
++  /* trust the config file's Screen stanza */
++  if (pScrn->confScreen->defaultfbbpp > 0 ||
++  pScrn->confScreen->defaultdepth > 0)
++  break;
++
++  /* trust our Device stanza in the config file */
++  if (xf86FindOption(fPtr->pEnt->device->options, "DefaultDepth") ||
++  xf86FindOption(fPtr->pEnt->device->options, "DefaultFbBpp"))
++  break;
++
++  /* otherwise, lol no */
++  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++ "Console is 8bpp, defaulting to 32bpp\n");
++  default_depth = 24;
++  fbbpp = 32;
++  } while (0);
++
+   if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,
+Support24bppFb | Support32bppFb | 
SupportConvert32to24 | SupportConvert24to32))
+   return FALSE;
+-- 
+2.10.2
+
+
+From 2673e727063fe28310836f1e6e9eda552930218a Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Wed, 21 May 2014 09:49:56 -0400
+Subject: [PATCH 2/4] Use own thunk functions instead of fbdevHW*Weak
+
+I plan to remove the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson 
+---
+ src/fbdev.c | 86 ++---
+ 1 file changed, 71 insertions(+), 15 deletions(-)
+
+diff --git a/src/fbdev.c b/src/fbdev.c
+index a73565f..5e38da4 100644
+--- a/src/fbdev.c
 b/src/fbdev.c
+@@ -233,6 +233,35 @@ FBDevIdentify(int flags)
+   xf86PrintChipsets(FBDEV_NAME, "driver for framebuffer", FBDevChipsets);
+ }
+ 
++static Bool