Browse Source

updated 23 packages

hwdata-0.334-1

libX11-1.6.9-1

libXvMC-1.0.12-1

libevdev-1.8.0-1

libinput-1.15.5-1

libwacom-1.3-1

xorg-x11-drv-amdgpu-19.1.0-1

xorg-x11-drv-dummy-0.3.8-2

xorg-x11-drv-evdev-2.10.6-1

xorg-x11-drv-fbdev-0.5.0-1

xorg-x11-drv-intel-2.99.917-6.20200502

xorg-x11-drv-keyboard-1.9.0-2

xorg-x11-drv-mga-2.0.0-1

xorg-x11-drv-mouse-1.9.3-1

xorg-x11-drv-nouveau-1.0.16-1

xorg-x11-drv-synaptics-1.9.1-1

xorg-x11-drv-vesa-2.4.0-1

xorg-x11-drv-vmmouse-13.1.0-4

xorg-x11-drv-vmware-13.3.0-1

xorg-x11-drv-void-1.4.1-6

xorg-x11-drv-wacom-0.39.0-1

xorg-x11-proto-devel-2019.2-1

xorg-x11-server-1.20.8-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12392 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
6d59c3218a

+ 49 - 26
h/hwdata/hwdata-vl.spec

@@ -1,21 +1,22 @@
-Name: hwdata
-Summary: Hardware identification and configuration data
-Summary(ja): ハードウエアの識別・設定情報データ
-Version: 0.232.1
-Release: 1%{?_dist_release}
-License: GPL/MIT
-Group: System Environment/Base
-Source0: %{name}-%{version}.tar.bz2
-
-BuildArch: noarch
-Conflicts: Xconfigurator < 4.9.42
-Conflicts: kernel-pcmcia-cs
-Conflicts: kudzu < 1.1.86
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+Name:           hwdata
+Summary:        Hardware identification and configuration data
+Summary(ja):    ハードウエアの識別・設定情報データ
+Version:        0.334
+Release:        1%{?_dist_release}
+Group:          System Environment/Base
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       daisuke
+
+License:        GPL/MIT
+URL:            https://github.com/vcrhonek/hwdata
+Source0:        https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:      noarch
+Conflicts:      Xconfigurator < 4.9.42
+Conflicts:      kernel-pcmcia-cs
+Conflicts:      kudzu < 1.1.86
 
 %description
 hwdata contains various hardware identification and configuration data,
@@ -28,25 +29,47 @@ hwdata には、様々なハードウエアの識別や設定情報が含まれ
 以前は Xconfiguratorやkudzuがそれぞれ提供していたハードウエアに
 関するデータベースをまとめたものが hwdata パッケージになります。
 
-%prep
 
+%prep
 %setup -q
