update to 1.17.2

sync changes with 1.15.2-7mamba [release 1.17.2-1mamba;Fri Aug 21 2015]
This commit is contained in:
Silvan Calarco 2024-01-05 19:48:57 +01:00
parent 730b5814b7
commit 18f8ed2ef4
2 changed files with 68 additions and 21 deletions

View File

@ -1,16 +1,16 @@
diff -Nru xorg-server-1.12.1.orig/hw/xfree86/common/xf86Config.c xorg-server-1.12.1/hw/xfree86/common/xf86Config.c diff -Nru xorg-server-1.16.0.orig/hw/xfree86/common/xf86Config.c xorg-server-1.16.0/hw/xfree86/common/xf86Config.c
--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86Config.c 2012-03-30 04:57:26.000000000 +0200 --- xorg-server-1.16.0.orig/hw/xfree86/common/xf86Config.c 2014-07-14 11:52:32.000000000 +0200
+++ xorg-server-1.12.1/hw/xfree86/common/xf86Config.c 2012-04-24 12:24:57.966283561 +0200 +++ xorg-server-1.16.0/hw/xfree86/common/xf86Config.c 2014-08-31 16:32:58.084764780 +0200
@@ -510,7 +510,7 @@ @@ -519,7 +519,7 @@
static void static void
fixup_video_driver_list(char **drivers) fixup_video_driver_list(const char **drivers)
{ {
- static const char *fallback[4] = { "fbdev", "vesa", "wsfb", NULL }; - static const char *fallback[5] = { "modesetting", "fbdev", "vesa", "wsfb", NULL };
+ static const char *fallback[6] = { "fglrx", "modesetting", "fbdev", "vesa", "wsfb", NULL }; + static const char *fallback[6] = { "fglrx", "modesetting", "fbdev", "vesa", "wsfb", NULL };
char **end, **drv; const char **end, **drv;
char *x; const char *x;
int i; int i;
@@ -528,9 +528,11 @@ @@ -533,9 +533,11 @@
* swap it with the last available non-fallback driver. * swap it with the last available non-fallback driver.
*/ */
for (i = 0; fallback[i]; i++) { for (i = 0; fallback[i]; i++) {

View File

@ -1,6 +1,6 @@
Name: xorg-server Name: xorg-server
Version: 1.15.2 Version: 1.17.2
Release: 7mamba Release: 1mamba
Summary: The core of the X.Org Foundation implementation of the X Window system Summary: The core of the X.Org Foundation implementation of the X Window system
Group: System/X11 Group: System/X11
Vendor: openmamba Vendor: openmamba
@ -10,7 +10,7 @@ URL: http://www.x.org
Source: ftp://x.org/pub/individual/xserver/xorg-server-%{version}.tar.bz2 Source: ftp://x.org/pub/individual/xserver/xorg-server-%{version}.tar.bz2
Source10: XFree86-skel-.xinitrc Source10: XFree86-skel-.xinitrc
Source11: xorg-server-xprofile Source11: xorg-server-xprofile
Patch0: xorg-server-1.15.2-Xorg_configure.patch Patch0: xorg-server-1.16-Xorg_configure.patch
Patch1: xorg-server-1.3.0.0-hsync_higher_default.patch Patch1: xorg-server-1.3.0.0-hsync_higher_default.patch
Patch2: %{name}-1.6.4-fix_DGA_removal.patch Patch2: %{name}-1.6.4-fix_DGA_removal.patch
Patch3: xorg-server-1.15.2-libunwind-arm.patch Patch3: xorg-server-1.15.2-libunwind-arm.patch
@ -33,22 +33,35 @@ BuildRequires: libXmu-devel
BuildRequires: libXpm-devel BuildRequires: libXpm-devel
BuildRequires: libXrender-devel BuildRequires: libXrender-devel
BuildRequires: libXt-devel BuildRequires: libXt-devel
BuildRequires: libbsd-devel
BuildRequires: libbzip2-devel BuildRequires: libbzip2-devel
BuildRequires: libcap-devel
BuildRequires: libdbus-devel
BuildRequires: libdmx-devel BuildRequires: libdmx-devel
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
BuildRequires: libdw-devel
BuildRequires: libepoxy-devel
BuildRequires: libffi-devel
BuildRequires: libfontenc-devel BuildRequires: libfontenc-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libgcrypt-devel
BuildRequires: libglib-devel BuildRequires: libglib-devel
BuildRequires: libgpg-error-devel
BuildRequires: libgraphite2-devel BuildRequires: libgraphite2-devel
BuildRequires: libharfbuzz-devel BuildRequires: libharfbuzz-devel
BuildRequires: liblzma-devel BuildRequires: liblzma-devel
BuildRequires: libnettle-devel BuildRequires: libnettle-devel
BuildRequires: libpciaccess-devel BuildRequires: libpciaccess-devel
BuildRequires: libpcre-devel
BuildRequires: libpixman-devel BuildRequires: libpixman-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: libsystemd-devel
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libunwind-devel BuildRequires: libunwind-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libwayland-devel
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
BuildRequires: libxshmfence-devel BuildRequires: libxshmfence-devel
BuildRequires: libz-devel BuildRequires: libz-devel
@ -115,6 +128,16 @@ Provides: xorglibglx
%description -n xorg-ext-libglx %description -n xorg-ext-libglx
X.Org glx extension. X.Org glx extension.
%package -n xf86-video-modesetting
Summary: X.org generic modesetting driver
Group: System/X11
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: xorg-drv-video-modesetting
Provides: xorgdrvvideo
%description -n xf86-video-modesetting
X.org generic modesetting driver.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
@ -125,9 +148,9 @@ X.Org glx extension.
%endif %endif
%build %build
%ifarch arm #%ifarch arm
autoreconf -i || true # autoreconf -i || true
%endif #%endif
%configure \ %configure \
--enable-glx \ --enable-glx \
--enable-dri \ --enable-dri \
@ -138,8 +161,7 @@ autoreconf -i || true
--with-os-name="Linux" \ --with-os-name="Linux" \
--with-os-vendor="openmamba" \ --with-os-vendor="openmamba" \
--enable-aiglx \ --enable-aiglx \
--with-fop=no \ --with-fop=no
--without-dtrace
# --with-mesa-source=`pwd`/Mesa-%{mesa_ver} \ # --with-mesa-source=`pwd`/Mesa-%{mesa_ver} \
# --enable-xgl \ # --enable-xgl \
@ -237,20 +259,25 @@ exit 0
%dir %{_sysconfdir}/X11 %dir %{_sysconfdir}/X11
%dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/X11/xorg.conf.d
%{_sysconfdir}/X11/xkb/compiled/README.compiled %{_sysconfdir}/X11/xkb/compiled/README.compiled
#%{_sysconfdir}/X11/Xsession.d/92xprint-xpserverlist
%dir %{_sysconfdir}/xprofile.d %dir %{_sysconfdir}/xprofile.d
%{_sysconfdir}/xprofile %{_sysconfdir}/xprofile
%{_bindir}/X %{_bindir}/X
%{_bindir}/Xnest %{_bindir}/Xnest
%{_bindir}/Xorg %{_bindir}/Xorg
#%{_bindir}/Xprt
%{_bindir}/Xvfb %{_bindir}/Xvfb
%{_bindir}/Xwayland
%{_bindir}/cvt %{_bindir}/cvt
%{_bindir}/gtf %{_bindir}/gtf
%dir %{_libdir}/xorg %dir %{_libdir}/xorg
%dir %{_libdir}/xorg/modules %dir %{_libdir}/xorg/modules
%{_libdir}/xorg/modules/lib*.la %{_libdir}/xorg/modules/lib*.la
%{_libdir}/xorg/modules/lib*.so %{_libdir}/xorg/modules/lib*.so
%{_libdir}/xorg/modules/multimedia/* #%{_libdir}/xorg/modules/linux/*
#%{_libdir}/xorg/modules/multimedia/*
%{_libdir}/xorg/protocol.txt %{_libdir}/xorg/protocol.txt
#%{_libdir}/xserver/SecurityPolicy
%dir %{_datadir}/X11 %dir %{_datadir}/X11
%dir %{_datadir}/X11/xorg.conf.d %dir %{_datadir}/X11/xorg.conf.d
%{_datadir}/X11/xorg.conf.d/10-evdev.conf %{_datadir}/X11/xorg.conf.d/10-evdev.conf
@ -288,21 +315,41 @@ exit 0
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
#%{_includedir}/X11/bitmaps/*
#%{_includedir}/X11/pixmaps/*
%dir %{_includedir}/xorg %dir %{_includedir}/xorg
%{_includedir}/xorg/*.h %{_includedir}/xorg/*.h
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/xorg-server.m4 %{_datadir}/aclocal/xorg-server.m4
#%dir %{_docdir}/xorg-server %dir %{_docdir}/xorg-server
#%{_docdir}/xorg-server/Xserver-DTrace* %{_docdir}/xorg-server/Xserver-DTrace*
%files -n xf86-video-modesetting
%defattr(-,root,root)
%{_libdir}/xorg/modules/drivers/modesetting_drv.la
%{_libdir}/xorg/modules/drivers/modesetting_drv.so
%{_mandir}/man4/modesetting.4*
%files -n xorg-ext-libglx %files -n xorg-ext-libglx
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/xorg/modules/extensions %dir %{_libdir}/xorg/modules/extensions
%{_libdir}/xorg/modules/extensions/libglx.la %{_libdir}/xorg/modules/extensions/libglx.la
%dir %{_libdir}/xorg/glx-dri
%{_libdir}/xorg/glx-dri/libglx.so %{_libdir}/xorg/glx-dri/libglx.so
%changelog %changelog
* Fri Aug 21 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.17.2-1mamba
- update to 1.17.2
- sync changes with 1.15.2-7mamba
* Mon Mar 09 2015 Automatic Build System <autodist@mambasoft.it> 1.17.1-1mamba
- automatic version update by autodist
* Sun Sep 21 2014 Automatic Build System <autodist@mambasoft.it> 1.16.1-1mamba
- automatic version update by autodist
* Sun Aug 31 2014 Automatic Build System <autodist@mambasoft.it> 1.16.0-1mamba
- automatic version update by autodist
* Sat May 23 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-7mamba * Sat May 23 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-7mamba
- install libglx.so out of xorg/modules tree for server to pick right alternative - install libglx.so out of xorg/modules tree for server to pick right alternative