updated 2 packages

gdm-40.0-1

xorg-x11-server-1.20.10-2

g/gdm/gdm-vl.spec

@@ -16,8 +16,8 @@
 Summary: The GNOME Display Manager
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
-Version: 40
-Release: 0.1.rc.1%{?_dist_release}%{?with_systemd:.systemd}
+Version: 40.0
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: desktop-gnome,system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -25,10 +25,7 @@ Distribution: Vine Linux
 License: GPLv2+
 URL: http://download.gnome.org/sources/gdm
 %global shortver %(echo %{version} | cut -d . -f 1)
-Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.rc.tar.xz
-Source1: gdm-pam
-Source2: gdm-autologin-pam
-Source4: gdm-password.pam
+Source0: https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
 # moved here from pulseaudio-gdm-hooks-11.1-16
 Source5: default.pa-for-gdm
 
@@ -124,7 +121,7 @@ Development files and headers for writing GDM greeters.
 
 
 %prep
-%setup -q -n %{name}-%{version}.rc
+%setup -q -n %{name}-%{version}
 %if !%{with systemd}
 %patch501 -p1 -b .elogind
 %endif
@@ -178,8 +175,7 @@ mkdir -p %{buildroot}/var/log/gdm
 mkdir -p %{buildroot}%{_datadir}/gdm/autostart/LoginWindow
 
 sed -i -e 's/^\(.*selinux.*\)$/#\1/g' %{buildroot}%{_sysconfdir}/pam.d/*
-%if %{with systemd}
-%else
+%if !%{with systemd}
 sed -i -e 's/pam_systemd/pam_elogind/g' %{buildroot}%{_sysconfdir}/pam.d/*
 install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
 %endif
@@ -359,6 +355,10 @@ dconf update
 
 
 %changelog
+* Fri Apr 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40.0-1
+- new upstream release.
+- dropped Source2-4.
+
 * Tue Mar 30 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 40-0.1.rc.1
 - new upstream release.
 

x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -8,7 +8,7 @@ Summary:        X.Org X11 X server
 Summary(ja):    X.Org X11 X サーバ
 Name:           xorg-x11-server
 Version:        1.20.10
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -24,9 +24,19 @@ Source4:        10-quirks.conf
 Source10:       xserver.pamd
 Source20:       http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
 
-# Trivial things to never merge upstream ever:
-# This really could be done prettier.
-Patch5002: xserver-1.12.1-ssh-isnt-local.patch
+# fedora patches
+
+# From Debian use intel ddx driver only for gen4 and older chipsets
+Patch1: 06_use-intel-only-on-pre-gen4.diff
+# Default to xf86-video-modesetting on GeForce 8 and newer
+Patch2: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch
+# Default to va_gl on intel i965 as we use the modesetting drv there
+# va_gl should probably just be the default everywhere ?
+Patch3: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch
+# Submitted upstream, but not going anywhere
+Patch5: 0001-autobind-GPUs-to-the-screen.patch
+# because the display-managers are not ready yet, do not upstream
+Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
 
 # security patch
 
@@ -226,6 +236,8 @@ Summary(ja): 仮想フレームバッファ X サーバ
 Group: system
 Obsoletes: XFree86-Xvfb, XOrg-Xvfb
 Requires: xorg-x11-server-common >= %{version}-%{release}
+# required for xvfb-run
+Requires: xorg-x11-xauth
 Provides: Xvfb
 
 %description Xvfb
@@ -294,12 +306,17 @@ Xserver source code needed to build VNC server (Xvnc)
 %setup -q -n %{pkgname}-%{version}
 #%setup -q -n %{pkgname}-%{gitdate}
 
-%patch5002 -p1 -b .ssh-isnt-local
+# fedora patches
+
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch5 -p1
+%patch6 -p1
 
 # security patch
 
 # Vine patch
-%patch10010 -p1 -b .nvidia
 %patch10020 -p1 -b .fglrx
 %patch10030 -p1 -b .virtual-device
 %patch10040 -p1 -b .vesa-fallback
@@ -324,7 +341,9 @@ autoreconf -vif
 %define dri_flags --disable-dri
 %endif
 
-export CFLAGS="%{optflags} -Wstrict-overflow -rdynamic $CFLAGS"
+export CFLAGS="%{build_cflags} -Wstrict-overflow -rdynamic $CFLAGS"
+export CXXFLAGS="%{build_cxxflags} -Wstrict-overflow -rdynamic $CFLAGS"
+export LDFLAGS="%{build_ldflags}"
 %configure \
 	%{xservers} \
 	--disable-static \
@@ -546,6 +565,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 01 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.10-2
+- imported Patch1-6 from rawhide.
+- dropped Patch5002.
+- dropped Patch10010.
+
 * Thu Dec 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.10-1
 - new upstream release.