+%configure
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} libdir=/lib
+
+cat <<EOF >> %{buildroot}/lib/modprobe.d/dist-blacklist.conf
+# we prefer e100
+blacklist eepro100
+
+# old and legacy floppy
+blacklist floppy
+
+EOF
+
+mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
+echo > %{buildroot}%{_sysconfdir}/modprobe.d/blacklist.conf
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
-%doc LICENSE COPYING
-%dir %{_datadir}/hwdata
-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist.conf
+%license LICENSE COPYING
+%dir %{_datadir}/%{name}
+/lib/modprobe.d/dist-blacklist.conf
 %config %{_datadir}/hwdata/*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist.conf
+
+
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.334-1
+- new upstream release.
+
 * Sat Nov 16 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 0.232.1-1
 - forked from fedora package
 - update pci.ids, usb.ids, pnp.ids, oui.txt
@@ -319,7 +342,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jul 30 2002 Bill Nottingham <notting@redhat.com> 0.36-1
 - tweaks for Dell Remote Assisstant cards (#60376)
 
-* Thu Jul 26 2002 Mike A. Harris <mharris@redhat.com> 0.35-1
+* Fri Jul 26 2002 Mike A. Harris <mharris@redhat.com> 0.35-1
 - Updated Cards db for CT69000
 - Various ATI cleanups and additions to Cards and pcitable
 - Updated S3 Trio3D to default to "vesa" driver (#59956)
@@ -343,7 +366,7 @@ rm -rf $RPM_BUILD_ROOT
   supported natively by 4.x will be changed to use the vesa or vga
   driver, or completely removed as unsupported.
 
-* Tue Apr 17 2002 Michael Fulbright <msf@redhat.com> 0.14-1
+* Wed Apr 17 2002 Michael Fulbright <msf@redhat.com> 0.14-1
 - another megaraid variant
 
 * Mon Apr 15 2002 Michael Fulbright <msf@redhat.com> 0.13-1

+ 32 - 28
lib/libX/libX11/libX11-vl.spec

@@ -1,36 +1,35 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Summary: X.Org X11 libX11 runtime library
-Summary(ja): X.Org X11 libX11 ランタイムライブラリ
-Name: libX11
-Version: 1.6.8
-Release: 1%{?_dist_release}
-License: MIT/X11
-Group: System Environment/Libraries
-URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-
-Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
+Summary:        X.Org X11 libX11 runtime library
+Summary(ja):    X.Org X11 libX11 ランタイムライブラリ
+Name:           libX11
+Version:        1.6.9
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       daisuke
+
+License:        MIT/X11
+URL:            https://www.x.org
+Source0:        https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+
+Patch0:         libX11-0.99.3-datadir-locale-dir-fix.patch
 # FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate
 # this patch is now committed upstream.  When libX11-1.0.4 is released,
 # manually confirm each patch hunk before removal.
-Patch2: dont-forward-keycode-0.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-xtrans-devel
-BuildRequires: xorg-x11-util-macros
-BuildRequires: libxcb-devel >= 1.4
-BuildRequires: libXau-devel
-BuildRequires: libXdmcp-devel
-Requires(pre): xorg-x11-filesystem
-Obsoletes: XFree86-libs, XOrg-libs
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+Patch2:         dont-forward-keycode-0.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  pkgconfig
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  xorg-x11-xtrans-devel
+BuildRequires:  xorg-x11-util-macros
+BuildRequires:  libxcb-devel >= 1.4
+BuildRequires:  libXau-devel
+BuildRequires:  libXdmcp-devel
+Requires(pre):  xorg-x11-filesystem
+Obsoletes:      XFree86-libs, XOrg-libs
 
 %description
 X.Org X11 libX11 runtime library
@@ -295,6 +294,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/Xresource.h
 %{_includedir}/X11/Xutil.h
 %{_includedir}/X11/cursorfont.h
+%dir %{_includedir}/X11/extensions
+%{_includedir}/X11/extensions/XKBgeom.h
 %{_libdir}/libX11.so
 %{_libdir}/libX11-xcb.so
 %{_libdir}/pkgconfig/x11.pc
@@ -318,6 +319,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.9-1
+- new upstream release.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.8-1
 - new upstream release.
 

+ 27 - 23
lib/libX/libXvMC/libXvMC-vl.spec

@@ -1,25 +1,25 @@
-Summary: X.Org X11 libXvMC runtime library
-Summary(ja): X.Org X11 libXvMC ランタイムライブラリ
-Name: libXvMC
-Version: 1.0.11
-Release: 1%{?_dist_release}
-License: MIT/X11
-Group: System Environment/Libraries
-URL: http://www.x.org
-
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-util-macros
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXv-devel
-Obsoletes: XFree86-libs, XOrg-libs
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        X.Org X11 libXvMC runtime library
+Summary(ja):    X.Org X11 libXvMC ランタイムライブラリ
+Name:           libXvMC
+Version:        1.0.12
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       daisuke
+
+License:        MIT/X11
+URL:            https://www.x.org
+Source0:        https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  pkgconfig
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  xorg-x11-util-macros
+BuildRequires:  libX11-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXv-devel
+Obsoletes:      XFree86-libs, XOrg-libs
 
 %description
 X.Org X11 libXvMC runtime library
@@ -87,15 +87,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/XvMClib.h
+%{_includedir}/X11/extensions/vldXvMC.h
 %if %{with_static}
 %{_libdir}/libXvMC.a
 %{_libdir}/libXvMCW.a
 %endif
 %{_libdir}/libXvMC.so
 %{_libdir}/libXvMCW.so
-%{_libdir}/pkgconfig/xvmc.pc
+%{_libdir}/pkgconfig/xvmc*.pc
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.12-1
+- new upstream release.
+
 * Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.11-1
 - new upstream release.
 

+ 10 - 10
lib/libe/libevdev/libevdev-vl.spec

@@ -1,20 +1,17 @@
 Summary:        A wrapper library for evdev devices
 Summary(ja):    evdev デバイス用ラッパーライブラリ
-
 Name:           libevdev
-Version:        1.5.1
+Version:        1.8.0
 Release:        1%{?_dist_release}
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 Group:          System Environment/Libraries
 License:        GPLv2
-URL:            http://www.freedesktop.org/wiki/Software/libevdev/
-Source0:        http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
+URL:            https://www.freedesktop.org/wiki/Software/libevdev/
+Source0:        https://www.freedesktop.org/software//%{name}/%{name}-%{version}.tar.xz
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 libevdev is a wrapper library for evdev devices. it moves the
@@ -72,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%license COPYING
 %{_libdir}/%{name}.so.*
 
 %files devel
@@ -91,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.0-1
+- new upstream release.
+
 * Sat Jul 23 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.1-1
 - new upstream release
 

+ 13 - 11
lib/libi/libinput/libinput-vl.spec

@@ -4,23 +4,21 @@
 %global gitversion 58abea394
 
 Name:           libinput
-Version:        1.12.4
-Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?_dist_release}
 Summary:        Input device library
 Summary(ja):    入力デバイスライブラリ
-
-License:        MIT
-URL:            http://www.freedesktop.org/wiki/Software/libinput/
-
+Version:        1.15.5
+Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?_dist_release}
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
+License:        MIT
+URL:            https://www.freedesktop.org/wiki/Software/libinput/
 %if 0%{?gitdate}
 Source0:        %{name}-%{gitdate}.tar.xz
 Source1:        make-git-snapshot.sh
 Source2:        commitid
 %else
-Source0:        http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
+Source0:        https://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz
 %endif
 
 BuildRequires:  meson
@@ -79,11 +77,12 @@ rm -rf %{buildroot}
 %{_bindir}/libinput
 %{_libdir}/libinput.so.*
 %{_libexecdir}/libinput
-%{udevdir}/libinput-device-group
-%{udevdir}/libinput-model-quirks
-%{udevdir}/rules.d/80-libinput-device-groups.rules
-%{udevdir}/rules.d/90-libinput-model-quirks.rules
+%{udevdir}/libinput-*
+%{udevdir}/rules.d/*
 %{_datadir}/libinput
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_libinput
 %{_mandir}/man1/*
 
 %files devel
@@ -93,6 +92,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.5-1
+- new upstream release.
+
 * Sun Dec 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.4-1
 - new upstream release.
 

+ 11 - 8
lib/libw/libwacom/libwacom-vl.spec

@@ -1,22 +1,21 @@
 Summary:        A library to identify wacom tablets
 Summary(ja):    ワコムタブレットを検出するためのライブラリ
 Name:           libwacom
-Version:        0.32
+Version:        1.3
 Release:        1%{?_dist_release}
-
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        MIT
-URL:            http://sourceforge.net/projects/linuxwacom/
-Source0:        %{name}-%{version}.tar.bz2
+URL:            https://github.com/linuxwacom/libwacom/wiki
+Source0:        https://github.com/linuxwacom/libwacom/releases/download/libwacom-%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:	glib2-devel
 BuildRequires:	eudev-libgudev1-devel
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
 %description
 libwacom is a library to identify wacom tablets and their model-specific
 features. It provides easy access to information such as "is this a built-in
@@ -40,7 +39,7 @@ libwacom.
 
 
 %build
-%configure --disable-static
+%configure --disable-static --with-udev-dir=/lib/udev
 
 
 %install
@@ -62,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwacom.so.*
 %{_datadir}/%{name}
 %{_mandir}/man1/libwacom-list-local-devices.1*
+/lib/udev/rules.d/65-libwacom.rules
 
 %files devel
 %defattr(-,root,root,-)
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3-1
+- new upstream release.
+
 * Sun Dec 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.32-1
 - new upstream release.
 

+ 28 - 26
x/xorg-x11-drv-amdgpu/xorg-x11-drv-amdgpu-vl.spec

@@ -5,38 +5,36 @@
 # Xorg cannot load hardened build
 %undefine _hardened_build
 
-Name:		xorg-x11-drv-amdgpu
-Version:	1.4.0
-Release:   	3%{?_dist_release}
-
-Summary:	AMD GPU video driver
+Name:           xorg-x11-drv-amdgpu
+Summary:        AMD GPU video driver
 Summary(ja):    xorg X11 amdgpu ビデオドライバ
-Group:		User Interface/X Hardware Support
-License:	MIT
-
-URL:		https://www.x.org/wiki
-Source:		https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
-
-ExcludeArch:	s390 s390x
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires: python
-BuildRequires: xorg-x11-server-sdk >= 1.6
-BuildRequires: mesa-libGL-devel
-BuildRequires: mesa-libgbm-devel
-BuildRequires: libdrm-devel >= 2.4.72
-BuildRequires: kernel-headers
-BuildRequires: automake autoconf libtool pkgconfig
-BuildRequires: xorg-x11-util-macros
-BuildRequires: eudev-libudev-devel
+Version:        19.1.0
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  python
+BuildRequires:  xorg-x11-server-sdk >= 1.6
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libgbm-devel
+BuildRequires:  libdrm-devel >= 2.4.72
+BuildRequires:  kernel-headers
+BuildRequires:  automake autoconf libtool pkgconfig
+BuildRequires:  xorg-x11-util-macros
+BuildRequires:  eudev-libudev-devel
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg
 Requires:  libdrm >= 2.4.72
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 AMDGPU driver
 
@@ -61,6 +59,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_mandir}/man4/amdgpu.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.0-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.4.0-3
 - rebuild with xserver-1.19.6
 

+ 18 - 18
x/xorg-x11-drv-dummy/xorg-x11-drv-dummy-vl.spec

@@ -2,27 +2,24 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 dummy video driver
-Summary(ja):   Xorg X11 dummy ビデオドライバ
-Name:      xorg-x11-drv-dummy
-Version:   0.3.8
-Release:   1%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:        Xorg X11 dummy video driver
+Summary(ja):    Xorg X11 dummy ビデオドライバ
+Name:           xorg-x11-drv-dummy
+Version:        0.3.8
+Release:        2%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
 
-ExcludeArch: s390 s390x
+BuildRequires:  xorg-x11-server-sdk
 
-BuildRequires: xorg-x11-server-sdk
-
-Requires:  hwdata
-Requires:  xorg-x11-server-Xorg
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Requires:       hwdata
+Requires:       xorg-x11-server-Xorg
 
 %description 
 X.Org X11 dummy video driver.
@@ -51,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.8-2
+- rebuilt with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.3.8-1
 - update to 0.3.8
 - build with xserver-1.19.6

+ 17 - 13
x/xorg-x11-drv-evdev/xorg-x11-drv-evdev-vl.spec

@@ -2,16 +2,19 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 evdev input driver
-Summary(ja):   Xorg X11 evdev 入力ドライバ
-Name:      xorg-x11-drv-evdev
-Version:   2.10.5
-Release:   1%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Summary:        Xorg X11 evdev input driver
+Summary(ja):    Xorg X11 evdev 入力ドライバ
+Name:           xorg-x11-drv-evdev
+Version:        2.10.6
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: xorg-x11-server-sdk 
@@ -23,9 +26,6 @@ BuildRequires: eudev-libudev-devel
 BuildRequires: mtdev-devel
 Requires:  xorg-x11-server-Xorg
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description 
 X.Org X11 evdev input driver.
 
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xorg.conf.d/10-evdev.conf
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.6-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Wed Feb 14 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.10.5-1
 - update to 2.10.5
 - build with xserver-1.19.6

+ 20 - 19
x/xorg-x11-drv-fbdev/xorg-x11-drv-fbdev-vl.spec

@@ -2,28 +2,25 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 fbdev video driver
-Summary(ja):   Xorg X11 fbdev ビデオドライバ
-Name:      xorg-x11-drv-fbdev
-Version:   0.4.4
-Release:   7%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-
-ExcludeArch: s390 s390x
-
-BuildRequires: xorg-x11-server-sdk
-BuildRequires: autoconf automake libtool
+Summary:        Xorg X11 fbdev video driver
+Summary(ja):    Xorg X11 fbdev ビデオドライバ
+Name:           xorg-x11-drv-fbdev
+Version:        0.5.0
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive//individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRequires:  xorg-x11-server-sdk
+BuildRequires:  autoconf automake libtool
 
 Requires:  xorg-x11-server-Xorg
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description 
 X.Org X11 fbdev video driver.
 
@@ -52,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.0-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.4.4-7
 - rebuild with xserver-1.19.6
 

+ 77 - 58
x/xorg-x11-drv-intel/xorg-x11-drv-intel-vl.spec

@@ -1,40 +1,50 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20180218
+%define gitdate 20200502
 
 %if "%{?_dist_release}" >= "vl7"
 %define accel sna
-%define gputoolsdate 20180218
+%define gputoolsdate 20200502
 %else
 %define accel sna
 %define gputoolsdate 20110817
 %endif
 
-Summary:   Xorg X11 Intel video driver
-Summary(ja):   Xorg X11 Intel ビデオドライバ
-Name:      xorg-x11-drv-intel
-Epoch:     1
-Version:   2.99.917
-Release:   5.%{gitdate}%{?_dist_release}
-URL:       http://intellinuxgraphics.org/
-License:   MIT
-Group:     User Interface/X Hardware Support
+Summary:        Xorg X11 Intel video driver
+Summary(ja):    Xorg X11 Intel ビデオドライバ
+Name:           xorg-x11-drv-intel
+Epoch:          1
+Version:        2.99.917
+Release:        6.%{gitdate}%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       daisuke
 
-#Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
-Source0:   xf86-video-intel-%{gitdate}.tar.bz2
-Source2:   intel.xinf
-Source3:   intel-gpu-tools-%{gputoolsdate}.tar.bz2
+URL:            http://intellinuxgraphics.org/
+License:        MIT
 
-Patch0:     intel-gcc-pr65873.patch
-Patch1:     igt-stat.patch
+#Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
+# from https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
+Source0:        xf86-video-intel-%{gitdate}.tar.bz2
+Source2:        intel.xinf
+# from https://gitlab.freedesktop.org/drm/igt-gpu-tools
+Source3:        intel-gpu-tools-%{gputoolsdate}.tar.bz2
+
+Patch0:         intel-gcc-pr65873.patch
+Patch1:         igt-stat.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=96255#c11
-Patch4:     0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
+Patch4:         0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: meson
+BuildRequires: flex
+BuildRequires: bison
 BuildRequires: autoconf, automake, libtool
 BuildRequires: xorg-x11-server-sdk >= 1.7.99
+BuildRequires: libXv-devel
 BuildRequires: libXvMC-devel
 BuildRequires: libXfont2-devel
 BuildRequires: libXrandr-devel
@@ -45,6 +55,7 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXext-devel
 BuildRequires: libXrender-devel
+BuildRequires: libXinerama-devel
 BuildRequires: pixman-devel
 BuildRequires: libGL-devel >= 7.10
 BuildRequires: libdrm-devel >= 2.4.25
@@ -56,6 +67,8 @@ BuildRequires: cairo-devel
 BuildRequires: kmod-devel
 BuildRequires: procps-devel
 BuildRequires: libunwind-devel
+BuildRequires: elfutils-devel
+BuildRequires: libatomic
 
 # for only autoreconf
 BuildRequires: gtk-doc
@@ -69,10 +82,6 @@ Provides: xorg-x11-drv-i810
 
 #Conflicts:  kudzu < 1.2.42-1
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description 
 X.Org X11 Intel video driver.
 
@@ -95,62 +104,64 @@ Debugging tools for Intel graphics chips
 
 
 %prep
-%setup -q -n xf86-video-intel-%{gitdate} -b3
+%setup -q -n xf86-video-intel-master -b3
 
 %patch0 -p1 -b .gcc
 %patch4 -p1
 
-pushd ../intel-gpu-tools-%{gputoolsdate}
+# fix missing dependency.
+sed -i \
+  -e "/dependencies/a\\\\t\\t dependency('xv', required : true)," \
+  src/legacy/i810/xvmc/meson.build \
+  xvmc/meson.build
+
+pushd ../igt-gpu-tools-master
 %patch1 -p1 -b .stat
 touch lib/check-ndebug.h
 popd
 
 %build
-autoreconf -vi
-
-%if "%{?_dist_release}" < "vl7"
-export CFLAGS="-I/usr/include/X11/dri"
-%endif
-
-%configure \
-  --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
-  --enable-tools \
-  --enable-dri --enable-xvmc \
-  --enable-sna --enable-uxa \
-  --with-default-accel=%{accel} \
-  --enable-xaa=no
-
-make %{_smp_mflags} V=1
-
-pushd ../intel-gpu-tools-%{gputoolsdate}
-mkdir -p m4
-cp /usr/share/gtk-doc/data/gtk-doc.make ./
-autoreconf -f -i -v
-%configure \
-	--disable-nouveau \
-	--disable-dumper \
-	--disable-gtkdoc
-
 export LANG=en_US.UTF-8
-make %{_smp_mflags} V=1
+
+%meson \
+  -Dxaa=false \
+  -Ddri1=false \
+  -Dvalgrind=false \
+  -Ddefault-dri=3 \
+  -Ddefault-accel=%{accel}
+
+%meson_build
+
+pushd ../igt-gpu-tools-master
+%meson \
+  -Doverlay=disabled \
+  -Dchamelium=disabled \
+  -Dvalgrind=disabled \
+  -Dlibdrm_drivers=intel,amdgpu \
+  -Dtests=disabled \
+  -Ddocs=disabled \
+  -Ddocs=disabled \
+  -Dman=disabled \
+  -Drunner=disabled \
+  -Doping=disabled
+
+%meson_build
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-pushd ../intel-gpu-tools-%{gputoolsdate}
-make install DESTDIR=$RPM_BUILD_ROOT
+pushd ../igt-gpu-tools-master
+%meson_install
 popd
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/intel-gpu-tools
 
-find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,13 +191,21 @@ fi ||:
 %files -n intel-gpu-tools
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_libdir}/intel_aubdump.so
-%{_libexecdir}/intel-gpu-tools/
-%{_datadir}/intel-gpu-tools/
+%{_includedir}/i915-perf
+%{_libdir}/libi915_perf.so*
+%{_libdir}/libigt.so*
+%{_libdir}/pkgconfig/i915-perf.pc
+%{_libdir}/pkgconfig/intel-gen4asm.pc
+%{_libexecdir}/igt-gpu-tools/
+%{_datadir}/igt-gpu-tools/
 #{_mandir}/man1/intel_*.1*
 
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.99.917-6.20200502
+- updated Source0 and Source3 to git HEAD.
+- built with xserver-1.20.8.
+
 * Sun Feb 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.99.917-5.20180218
 - updated Source0 and Source3 to git HEAD(2018-02-18).
 

+ 20 - 17
x/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard-vl.spec

@@ -2,23 +2,23 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 keyboard input driver
-Summary(ja):   Xorg X11 キーボード入力ドライバ
-Name:      xorg-x11-drv-keyboard
-Version:   1.9.0
-Release:   1%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-server-sdk
-Requires:  xorg-x11-server-Xorg
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Xorg X11 keyboard input driver
+Summary(ja):    Xorg X11 キーボード入力ドライバ
+Name:           xorg-x11-drv-keyboard
+Version:        1.9.0
+Release:        2%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  xorg-x11-server-sdk
+Requires:       xorg-x11-server-Xorg
 
 %description 
 X.Org X11 keyboard input driver.
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.0-2
+- rebuilt with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.9.0-1
 - update to 1.9.0
 - build with xserver-1.19.6

+ 19 - 18
x/xorg-x11-drv-mga/xorg-x11-drv-mga-vl.spec

@@ -4,24 +4,24 @@
 
 # %define gitdate 20080102
 
-Summary:   Xorg X11 mga video driver
-Summary(ja):   Xorg X11 mga ビデオドライバ
-Name:      xorg-x11-drv-mga
-Version:   1.6.5
-Release:   1%{?_dist_release}
-Epoch:	   1
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:        Xorg X11 mga video driver
+Summary(ja):    Xorg X11 mga ビデオドライバ
+Name:           xorg-x11-drv-mga
+Epoch:          1
+Version:        2.0.0
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-#Source0:    %{tarball}-%{gitdate}.tar.bz2
-Source1:    mga.xinf
+URL:            http://www.x.org
+License:        MIT
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:        mga.xinf
 
-Patch0: mga-1.6.5-no-hal-advertising.patch
+Patch0:         mga-1.6.5-no-hal-advertising.patch
 
-ExcludeArch: s390 s390x
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-sdk >= 1.6
@@ -31,9 +31,6 @@ BuildRequires: libdrm-devel >= 2.0-1
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description 
 X.Org X11 mga video driver.
 
@@ -66,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:2.0.0-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.6.5-1
 - update to 1.6.5
 - update patch0

+ 21 - 17
x/xorg-x11-drv-mouse/xorg-x11-drv-mouse-vl.spec

@@ -2,23 +2,23 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 mouse input driver
-Summary(ja):   Xorg X11 マウス入力ドライバ
-Name:      xorg-x11-drv-mouse
-Version:   1.9.2
-Release:   1%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-server-sdk >= 1.6.0
-Requires: xorg-x11-server-Xorg
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Xorg X11 mouse input driver
+Summary(ja):    Xorg X11 マウス入力ドライバ
+Name:           xorg-x11-drv-mouse
+Version:        1.9.3
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  xorg-x11-server-sdk >= 1.6.0
+Requires:       xorg-x11-server-Xorg
 
 %description 
 X.Org X11 mouse input driver.
@@ -65,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.3-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.9.2-1
 - new upstream release
 - build with xorg 1.19.6

+ 18 - 16
x/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau-vl.spec

@@ -2,20 +2,21 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
 
-Summary:   Xorg X11 nouveau video driver for NVIDIA graphics chipsets
-Summary(ja): Xorg X11 nouveau ビデオドライバ - NVIDIA グラフィックスチップセット用
-Name:      xorg-x11-drv-nouveau
-Version:   1.0.15
-Release:   2%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-# Fedora specific snapshot no upstream release
-Source0:   xf86-video-nouveau-%{version}.tar.bz2
+Summary:        Xorg X11 nouveau video driver for NVIDIA graphics chipsets
+Summary(ja):    Xorg X11 nouveau ビデオドライバ - NVIDIA グラフィックスチップセット用
+Name:           xorg-x11-drv-nouveau
+Version:        1.0.16
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
 
-ExcludeArch: s390 s390x
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-sdk >= 1.8.0
@@ -29,9 +30,6 @@ Requires:  xorg-x11-server-Xorg > 1.8.0
 Requires:  libdrm >= 2.4.40
 Requires:  eudev-libudev
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description 
 X.Org X11 nouveau video driver.
 
@@ -59,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.16-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Wed Feb 14 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0.15-2
 - rebuild with xserver-1.19.6
 

+ 14 - 11
x/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics-vl.spec

@@ -5,18 +5,19 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Summary(ja):    Xorg X11 synaptics 入力ドライバ
-Version:        1.9.0
+Version:        1.9.1
 Release:        1%{?_dist_release}
-URL:            http://www.x.org
-License:        MIT
 Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-
-Source1:	50-synaptics.conf
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+Source1:        50-synaptics.conf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-ExcludeArch:    s390 s390x
 BuildRequires:  libtool, pkgconfig
 BuildRequires:  xorg-x11-server-sdk >= 1.6.0
 BuildRequires:  libX11-devel, libXi-devel, libXext-devel
@@ -29,9 +30,6 @@ Requires:       xorg-x11-server-Xorg
 Provides:       synaptics = %{version}-%{release}
 Obsoletes:      synaptics < 0.15.0
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 This is a driver for the Synaptics TouchPad for X.Org. A Synaptics touchpad by
 default operates in compatibility mode by emulating a standard mouse. However,
@@ -112,7 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%license COPYING
+%doc README
 %{_datadir}/X11/xorg.conf.d/*.conf
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
@@ -124,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xorg-synaptics.pc
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.1-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.9.0-1
 - update to 1.9.0
 - built with xorg 1.19.6

+ 20 - 17
x/xorg-x11-drv-vesa/xorg-x11-drv-vesa-vl.spec

@@ -2,23 +2,22 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 vesa video driver
-Summary(ja):   Xorg X11 vesa ビデオドライバ
-Name:      xorg-x11-drv-vesa
-Version:   2.3.4
-Release:   3%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-server-sdk >= 1.4.99
-Requires:  xorg-x11-server-Xorg
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Xorg X11 vesa video driver
+Summary(ja):    Xorg X11 vesa ビデオドライバ
+Name:           xorg-x11-drv-vesa
+Version:        2.4.0
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+URL:            http://www.x.org
+License:        MIT
+Source0:        https://www.x.org/archive//individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  xorg-x11-server-sdk >= 1.4.99
+Requires:       xorg-x11-server-Xorg
 
 %description 
 X.Org X11 vesa video driver.
@@ -48,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.0-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.3.4-3
 - rebuild with xserver-1.19.6
 

+ 21 - 18
x/xorg-x11-drv-vmmouse/xorg-x11-drv-vmmouse-vl.spec

@@ -2,28 +2,28 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 vmmouse input driver
-Summary(ja):   Xorg X11 vmmouse 入力ドライバ
-Name:      xorg-x11-drv-vmmouse
-Version:   13.1.0
-Release:   3%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:        Xorg X11 vmmouse input driver
+Summary(ja):    Xorg X11 vmmouse 入力ドライバ
+Name:           xorg-x11-drv-vmmouse
+Version:        13.1.0
+Release:        4%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 # Yes, this is not the same as vmware.  Yes, this is intentional.
 ExclusiveArch: %{ix86} x86_64
 
-BuildRequires: xorg-x11-server-sdk
-BuildRequires: eudev-libudev-devel
+BuildRequires:  xorg-x11-server-sdk
+BuildRequires:  eudev-libudev-devel
 
-Requires: xorg-x11-server-Xorg
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Requires:       xorg-x11-server-Xorg
 
 %description 
 X.Org X11 vmmouse input driver.
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rules.d/69-xorg-vmmouse.rules
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 13.1.0-4
+- rebuilt with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 13.1.0-3
 - rebuild with xserver-1.19.6
 

+ 26 - 20
x/xorg-x11-drv-vmware/xorg-x11-drv-vmware-vl.spec

@@ -2,32 +2,34 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-Summary:   Xorg X11 vmware video driver
-Summary(ja):   Xorg X11 vmware ビデオドライバ
-Name:      xorg-x11-drv-vmware
-Version:   13.2.1
-Release:   1%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   vmware.xinf
+Summary:        Xorg X11 vmware video driver
+Summary(ja):    Xorg X11 vmware ビデオドライバ
+Name:           xorg-x11-drv-vmware
+Version:        13.3.0
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+
+Source1:        vmware.xinf
 
 # upstream patch to fix undefined symbol
 # https://bugs.freedesktop.org/show_bug.cgi?id=24541
 # http://bts.vinelinux.org/VineLinux/823
-Patch0:    xorg-x11-drv-vmware-10.16.8-fdo24541.patch
+Patch0:         xorg-x11-drv-vmware-10.16.8-fdo24541.patch
 
-ExclusiveArch: %{ix86} x86_64 ia64
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-server-sdk
-BuildRequires: mesa-libxatracker-devel
-Requires:  hwdata
-Requires:  xorg-x11-server-Xorg
+ExclusiveArch:  %{ix86} x86_64 ia64
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  xorg-x11-server-sdk
+BuildRequires:  mesa-libxatracker-devel
+Requires:       hwdata
+Requires:       xorg-x11-server-Xorg
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 %description 
 X.Org X11 vmware video driver.
@@ -63,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 13.3.0-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 13.2.1-1
 - new upstream release
 - build with xserver-1.19.6

+ 21 - 18
x/xorg-x11-drv-void/xorg-x11-drv-void-vl.spec

@@ -2,23 +2,23 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 void input driver
-Summary(ja): Xorg X11 void 入力ドライバ
-Name:      xorg-x11-drv-void
-Version:   1.4.1
-Release:   5%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-server-sdk
-Requires:  xorg-x11-server-Xorg
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Xorg X11 void input driver
+Summary(ja):    Xorg X11 void 入力ドライバ
+Name:           xorg-x11-drv-void
+Version:        1.4.1
+Release:        6%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.x.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://www.x.org/archive/individual/driver/%{tarball}-%{version}.tar.bz2
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  xorg-x11-server-sdk
+Requires:       xorg-x11-server-Xorg
 
 %description 
 X.Org X11 void input driver.
@@ -43,12 +43,15 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc COPYING
+%license COPYING
 %defattr(-,root,root,-)
 %{driverdir}/void_drv.so
 %{_mandir}/man4/void.4*
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.1-6
+- rebuilt with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.4.1-5
 - rebuild with xserver-1.19.6
 

+ 30 - 29
x/xorg-x11-drv-wacom/xorg-x11-drv-wacom-vl.spec

@@ -2,37 +2,35 @@
 %global moduledir %(pkg-config xorg-server --variable=moduledir )
 %global driverdir %{moduledir}/input
 
-Summary:    Xorg X11 wacom input driver
-Name:       xorg-x11-drv-wacom
-Version:    0.36.0
-Release:    1%{?_dist_release}
-URL:        http://sourceforge.net/projects/linuxwacom/
-License:    GPLv2+
-Group:      User Interface/X Hardware Support
+Summary:        Xorg X11 wacom input driver
+Name:           xorg-x11-drv-wacom
+Version:        0.39.0
+Release:        1%{?_dist_release}
+Group:          User Interface/X Hardware Support
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
+License:        GPLv2+
+URL:            https://linuxwacom.github.io/
+Source0:        https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-%{version}/xf86-input-wacom-%{version}.tar.bz2
 
-ExcludeArch: s390 s390x
+ExcludeArch:    s390 s390x
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: xorg-x11-server-sdk >= 1.7.0
-BuildRequires: xorg-x11-util-macros >= 1.3.0
-BuildRequires: libX11-devel
-BuildRequires: libXi-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXinerama-devel
-BuildRequires: glib2-devel
-BuildRequires: eudev-libudev-devel
+BuildRequires:  xorg-x11-server-sdk >= 1.7.0
+BuildRequires:  xorg-x11-util-macros >= 1.3.0
+BuildRequires:  libX11-devel
+BuildRequires:  libXi-devel
+BuildRequires:  libXrandr-devel
+BuildRequires:  libXinerama-devel
+BuildRequires:  glib2-devel
+BuildRequires:  eudev-libudev-devel
 
-Requires: xorg-x11-server-Xorg
-Requires: eudev
+Requires:       xorg-x11-server-Xorg
 
-Provides:  linuxwacom = %{version}-%{release}
-Obsoletes: linuxwacom <= 0.8.4.3
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Provides:       linuxwacom = %{version}-%{release}
+Obsoletes:      linuxwacom <= 0.8.4.3
 
 %description
 X.Org X11 wacom input driver for Wacom tablets.
@@ -76,9 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS README GPL
-# ChangeLog is autogenerated by make dist, we don't run it from git builds
-%doc ChangeLog
+%license GPL
+%doc AUTHORS README.md
 %{driverdir}/wacom_drv.so
 %{_mandir}/man4/wacom.4*
 %{_mandir}/man1/xsetwacom.1*
@@ -89,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc GPL
+%license GPL
 %{_libdir}/pkgconfig/xorg-wacom.pc
 %{_includedir}/xorg/Xwacom.h
 %{_includedir}/xorg/isdv4.h
@@ -98,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.39.0-1
+- new upstream release.
+- built with xserver-1.20.8.
+
 * Fri Feb 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.36.0-1
 - update to 0.36.0
 - built with xorg 1.19.6

+ 33 - 126
x/xorg-x11-proto-devel/xorg-x11-proto-devel-vl.spec

@@ -5,59 +5,16 @@
 Summary: X.Org X11 Protocol headers
 Summary(ja): X.Org X11 プロトコルヘッダファイル
 Name: xorg-x11-proto-devel
-Version: 7.7
-Release: 10%{?_dist_release}
-License: MIT
+Version: 2019.2
+Release: 1%{?_dist_release}
 Group: Development/Libraries
-URL: http://www.x.org
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
-# Add virtual provides lazily as they get updated, so the server and libs
-# can depend on specific proto versions instead of this package's version.
-Source0:  ftp://ftp.x.org/pub/individual/proto/bigreqsproto-1.1.2.tar.bz2
-Source1:  ftp://ftp.x.org/pub/individual/proto/compositeproto-0.4.2.tar.bz2
-Provides: compositeproto = 0.4.2
-Source2:  ftp://ftp.x.org/pub/individual/proto/damageproto-1.2.1.tar.bz2
-Provides: damageproto = 1.2.1
-Source3:  ftp://ftp.x.org/pub/individual/proto/dmxproto-2.3.1.tar.bz2
-Source4:  ftp://ftp.x.org/pub/individual/proto/evieext-1.1.1.tar.bz2
-Source5:  ftp://ftp.x.org/pub/individual/proto/fixesproto-5.0.tar.bz2
-Provides: fixesproto = 5.0
-Source6:  ftp://ftp.x.org/pub/individual/proto/fontcacheproto-0.1.3.tar.bz2
-Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.1.3.tar.bz2
-Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.17.tar.bz2
-Provides: glproto = 1.4.17
-Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-2.3.2.tar.bz2
-Provides: inputproto = 2.3.2
-Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.7.tar.bz2
-Provides: kbproto = 1.0.7
-Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.5.0.tar.bz2
-Provides: randrproto = 1.5.0
-Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.14.2.tar.bz2
-Source15: ftp://ftp.x.org/pub/individual/proto/renderproto-0.11.1.tar.bz2
-Provides: renderproto = 0.11.1
-Source16: ftp://ftp.x.org/pub/individual/proto/resourceproto-1.2.0.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/proto/scrnsaverproto-1.2.2.tar.bz2
-Provides: scrnsaverproto = 1.2.2
-Source18: ftp://ftp.x.org/pub/individual/proto/trapproto-3.4.3.tar.bz2
-Source19: ftp://ftp.x.org/pub/individual/proto/videoproto-2.3.3.tar.bz2
-Source20: ftp://ftp.x.org/pub/individual/proto/xcmiscproto-1.2.2.tar.bz2
-Source21: ftp://ftp.x.org/pub/individual/proto/xextproto-7.3.0.tar.bz2
-Provides: xextproto = 7.3.0
-Source22: ftp://ftp.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-Source23: ftp://ftp.x.org/pub/individual/proto/xf86dgaproto-2.1.tar.bz2
-Provides: xf86dgaproto = 2.1
-Source24: ftp://ftp.x.org/pub/individual/proto/xf86driproto-2.1.1.tar.bz2
-Source25: ftp://ftp.x.org/pub/individual/proto/xf86miscproto-0.9.3.tar.bz2
-Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2
-Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.2.1.tar.bz2
-Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.31.tar.bz2
-Provides: xproto = 7.0.31
-Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
-Source31: ftp://ftp.x.org/pub/individual/proto/dri2proto-2.8.tar.bz2
-Provides: dri2proto = 2.8
-Source32: ftp://ftp.x.org/pub/individual/proto/presentproto-1.1.tar.bz2
-Source33: ftp://ftp.x.org/pub/individual/proto/dri3proto-1.0.tar.bz2
+License: MIT
+URL: http://www.x.org
+Source0: https://github.com/freedesktop/xorg-xorgproto/archive/xorgproto-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
@@ -76,68 +33,42 @@ Requires: libXau-devel
 %endif
 Requires: pkgconfig
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 X.Org X11 Protocol headers
 
+
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -a32 -a33
+%setup -q -n xorg-xorgproto-xorgproto-%{version}
+
 
 %build
+autoreconf -fiv
+%configure --disable-specs
+make %{?_smp_mflags}
 
-# Proceed through each proto package directory, building them all
-for dir in $(ls -1) ; do
-	pushd $dir
-	# yes, this looks horrible, but it's to get the .pc files in datadir
-	%configure --libdir=%{_datadir}
-	make %{?_smp_mflags}
-	[ -e COPYING ] && mv COPYING COPYING-${dir%%-*}
-	popd
-done
 
 %install
-rm -rf $RPM_BUILD_ROOT
-for dir in $(ls -1) ; do
-	pushd $dir
-	make install DESTDIR=$RPM_BUILD_ROOT
-	[ -e COPYING-${dir%%-*} ] && install -m 444 COPYING-${dir%%-*} $OLDPWD
-	popd
-done
-for i in composite damage dri2 dri3 fixes present randr render ; do
-    mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
-done
-mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec .
-
-mv $RPM_BUILD_ROOT%{_docdir}/videoproto/xv-protocol-v2.txt .
-mv $RPM_BUILD_ROOT%{_docdir}/resourceproto/resproto.txt .
+rm -rf %{buildroot}
+%make_install
 
-# remove xml file and directory
-for i in bigreqs dri2 fonts input kb record scrnsaver xcmisc xext x ; do
-    rm -rf $RPM_BUILD_ROOT/usr/share/doc/${i}proto
+# trim some fat
+for i in apple windows trap ; do
+    rm -f %{buildroot}%{_includedir}/X11/extensions/*${i}*
+    rm -f %{buildroot}%{_datadir}/pkgconfig/*${i}*
 done
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/resourceproto
+
+# keep things building even if you have the html doc tools for xmlto installed
+rm -f %{buildroot}%{_docdir}/*/*.{html,svg}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING-*
-%doc compositeproto.txt
-%doc damageproto.txt
-%doc dri2proto.txt
-%doc dri3proto.txt
-%doc presentproto.txt
-%doc randrproto.txt
-%doc renderproto.txt
-%doc fixesproto.txt
-%doc resproto.txt
-%doc PM_spec
-
+%doc *.txt
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
@@ -149,9 +80,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
-%dir %{_includedir}/X11/PM
-%{_includedir}/X11/PM/PM.h
-%{_includedir}/X11/PM/PMproto.h
 %{_includedir}/X11/Sunkeysym.h
 %{_includedir}/X11/X.h
 %{_includedir}/X11/XF86keysym.h
