/[packages]/updates/8/x11-server/current/SPECS/x11-server.spec
ViewVC logotype

Diff of /updates/8/x11-server/current/SPECS/x11-server.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1228115 by tv, Thu May 10 17:14:48 2018 UTC revision 1228400 by tv, Fri May 11 22:02:16 2018 UTC
# Line 11  Line 11 
11  # Alternatives priority for standard libglx.so and mesa libs  # Alternatives priority for standard libglx.so and mesa libs
12  %define priority 500  %define priority 500
13    
14  %define rel 1  %define rel 2
15    
16  %global __provides_exclude_from %{_datadir}/%{name}-source  %global __provides_exclude_from %{_datadir}/%{name}-source
17  %global __requires_exclude_from %{_datadir}/%{name}-source  %global __requires_exclude_from %{_datadir}/%{name}-source
# Line 31  Line 31 
31    
32  Name: x11-server  Name: x11-server
33  Version: 1.20.0  Version: 1.20.0
34  Release:   %mkrel %rel%{?gitdate:.%{gitdate}}.1  Release:   %mkrel %rel%{?gitdate:.%{gitdate}}
35  Summary:  X11 servers  Summary:  X11 servers
36  Group: System/X11  Group: System/X11
37  URL: http://xorg.freedesktop.org  URL: http://xorg.freedesktop.org
# Line 71  License: GPLv2+ and MIT Line 71  License: GPLv2+ and MIT
71  # Fedora Patches  # Fedora Patches
72    
73  # XXX needs rebase, but also va_gl should probably just be the default  # XXX needs rebase, but also va_gl should probably just be the default
74  #Patch21: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch  # Patch3: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch
75    
76  Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch  Patch4: 0001-Always-install-vbe-and-int10-sdk-headers.patch
77    
78  # Submitted upstream, but not going anywhere  # Submitted upstream, but not going anywhere
79  Patch7027: 0001-autobind-GPUs-to-the-screen.patch  Patch5: 0001-autobind-GPUs-to-the-screen.patch
80    
81  # because the display-managers are not ready yet, do not upstream  # because the display-managers are not ready yet, do not upstream
82  Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch  Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
83    
84  # Mageia patches  # Mageia patches
85  # git format-patch --start-number 900 mdv-1.6.4-redhat..mdv-1.6.4-patches  # git format-patch --start-number 900 mdv-1.6.4-redhat..mdv-1.6.4-patches
# Line 112  Source5010: u_os-connections-Check-for-s Line 112  Source5010: u_os-connections-Check-for-s
112    
113  # Security fixes  # Security fixes
114    
 %global moduledir       %{_libdir}/xorg/modules  
 %global sdkdir          %{_includedir}/xorg  
   
 %global enable_xorg --enable-xorg  
   
 %ifnarch %{ix86} x86_64  
 %global no_int10 --disable-vbe --disable-int10-module  
 %endif  
   
 %global kdrive --enable-kdrive --enable-xephyr  
 %global xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}  
   
115  Requires: %{name}-xorg  Requires: %{name}-xorg
116  Requires: %{name}-xdmx  Requires: %{name}-xdmx
117  Requires: %{name}-xnest  Requires: %{name}-xnest
# Line 181  BuildRequires: pkgconfig(dmx) Line 169  BuildRequires: pkgconfig(dmx)
169  BuildRequires: pkgconfig(xtst) >= 1.1  BuildRequires: pkgconfig(xtst) >= 1.1
170    
171  BuildRequires: pkgconfig(wayland-client) >= 1.3.0  BuildRequires: pkgconfig(wayland-client) >= 1.3.0
172    BuildRequires: pkgconfig(wayland-eglstream-protocols)
173  BuildRequires: pkgconfig(wayland-protocols)  BuildRequires: pkgconfig(wayland-protocols)
174  BuildRequires: pkgconfig(epoxy)  BuildRequires: pkgconfig(epoxy)
175  BuildRequires: pkgconfig(xshmfence) >= 1.1  BuildRequires: pkgconfig(xshmfence) >= 1.1
# Line 397  test `getminor extension` == %{extension Line 386  test `getminor extension` == %{extension
386    
387  %build  %build
388    
389    %ifnarch %{ix86} x86_64
390    %global no_int10 --disable-vbe --disable-int10-module
391    %endif
392    %global kdrive --enable-kdrive --enable-xephyr
393    %global xservers --enable-xvfb --enable-xnest %{kdrive} --enable-xorg
394  %global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"  %global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
   
395  %global dri_flags --enable-dri2 --enable-dri3 --enable-suid-wrapper --enable-glamor  %global dri_flags --enable-dri2 --enable-dri3 --enable-suid-wrapper --enable-glamor
   
396  %global bodhi_flags --with-vendor-name="%_vendor"  %global bodhi_flags --with-vendor-name="%_vendor"
397    
 %global wayland --enable-xwayland  
   
398  %if %with debug  %if %with debug
399  CFLAGS='-DBUILDDEBUG -O0 -g3' \  CFLAGS='-DBUILDDEBUG -O0 -g3' \
400  %endif  %endif
# Line 412  autoreconf -f -v --install || exit 1 Line 402  autoreconf -f -v --install || exit 1
402  %configure2_5x %{xservers} \  %configure2_5x %{xservers} \
403                  --with-log-dir=%{_logdir} \                  --with-log-dir=%{_logdir} \
404                  --enable-dependency-tracking \                  --enable-dependency-tracking \
405                    --enable-xwayland-eglstream \
406                  %{?no_int10} --with-int10=x86emu \                  %{?no_int10} --with-int10=x86emu \
407                  --with-default-font-path=%{default_font_path} \                  --with-default-font-path=%{default_font_path} \
408                  --with-module-dir=%{moduledir} \                  --with-module-dir=%{_libdir}/xorg/modules \
409                  --with-vendor-web="https://bugs.mageia.org" \                  --with-vendor-web="https://bugs.mageia.org" \
410                  %if %{with debug}                  %if %{with debug}
411                  --enable-debug \                  --enable-debug \
# Line 432  autoreconf -f -v --install || exit 1 Line 423  autoreconf -f -v --install || exit 1
423                  --enable-secure-rpc \                  --enable-secure-rpc \
424                  --enable-pam \                  --enable-pam \
425                  --enable-dmx \                  --enable-dmx \
426                  %{?wayland} \                  --enable-xwayland \
427                  %{dri_flags} %{?bodhi_flags} \                  %{dri_flags} %{?bodhi_flags} \
428                  --with-sha1=libcrypto \                  --with-sha1=libcrypto \
429    
# Line 440  pushd include && make xorg-server.h dix- Line 431  pushd include && make xorg-server.h dix-
431  %make  %make
432    
433  %install  %install
434  %make_install moduledir=%{moduledir}  %make_install
435    
436  mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}  mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
437    
# Line 481  install -m 0644 %{SOURCE6} %{buildroot}/ Line 472  install -m 0644 %{SOURCE6} %{buildroot}/
472    
473  install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires  install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
474    
475    install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run
476    
477  # Make the source package  # Make the source package
478  %global xserver_source_dir %{_datadir}/x11-server-source  %global xserver_source_dir %{_datadir}/x11-server-source
479  %global inst_srcdir %{buildroot}/%{xserver_source_dir}  %global inst_srcdir %{buildroot}/%{xserver_source_dir}
# Line 495  cp {,%{inst_srcdir}/}hw/xfree86/Xorg.sh. Line 488  cp {,%{inst_srcdir}/}hw/xfree86/Xorg.sh.
488  cp xkb/README.compiled %{inst_srcdir}/xkb  cp xkb/README.compiled %{inst_srcdir}/xkb
489  cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86  cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
490    
 install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run  
491  install -m 0755 %{SOURCE21} $RPM_BUILD_ROOT%{_mandir}/man1/xvfb-run.1  install -m 0755 %{SOURCE21} $RPM_BUILD_ROOT%{_mandir}/man1/xvfb-run.1
492  install -m 0644 %{SOURCE90} $RPM_BUILD_ROOT/usr/share/X11/xorg.conf.d/  install -m 0644 %{SOURCE90} $RPM_BUILD_ROOT/usr/share/X11/xorg.conf.d/
493    
494  find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |  find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
495  xargs tar cf - | (cd %{inst_srcdir} && tar xf -)  xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
 # SLEDGEHAMMER  
496  find %{inst_srcdir}/hw/xfree86 -name \*.c -delete  find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
497    
498  # Remove unwanted files/dirs  # Remove unwanted files/dirs
499  {  {
     rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options  
     rm -f $RPM_BUILD_ROOT%{_bindir}/in?  
     rm -f $RPM_BUILD_ROOT%{_bindir}/ioport  
     rm -f $RPM_BUILD_ROOT%{_bindir}/out?  
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak  
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*  
500      find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :      find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
501  # wtf  # wtf
502  %ifnarch %{ix86} x86_64  %ifnarch %{ix86} x86_64
# Line 615  fi Line 600  fi
600  %{_bindir}/xserver-sdk-abi-requires  %{_bindir}/xserver-sdk-abi-requires
601  %{_libdir}/pkgconfig/xorg-server.pc  %{_libdir}/pkgconfig/xorg-server.pc
602  %dir %{_includedir}/xorg  %dir %{_includedir}/xorg
603  %{sdkdir}/*.h  %{_includedir}/xorg/*.h
604  %{_datadir}/aclocal/xorg-server.m4  %{_datadir}/aclocal/xorg-server.m4
605    
606  %files source  %files source
Legend:
Removed from v.1228115  
changed lines
  Added in v.1228400
  ViewVC Help
Powered by ViewVC 1.1.30