@@ -174,12 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/Xwindows.h
 %{_includedir}/X11/Xwinsock.h
 %{_includedir}/X11/ap_keysym.h
-
 %dir %{_includedir}/X11/dri
 %{_includedir}/X11/dri/xf86dri.h
 %{_includedir}/X11/dri/xf86driproto.h
 %{_includedir}/X11/dri/xf86dristr.h
-
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/EVI.h
 %{_includedir}/X11/extensions/EVIproto.h
@@ -188,12 +114,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XI2proto.h
 %{_includedir}/X11/extensions/XIproto.h
 %{_includedir}/X11/extensions/XKB.h
-%{_includedir}/X11/extensions/XKBgeom.h
+#%{_includedir}/X11/extensions/XKBgeom.h
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h
 %{_includedir}/X11/extensions/XResproto.h
-%{_includedir}/X11/extensions/Xeviestr.h
 %{_includedir}/X11/extensions/Xv.h
 %{_includedir}/X11/extensions/XvMC.h
 %{_includedir}/X11/extensions/XvMCproto.h
@@ -217,10 +142,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/dri2proto.h
 %{_includedir}/X11/extensions/dri2tokens.h
 %{_includedir}/X11/extensions/dri3proto.h
-%{_includedir}/X11/extensions/evieproto.h
-%{_includedir}/X11/extensions/fontcache.h
-%{_includedir}/X11/extensions/fontcacheP.h
-%{_includedir}/X11/extensions/fontcachstr.h
 %{_includedir}/X11/extensions/ge.h
 %{_includedir}/X11/extensions/geproto.h
 %{_includedir}/X11/extensions/lbx.h
@@ -252,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/syncconst.h
 %{_includedir}/X11/extensions/syncproto.h
 %{_includedir}/X11/extensions/syncstr.h
-%{_includedir}/X11/extensions/vldXvMC.h
+#%{_includedir}/X11/extensions/vldXvMC.h
 %{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
@@ -265,10 +186,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86dgaconst.h
 %{_includedir}/X11/extensions/xf86dgaproto.h
 %{_includedir}/X11/extensions/xf86dgastr.h
-%{_includedir}/X11/extensions/xf86misc.h
-%{_includedir}/X11/extensions/xf86mscstr.h
-%{_includedir}/X11/extensions/xf86rush.h
-%{_includedir}/X11/extensions/xf86rushstr.h
 %{_includedir}/X11/extensions/xf86vm.h
 %{_includedir}/X11/extensions/xf86vmproto.h
 %{_includedir}/X11/extensions/xf86vmstr.h
@@ -278,14 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xtestext1const.h
 %{_includedir}/X11/extensions/xtestext1proto.h
 %{_includedir}/X11/extensions/xtestproto.h
-%{_includedir}/X11/extensions/xtrapbits.h
-%{_includedir}/X11/extensions/xtrapddmi.h
-%{_includedir}/X11/extensions/xtrapdi.h
-%{_includedir}/X11/extensions/xtrapemacros.h
-%{_includedir}/X11/extensions/xtraplib.h
-%{_includedir}/X11/extensions/xtraplibp.h
-%{_includedir}/X11/extensions/xtrapproto.h
-
 %dir %{_includedir}/X11/fonts
 %{_includedir}/X11/fonts/FS.h
 %{_includedir}/X11/fonts/FSproto.h
@@ -293,19 +202,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/fonts/fontproto.h
 %{_includedir}/X11/fonts/fontstruct.h
 %{_includedir}/X11/fonts/fsmasks.h
-
 %{_includedir}/X11/keysym.h
 %{_includedir}/X11/keysymdef.h
-
 %{_datadir}/pkgconfig/bigreqsproto.pc
 %{_datadir}/pkgconfig/compositeproto.pc
 %{_datadir}/pkgconfig/damageproto.pc
 %{_datadir}/pkgconfig/dmxproto.pc
 %{_datadir}/pkgconfig/dri2proto.pc
 %{_datadir}/pkgconfig/dri3proto.pc
-%{_datadir}/pkgconfig/evieproto.pc
 %{_datadir}/pkgconfig/fixesproto.pc
-%{_datadir}/pkgconfig/fontcacheproto.pc
 %{_datadir}/pkgconfig/fontsproto.pc
 %{_datadir}/pkgconfig/glproto.pc
 %{_datadir}/pkgconfig/inputproto.pc
@@ -316,21 +221,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/renderproto.pc
 %{_datadir}/pkgconfig/resourceproto.pc
 %{_datadir}/pkgconfig/scrnsaverproto.pc
-%{_datadir}/pkgconfig/trapproto.pc
 %{_datadir}/pkgconfig/videoproto.pc
 %{_datadir}/pkgconfig/xcmiscproto.pc
 %{_datadir}/pkgconfig/xextproto.pc
 %{_datadir}/pkgconfig/xf86bigfontproto.pc
 %{_datadir}/pkgconfig/xf86dgaproto.pc
 %{_datadir}/pkgconfig/xf86driproto.pc
-%{_datadir}/pkgconfig/xf86miscproto.pc
-%{_datadir}/pkgconfig/xf86rushproto.pc
 %{_datadir}/pkgconfig/xf86vidmodeproto.pc
 %{_datadir}/pkgconfig/xineramaproto.pc
 %{_datadir}/pkgconfig/xproto.pc
-%{_datadir}/pkgconfig/xproxymngproto.pc
+%{_docdir}/xorgproto/*
+
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2019.2-1
+- switched to unified repository.
+- new upstream release.
+
 * Thu Sep 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.7-10
 - bigreqsproto-1.1.2
 - recordproto-1.14.2

+ 50 - 43
x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -1,30 +1,28 @@
-%bcond_without elogind
+%bcond_with systemd
+
 %define pkgname xorg-server
 
 #define gitdate 20100319
 
-Summary:   X.Org X11 X server
-Summary(ja):   X.Org X11 X サーバ
-Name:      xorg-x11-server
-Version:   1.19.6
-Release:   2%{?_dist_release}
-URL:       http://www.x.org
-License:   MIT/X11
-Group:     User Interface/X
-
+Summary:        X.Org X11 X server
+Summary(ja):    X.Org X11 X サーバ
+Name:           xorg-x11-server
+Version:        1.20.8
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          User Interface/X
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+URL:            http://www.x.org
+License:        MIT/X11
 %if 0%{?gitdate}
-Source0:  ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{gitdate}.tar.xz
+Source0:        ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{gitdate}.tar.xz
 %else
-Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0:        https://www.x.org/archive/individual/xserver/%{pkgname}-%{version}.tar.bz2
 %endif
-
-Source4:   10-quirks.conf
-
-Source10:  xserver.pamd
-
-Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
-
-Patch5: xserver-1.8.1-pic-libxf86config.patch
+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.
@@ -34,16 +32,16 @@ Patch5002: xserver-1.12.1-ssh-isnt-local.patch
 # add elogind support
 Patch10000: 0001-add-elogind-support.patch
 # autodetect nvidia driver
-Patch10010: xorg-x11-server-1.12.1-nvidia.patch
+Patch10010: 0001-nvidia.patch
 # autodetect fglrx driver
-Patch10020: xorg-x11-server-1.12.1-fglrx.patch
+Patch10020: 0002-fglrx.patch
 # autodetect virtual video device (qemu) driver
-Patch10030: xorg-x11-server-1.12.1-qemu.patch
+Patch10030: 0003-qemu.patch
 # finally fallback to vesa driver
-Patch10040: xorg-x11-server-1.9.2-vesa-fallback.patch
+Patch10040: 0004-vesa-fallback.patch
 
 # do not disable kbd driver even if AllowEmptyInput option is on.
-Patch20000: xorg-server-1.12.1-dont-disable-kbd-if-AEI-on.patch
+Patch20000: 0005-dont-disable-kbd-if-AEI-on.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -105,12 +103,13 @@ BuildRequires: openssl-devel
 # XXX Really?  Why would we need this, Xfont should hide it.
 BuildRequires: freetype2-devel
 
-BuildRequires: eudev-libudev-devel
 BuildRequires: libgudev-devel
 BuildRequires: dbus-devel
 
-%if %{with elogind}
-BuildRequires: elogind-devel
+%if %{with systemd}
+BuildRequires: systemd-devel
+%else
+BuildRequires: eudev-libudev-devel
 %endif
 
 # DMX config utils buildreqs.
@@ -144,13 +143,10 @@ Requires: libXfont
 # they deliver.  The Xorg one is versioned, the others are intentionally
 # unversioned.
 
-
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 X.Org X11 X server
 
+
 %package common
 Summary: Xorg server common files
 Summary(ja): Xorg サーバ共通ファイル
@@ -159,6 +155,7 @@ Group: User Interface/X
 %description common
 Common files shared among all X servers.
 
+
 %if %{with_hw_servers}
 %package Xorg
 Summary: Xorg X server
@@ -278,6 +275,7 @@ outside of the standard X11 source code tree.  Developers writing video
 drivers, input drivers, or other X modules should install this package.
 %endif
 
+
 %package source
 Summary: Xserver source code required to build VNC server (Xvnc)
 Summary(ja): VNC サーバ (Xvnc) をビルドするために必要な X サーバのソースコード
@@ -286,18 +284,14 @@ Group: Development/Libraries
 %description source
 Xserver source code needed to build VNC server (Xvnc)
 
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 #%setup -q -n %{pkgname}-%{gitdate}
 
-%patch5 -p1 -b .pic-libxf86config
-
 %patch5002 -p1 -b .ssh-isnt-local
 
 # Vine patch
-%if %{with elogind}
-%patch10000 -p1 -b .elogind
-%endif
 %patch10010 -p1 -b .nvidia
 %patch10020 -p1 -b .fglrx
 %patch10030 -p1 -b .virtual-device
@@ -306,6 +300,14 @@ Xserver source code needed to build VNC server (Xvnc)
 # Vine 
 %patch20000 -p1 -b .dont-disable-kbd
 
+# Patch5: xserver-1.8.1-pic-libxf86config.patch
+sed -i \
+	-e "/AM_CFLAGS =/a \\\\t-fPIC -fvisibility=hidden \\\\" \
+	./hw/xfree86/parser/Makefile.am
+
+autoreconf -vif
+
+
 %build
 
 %define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
@@ -316,9 +318,7 @@ Xserver source code needed to build VNC server (Xvnc)
 %define dri_flags --disable-dri
 %endif
 
-# --with-pie ?
-autoreconf -v --install
-export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
+export CFLAGS="%{optflags} -Wstrict-overflow -rdynamic $CFLAGS"
 %configure \
 	%{xservers} \
 	--disable-static \
@@ -327,7 +327,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
 	--with-default-font-path=%{default_font_path} \
 	--with-module-dir=%{moduledir} \
 	--with-os-name="Vine Linux 7" \
-	--with-vendor-web="http://vinelinux.org/" \
+	--with-vendor-web="https://www.vinelinux.org/" \
 	--with-vendor-name="Project Vine" \
 	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
@@ -337,8 +337,9 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
 	--enable-config-udev \
 	--enable-dmx \
 	%{dri_flags} \
-%if %{with elogind}
-	--enable-elogind=yes \
+	--enable-systemd-logind \
+%if %{with systemd}
+	--with-systemd-daemon \
 %endif
 	${CONFIGURE}
 
@@ -540,6 +541,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat May 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.8-1
+- new upstream release.
+- added systemd support (disabled as default).
+- updated Source20.
+- updated Patch10010-20000.
+
 * Fri Jan 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.19.6-2
 - added elogind support.
 - changed permission of %{_bindir}/Xorg from 4711 to 755.