wok-next rev 19653
Up: asciidoc, doxygen, tslib, xorg-server, xorg-xkeyboard-config; fix: eudev; add: libepoxy.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Mar 02 05:17:16 2017 +0200 (2017-03-02) |
| parents | eb23a9b0f828 |
| children | 68c89b4dcbd6 |
| files | asciidoc/receipt doxygen/receipt eudev/receipt libepoxy-dev/receipt libepoxy/receipt slitaz-base-files/receipt tslib-dev/receipt tslib/receipt xorg-server-Xephyr/receipt xorg-server-Xfbdev/receipt xorg-server-Xnest/receipt xorg-server-Xvfb/receipt xorg-server-dev/receipt xorg-server-modules-gl/receipt xorg-server/receipt xorg-server/stuff/xorg-server-1.18.4-add_prime_support-1.patch xorg-xkeyboard-config-dev/receipt xorg-xkeyboard-config/receipt |
line diff
1.1 --- a/asciidoc/receipt Wed Mar 01 23:29:10 2017 +0200 1.2 +++ b/asciidoc/receipt Thu Mar 02 05:17:16 2017 +0200 1.3 @@ -7,25 +7,27 @@ 1.4 MAINTAINER="pankso@slitaz.org" 1.5 LICENSE="GPL2" 1.6 WEB_SITE="http://www.methods.co.nz/asciidoc/" 1.7 + 1.8 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.9 -WGET_URL="$SF_MIRROR/project/asciidoc/asciidoc/$VERSION/$TARBALL" 1.10 +WGET_URL="$SF_MIRROR/asciidoc/$TARBALL" 1.11 1.12 DEPENDS="python" 1.13 -BUILD_DEPENDS="" 1.14 +BUILD_DEPENDS="python" 1.15 1.16 # Rules to configure and make the package. 1.17 compile_rules() 1.18 { 1.19 ./configure \ 1.20 --sysconfdir=/etc \ 1.21 + --docdir=/usr/share/doc/asciidoc-$VERSION \ 1.22 $CONFIGURE_ARGS && 1.23 - make install 1.24 + make && 1.25 + make install && 1.26 + make DESTDIR=$install docs 1.27 } 1.28 1.29 # Rules to gen a SliTaz package suitable for Tazpkg. 1.30 genpkg_rules() 1.31 { 1.32 - mkdir -p $fs/usr 1.33 - cp -a $install/etc $fs 1.34 - cp -a $install/usr/bin $fs/usr 1.35 + cook_copy_folders etc bin 1.36 }
2.1 --- a/doxygen/receipt Wed Mar 01 23:29:10 2017 +0200 2.2 +++ b/doxygen/receipt Thu Mar 02 05:17:16 2017 +0200 2.3 @@ -1,31 +1,41 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="doxygen" 2.7 -VERSION="1.7.4" 2.8 +VERSION="1.8.11" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Source code documentation generator tool." 2.11 MAINTAINER="pascal.bellard@slitaz.org" 2.12 LICENSE="GPL2" 2.13 -TARBALL="$PACKAGE-$VERSION.src.tar.gz" 2.14 WEB_SITE="http://www.stack.nl/~dimitri/doxygen/" 2.15 -WGET_URL="ftp://ftp.stack.nl/pub/users/dimitri/$TARBALL" 2.16 TAGS="language documentation" 2.17 2.18 -BUILD_DEPENDS="perl graphviz flex" 2.19 +TARBALL="$PACKAGE-$VERSION.src.tar.gz" 2.20 +WGET_URL="http://ftp.stack.nl/pub/doxygen/$TARBALL" 2.21 + 2.22 +BUILD_DEPENDS="cmake python" # graphviz 2.23 2.24 # Rules to configure and make the package. 2.25 compile_rules() 2.26 { 2.27 - sed -i 's|man/man1|share/&|' Makefile* 2.28 - ./configure --shared --prefix /usr --docdir /usr/share/doc \ 2.29 - --install /usr/bin/install && 2.30 + mkdir build && 2.31 + cd build && 2.32 + 2.33 + cmake -G "Unix Makefiles" \ 2.34 + -DCMAKE_BUILD_TYPE=Release \ 2.35 + -DCMAKE_INSTALL_PREFIX=/usr \ 2.36 + .. && 2.37 make && 2.38 - make DESTDIR=$DESTDIR install 2.39 + make install && 2.40 + 2.41 + mkdir -p $install/usr/share/man/man1 && 2.42 + for i in ../doc/*.1; do 2.43 + sed "s|@VERSION@|$VERSION|g; s|@DATE@|$(date +%Y)|g" $i > \ 2.44 + $install/usr/share/man/man1 2.45 + done 2.46 } 2.47 2.48 # Rules to gen a SliTaz package suitable for Tazpkg. 2.49 genpkg_rules() 2.50 { 2.51 - mkdir -p $fs/usr 2.52 - cp -a $install/usr/bin $fs/usr 2.53 + cook_copy_folders bin 2.54 }
3.1 --- a/eudev/receipt Wed Mar 01 23:29:10 2017 +0200 3.2 +++ b/eudev/receipt Thu Mar 02 05:17:16 2017 +0200 3.3 @@ -44,12 +44,13 @@ 3.4 # Rules to gen a SliTaz package suitable for Tazpkg. 3.5 genpkg_rules() 3.6 { 3.7 - mkdir -p $fs/lib/firmware 3.8 + mkdir -p $fs/lib/firmware $fs/usr/lib 3.9 3.10 cp -a $install/sbin $fs 3.11 cp -a $install/etc $fs 3.12 cp -a $install/lib/libudev.so* $fs/lib 3.13 cp -a $install/lib/udev $fs/lib 3.14 + cp -a $install/usr/lib/libudev.so $fs/usr/lib 3.15 3.16 # Copy rules files to udev conf dir 3.17 mv -f $fs/lib/udev/rules.d $fs/etc/udev
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/libepoxy-dev/receipt Thu Mar 02 05:17:16 2017 +0200 4.3 @@ -0,0 +1,18 @@ 4.4 +# SliTaz package receipt. 4.5 + 4.6 +PACKAGE="libepoxy-dev" 4.7 +VERSION="1.3.1" 4.8 +CATEGORY="x-window" 4.9 +SHORT_DESC="Library for handling OpenGL function pointer management (development files)" 4.10 +MAINTAINER="al.bobylev@gmail.com" 4.11 +LICENSE="MIT" 4.12 +WEB_SITE="https://github.com/anholt/libepoxy/" 4.13 + 4.14 +WANTED="libepoxy" 4.15 +DEPENDS="libepoxy" 4.16 + 4.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 4.18 +genpkg_rules() 4.19 +{ 4.20 + cook_copy_files *.h *.la *.pc 4.21 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/libepoxy/receipt Thu Mar 02 05:17:16 2017 +0200 5.3 @@ -0,0 +1,26 @@ 5.4 +# SliTaz package receipt. 5.5 + 5.6 +PACKAGE="libepoxy" 5.7 +VERSION="1.3.1" 5.8 +CATEGORY="x-window" 5.9 +SHORT_DESC="Library for handling OpenGL function pointer management" 5.10 +MAINTAINER="al.bobylev@gmail.com" 5.11 +LICENSE="MIT" 5.12 +WEB_SITE="https://github.com/anholt/libepoxy/" 5.13 + 5.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.15 +WGET_URL="${WEB_SITE}releases/download/v$VERSION/$TARBALL" 5.16 + 5.17 +BUILD_DEPENDS="xorg-util-macros python mesa-dev" 5.18 + 5.19 +# Rules to configure and make the package. 5.20 +compile_rules() 5.21 +{ 5.22 + ./configure $CONFIGURE_ARGS && make && make install 5.23 +} 5.24 + 5.25 +# Rules to gen a SliTaz package suitable for Tazpkg. 5.26 +genpkg_rules() 5.27 +{ 5.28 + cook_copy_files *.so* 5.29 +}
6.1 --- a/slitaz-base-files/receipt Wed Mar 01 23:29:10 2017 +0200 6.2 +++ b/slitaz-base-files/receipt Thu Mar 02 05:17:16 2017 +0200 6.3 @@ -13,6 +13,7 @@ 6.4 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2" 6.5 6.6 DEPENDS="gettext-base" 6.7 +BUILD_DEPENDS="gettext" 6.8 6.9 CONFIG_FILES=" 6.10 /etc/adduser.conf
7.1 --- a/tslib-dev/receipt Wed Mar 01 23:29:10 2017 +0200 7.2 +++ b/tslib-dev/receipt Thu Mar 02 05:17:16 2017 +0200 7.3 @@ -6,18 +6,14 @@ 7.4 SHORT_DESC="Abstraction layer for touchscreen panel events, development files." 7.5 MAINTAINER="pascal.bellard@slitaz.org" 7.6 LICENSE="LGPL2" 7.7 -WEB_SITE="http://tslib.berlios.de/" 7.8 -WANTED="tslib" 7.9 +WEB_SITE="https://sourceforge.net/projects/tslib.berlios/" 7.10 HOST_ARCH="i486 arm" 7.11 7.12 -DEPENDS="pkg-config" 7.13 +WANTED="tslib" 7.14 +DEPENDS="tslib" 7.15 7.16 # Rules to gen a SliTaz package suitable for Tazpkg. 7.17 genpkg_rules() 7.18 { 7.19 - mkdir -p $fs/usr/lib/ts 7.20 - cp -a $install/usr/lib/ts/*a $fs/usr/lib/ts 7.21 - cp -a $install/usr/lib/*a $fs/usr/lib 7.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 7.23 - cp -a $install/usr/include $fs/usr 7.24 + cook_copy_files *.h *.la *.pc 7.25 }
8.1 --- a/tslib/receipt Wed Mar 01 23:29:10 2017 +0200 8.2 +++ b/tslib/receipt Thu Mar 02 05:17:16 2017 +0200 8.3 @@ -2,14 +2,16 @@ 8.4 8.5 PACKAGE="tslib" 8.6 VERSION="1.0" 8.7 -CATEGORY="development" 8.8 +CATEGORY="x-window" 8.9 SHORT_DESC="Abstraction layer for touchscreen panel events." 8.10 MAINTAINER="pascal.bellard@slitaz.org" 8.11 LICENSE="LGPL2" 8.12 -WEB_SITE="http://tslib.berlios.de/" 8.13 +WEB_SITE="https://sourceforge.net/projects/tslib.berlios/" 8.14 +HOST_ARCH="i486 arm" 8.15 +CONFIG_FILES="/etc/ts.conf" 8.16 + 8.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 8.18 -WGET_URL="http://download.berlios.de/$PACKAGE/$TARBALL" 8.19 -HOST_ARCH="i486 arm" 8.20 +WGET_URL="$SF_MIRROR/tslib.berlios/$TARBALL" 8.21 8.22 BUILD_DEPENDS="libtool automake autoconf" 8.23 8.24 @@ -31,9 +33,6 @@ 8.25 # Rules to gen a SliTaz package suitable for Tazpkg. 8.26 genpkg_rules() 8.27 { 8.28 - mkdir -p $fs/usr/lib/ts 8.29 - cp -a $install/usr/lib/ts/*.so* $fs/usr/lib/ts 8.30 - cp -a $install/usr/lib/*.so* $fs/usr/lib 8.31 - cp -a $install/usr/bin $fs/usr 8.32 - cp -a $install/etc $fs 8.33 + cook_copy_folders etc bin 8.34 + cook_copy_files *.so* 8.35 }
9.1 --- a/xorg-server-Xephyr/receipt Wed Mar 01 23:29:10 2017 +0200 9.2 +++ b/xorg-server-Xephyr/receipt Thu Mar 02 05:17:16 2017 +0200 9.3 @@ -1,24 +1,25 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="xorg-server-Xephyr" 9.7 -VERSION="1.12.4" 9.8 +VERSION="1.18.4" 9.9 CATEGORY="x-window" 9.10 SHORT_DESC="The Xephyr Xorg server." 9.11 MAINTAINER="pankso@slitaz.org" 9.12 LICENSE="MIT" 9.13 +WEB_SITE="https://www.x.org/wiki/" 9.14 + 9.15 WANTED="xorg-server" 9.16 -SOURCE="xorg-server" 9.17 -WEB_SITE="http://www.x.org/" 9.18 - 9.19 -DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \ 9.20 -xorg-libXv libxcb libdrm mesa" 9.21 +DEPENDS="bzlib expat freetype libdrm libepoxy libgcrypt libgpg-error libpng \ 9.22 +libxcb mesa pixman tslib xcb-util xcb-util-image xcb-util-keysyms \ 9.23 +xcb-util-renderutil xcb-util-wm xorg-libfontenc xorg-libX11 xorg-libXau \ 9.24 +xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXfont \ 9.25 +xorg-libxshmfence xorg-libXxf86vm zlib" 9.26 9.27 # Rules to gen a SliTaz package suitable for Tazpkg. 9.28 genpkg_rules() 9.29 { 9.30 - mkdir -p $fs/usr/bin 9.31 - cp -a $install/usr/bin/Xephyr $fs/usr/bin 9.32 - chmod 4711 $fs/usr/bin/Xephyr 9.33 + cook_copy_files Xephyr 9.34 + # chmod 4711 $fs/usr/bin/Xephyr 9.35 } 9.36 9.37 # We need /var/tmp rw to let xkbcomp builr XKB definition.
10.1 --- a/xorg-server-Xfbdev/receipt Wed Mar 01 23:29:10 2017 +0200 10.2 +++ b/xorg-server-Xfbdev/receipt Thu Mar 02 05:17:16 2017 +0200 10.3 @@ -1,28 +1,28 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="xorg-server-Xfbdev" 10.7 -VERSION="1.12.4" 10.8 +VERSION="1.18.4" 10.9 CATEGORY="x-window" 10.10 SHORT_DESC="Xfbdev framebuffer Xorg server." 10.11 MAINTAINER="pankso@slitaz.org" 10.12 LICENSE="MIT" 10.13 -WANTED="xorg-server" 10.14 -SOURCE="xorg-server" 10.15 -WEB_SITE="http://www.x.org/" 10.16 +WEB_SITE="https://www.x.org/wiki/" 10.17 HOST_ARCH="i486" 10.18 10.19 -DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \ 10.20 -xorg-libxkbfile xorg-xkeyboard-config" 10.21 +WANTED="xorg-server" 10.22 +DEPENDS="bzlib expat freetype libdrm libgcrypt libgpg-error libpng libxcb mesa \ 10.23 +pixman tslib xorg-libfontenc xorg-libX11 xorg-libXau xorg-libXdamage \ 10.24 +xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXfont xorg-libxshmfence \ 10.25 +xorg-libXxf86vm zlib" 10.26 10.27 # Rules to gen a SliTaz package suitable for Tazpkg. 10.28 genpkg_rules() 10.29 { 10.30 - mkdir -p $fs/usr/bin 10.31 - cp -a $install/usr/bin/Xfbdev $fs/usr/bin 10.32 - chmod 4711 $fs/usr/bin/Xfbdev 10.33 + cook_copy_files Xfbdev 10.34 + # chmod 4711 $fs/usr/bin/Xfbdev 10.35 } 10.36 10.37 -# We need /var/tmp rw to let xkbcomp builr XKB definition. 10.38 +# We need /var/tmp rw to let xkbcomp build XKB definition. 10.39 post_install() 10.40 { 10.41 chmod 1777 "$1/var/tmp"
11.1 --- a/xorg-server-Xnest/receipt Wed Mar 01 23:29:10 2017 +0200 11.2 +++ b/xorg-server-Xnest/receipt Thu Mar 02 05:17:16 2017 +0200 11.3 @@ -1,24 +1,24 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="xorg-server-Xnest" 11.7 -VERSION="1.12.4" 11.8 +VERSION="1.18.4" 11.9 CATEGORY="x-window" 11.10 SHORT_DESC="Xorg Xnest server." 11.11 MAINTAINER="pankso@slitaz.org" 11.12 LICENSE="MIT" 11.13 +WEB_SITE="https://www.x.org/wiki/" 11.14 + 11.15 WANTED="xorg-server" 11.16 -SOURCE="xorg-server" 11.17 -WEB_SITE="http://www.x.org/" 11.18 - 11.19 -DEPENDS="xorg-libXfont xorg-base-fonts xorg-libXext zlib pixman libgcrypt \ 11.20 -xorg-xkeyboard-config" 11.21 +DEPENDS="bzlib expat freetype libdrm libgcrypt libgpg-error libpng libxcb mesa \ 11.22 +pixman xorg-libfontenc xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp \ 11.23 +xorg-libXext xorg-libXfixes xorg-libXfont xorg-libxshmfence xorg-libXxf86vm \ 11.24 +zlib" 11.25 11.26 # Rules to gen a SliTaz package suitable for Tazpkg. 11.27 genpkg_rules() 11.28 { 11.29 - mkdir -p $fs/usr/bin 11.30 - cp -a $install/usr/bin/Xnest $fs/usr/bin 11.31 - chmod 4711 $fs/usr/bin/Xnest 11.32 + cook_copy_files Xnest 11.33 + # chmod 4711 $fs/usr/bin/Xnest 11.34 } 11.35 11.36 # We need /var/tmp rw to let xkbcomp builr XKB definition.
12.1 --- a/xorg-server-Xvfb/receipt Wed Mar 01 23:29:10 2017 +0200 12.2 +++ b/xorg-server-Xvfb/receipt Thu Mar 02 05:17:16 2017 +0200 12.3 @@ -1,23 +1,24 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="xorg-server-Xvfb" 12.7 -VERSION="1.12.4" 12.8 +VERSION="1.18.4" 12.9 CATEGORY="x-window" 12.10 SHORT_DESC="Xvfb Xorg server." 12.11 MAINTAINER="pankso@slitaz.org" 12.12 LICENSE="MIT" 12.13 +WEB_SITE="https://www.x.org/wiki/" 12.14 + 12.15 WANTED="xorg-server" 12.16 -SOURCE="xorg-server" 12.17 -WEB_SITE="http://www.x.org/" 12.18 - 12.19 -DEPENDS="xorg-libXfont zlib pixman libgcrypt xorg-libXv" 12.20 +DEPENDS="bzlib expat freetype libdrm libgcrypt libgpg-error libpng libxcb mesa \ 12.21 +pixman xorg-libfontenc xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp \ 12.22 +xorg-libXext xorg-libXfixes xorg-libXfont xorg-libxshmfence xorg-libXxf86vm \ 12.23 +zlib" 12.24 12.25 # Rules to gen a SliTaz package suitable for Tazpkg. 12.26 genpkg_rules() 12.27 { 12.28 - mkdir -p $fs/usr/bin 12.29 - cp -a $install/usr/bin/Xvfb $fs/usr/bin 12.30 - chmod 4711 $fs/usr/bin/Xvfb 12.31 + cook_copy_files Xvfb 12.32 + # chmod 4711 $fs/usr/bin/Xvfb 12.33 } 12.34 12.35 # We need /var/tmp rw to let xkbcomp builr XKB definition.
13.1 --- a/xorg-server-dev/receipt Wed Mar 01 23:29:10 2017 +0200 13.2 +++ b/xorg-server-dev/receipt Thu Mar 02 05:17:16 2017 +0200 13.3 @@ -1,14 +1,15 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="xorg-server-dev" 13.7 -VERSION="1.12.4" 13.8 +VERSION="1.18.4" 13.9 CATEGORY="development" 13.10 SHORT_DESC="Xorg server devel files needed to build drivers." 13.11 MAINTAINER="pankso@slitaz.org" 13.12 LICENSE="MIT" 13.13 -WEB_SITE="http://www.x.org/" 13.14 +WEB_SITE="https://www.x.org/wiki" 13.15 HOST_ARCH="i486 arm" 13.16 13.17 +WANTED="xorg-server" 13.18 DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \ 13.19 xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config \ 13.20 perl flex xorg-server xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto \ 13.21 @@ -20,24 +21,13 @@ 13.22 13.23 # Use devel files from ARCH default Xserver 13.24 case "$ARCH" in 13.25 - i?86) 13.26 - WANTED="xorg-server" ;; 13.27 - arm) 13.28 - WANTED="xorg-server-light" 13.29 + arm) 13.30 + WANTED="xorg-server-light" 13.31 DEPENDS="" ;; 13.32 esac 13.33 13.34 # Rules to gen a SliTaz package suitable for Tazpkg. 13.35 genpkg_rules() 13.36 { 13.37 - mkdir -p $fs/usr/lib $fs/usr/share 13.38 - 13.39 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 13.40 - cp -a $install/usr/lib/X11 $fs/usr/lib 13.41 - cp -a $install/usr/share/aclocal $fs/usr/share 13.42 - cp -a $install/usr/include $fs/usr 13.43 - 13.44 - rm $fs/usr/lib/X11/*/*.so* 13.45 - rm $fs/usr/lib/X11/*/*/*.*so* 13.46 + cook_copy_files *.h *.la *.pc *.m4 13.47 } 13.48 -
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/xorg-server-modules-gl/receipt Thu Mar 02 05:17:16 2017 +0200 14.3 @@ -0,0 +1,21 @@ 14.4 +# SliTaz package receipt. 14.5 + 14.6 +PACKAGE="xorg-server-modules-gl" 14.7 +VERSION="1.18.4" 14.8 +CATEGORY="x-window" 14.9 +SHORT_DESC="Xorg server modules depends on mesa" 14.10 +MAINTAINER="al.bobylev@gmail.com" 14.11 +LICENSE="MIT" 14.12 +WEB_SITE="https://www.x.org/wiki" 14.13 +HOST_ARCH="i486 arm" 14.14 + 14.15 +WANTED="xorg-server" 14.16 +DEPENDS="expat libdrm libepoxy libxcb mesa xorg-libX11 xorg-libXau \ 14.17 +xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxshmfence \ 14.18 +xorg-libXxf86vm" 14.19 + 14.20 +# Rules to gen a SliTaz package suitable for Tazpkg. 14.21 +genpkg_rules() 14.22 +{ 14.23 + cook_copy_files libglamoregl.so libglx.so 14.24 +}
15.1 --- a/xorg-server/receipt Wed Mar 01 23:29:10 2017 +0200 15.2 +++ b/xorg-server/receipt Thu Mar 02 05:17:16 2017 +0200 15.3 @@ -1,42 +1,50 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="xorg-server" 15.7 -VERSION="1.12.4" 15.8 +VERSION="1.18.4" 15.9 CATEGORY="x-window" 15.10 SHORT_DESC="Xorg core server." 15.11 MAINTAINER="pankso@slitaz.org" 15.12 LICENSE="MIT" 15.13 SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa" 15.14 +WEB_SITE="https://www.x.org/wiki/" 15.15 + 15.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 15.17 -WEB_SITE="http://www.x.org/" 15.18 -WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" 15.19 +WGET_URL="$XORG_MIRROR/xserver/$TARBALL" 15.20 15.21 -# Mesa build dep make also Xorg depends on libdrm. 15.22 DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \ 15.23 xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev libdrm \ 15.24 xorg-xf86-input-evdev" 15.25 -BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \ 15.26 -xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config perl \ 15.27 -flex xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto xorg-randrproto \ 15.28 -xorg-dri2proto xorg-libXau-dev xorg-dev-proto libdrm-dev xorg-glproto \ 15.29 -xorg-libXv-dev xorg-libXmu-dev xorg-libXrender-dev xorg-libXi-dev" 15.30 +BUILD_DEPENDS="patch xorg-util-macros xorg-font-util-dev pixman-dev eudev-dev \ 15.31 +dbus-dev xorg-dri2proto xorg-dri3proto xorg-libxshmfence-dev libdrm-dev \ 15.32 +xorg-libX11-dev xorg-glproto mesa-dev libgcrypt-dev xorg-xcmiscproto \ 15.33 +xorg-bigreqsproto xorg-randrproto xorg-renderproto xorg-fontsproto \ 15.34 +xorg-videoproto xorg-compositeproto xorg-recordproto xorg-scrnsaverproto \ 15.35 +xorg-resourceproto xorg-xf86driproto xorg-presentproto xorg-xineramaproto \ 15.36 +xorg-libxkbfile-dev xorg-libXfont-dev xorg-libpciaccess-dev \ 15.37 +xorg-libXxf86dga-dev libepoxy-dev xorg-libdmx-dev xorg-libXmu-dev \ 15.38 +xorg-libXrender-dev xorg-libXi-dev tslib-dev xcb-util-renderutil-dev \ 15.39 +xcb-util-dev xcb-util-image-dev xcb-util-wm-dev xcb-util-keysyms-dev \ 15.40 +xorg-libXaw-dev xorg-libXpm-dev expat-dev" 15.41 +SPLIT="xorg-server-Xephyr xorg-server-Xfbdev xorg-server-Xnest \ 15.42 +xorg-server-Xvfb xorg-server-modules-gl" 15.43 15.44 # Rules to configure and make the package. 15.45 compile_rules() 15.46 { 15.47 - cd $src 15.48 + patch -Np1 -i $stuff/xorg-server-1.18.4-add_prime_support-1.patch 15.49 15.50 - # Xephyr make possible to use Xorg in a chroot. 15.51 ./configure \ 15.52 - --prefix=/usr \ 15.53 --sysconfdir=/etc \ 15.54 - --mandir=/usr/share/man \ 15.55 --localstatedir=/var \ 15.56 - --with-module-dir=/usr/lib/X11/modules \ 15.57 + --disable-static \ 15.58 + --enable-glamor \ 15.59 + --enable-install-setuid \ 15.60 + --enable-suid-wrapper \ 15.61 + --disable-systemd-logind \ 15.62 + --disable-xwayland \ 15.63 + --disable-docs --disable-devel-docs \ 15.64 --with-xkb-output=/var/lib/xkb \ 15.65 - --with-serverconfig-path=/etc/X11 \ 15.66 - --enable-install-setuid \ 15.67 - --enable-xorg \ 15.68 --enable-kdrive \ 15.69 --enable-kdrive-kbd \ 15.70 --enable-kdrive-mouse \ 15.71 @@ -44,33 +52,27 @@ 15.72 --enable-xfbdev \ 15.73 --enable-xephyr \ 15.74 --enable-config-udev \ 15.75 - --disable-config-dbus \ 15.76 - --disable-docs \ 15.77 - --disable-devel-docs \ 15.78 --with-fontrootdir=/usr/share/fonts/X11 \ 15.79 + --with-module-dir=/usr/lib/X11/modules \ 15.80 + --with-serverconfig-path=/etc/X11 \ 15.81 --with-os-name="SliTaz GNU/Linux" \ 15.82 --with-vendor-web="http://www.slitaz.org/" \ 15.83 --with-builder-addr=$MAINTAINER \ 15.84 $CONFIGURE_ARGS && 15.85 make && make DESTDIR=$DESTDIR install 15.86 + 15.87 + # is xorg.conf.d moved by Xorg developers to /usr/share/X11/? 15.88 + mkdir -p $install/etc/X11/xorg.conf.d 15.89 } 15.90 15.91 # Rules to gen a SliTaz package suitable for Tazpkg. 15.92 genpkg_rules() 15.93 { 15.94 - mkdir -p $fs/usr/lib $fs/var $fs/etc/X11/xorg.conf.d 15.95 - cp -a $install/usr/lib/X11 $fs/usr/lib 15.96 - cp -a $install/usr/bin $fs/usr 15.97 - cp -a $install/var/lib $fs/var 15.98 - cp -a $install/etc $fs 15.99 - # Remove static libs and split Xnest 15.100 - rm $fs/usr/lib/X11/*/*.*a 15.101 - rm $fs/usr/lib/X11/*/*/*.*a 15.102 - rm $fs/usr/bin/Xnest 15.103 - rm $fs/usr/bin/Xvfb 15.104 - # Kdrive/tinyX --> xorg-server-Xephyr xorg-server-Xfbdev 15.105 - rm $fs/usr/bin/Xephyr 15.106 - rm $fs/usr/bin/Xfbdev 15.107 + cook_copy_folders etc var bin libexec xorg.conf.d 15.108 + cook_copy_files *.so 15.109 + # split 15.110 + rm $fs/usr/bin/Xephyr $fs/usr/bin/Xfbdev $fs/usr/bin/Xnest $fs/usr/bin/Xvfb 15.111 + rm $fs/usr/lib/X11/modules/libglamoregl.so $fs/usr/lib/X11/modules/extensions/libglx.so 15.112 } 15.113 15.114 # We need /var/tmp rw to let xkbcomp builr XKB definition. 15.115 @@ -78,4 +80,3 @@ 15.116 { 15.117 chmod 1777 "$1/var/tmp" 15.118 } 15.119 -
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/xorg-server/stuff/xorg-server-1.18.4-add_prime_support-1.patch Thu Mar 02 05:17:16 2017 +0200 16.3 @@ -0,0 +1,97 @@ 16.4 +Submitted By: Armin K. <krejzi at email dot com> 16.5 +Date: 2012-12-30 16.6 +Initial Package Version: 1.13.1 16.7 +Upstream Status: Not submitted. 16.8 +Origin: Upstream mailing list. 16.9 +Comment: Rediffed for Package Version 1.17.2 by 16.10 + Fernando de Oliveira <famobr at yahoo dot com dot br> 16.11 +Description: Adds PRIME support to Xorg Server to make GPU offloading work. 16.12 + 16.13 +diff -Naur xorg-server-1.17.2.orig/hw/xfree86/common/xf86Init.c xorg-server-1.17.2/hw/xfree86/common/xf86Init.c 16.14 +--- xorg-server-1.17.2.orig/hw/xfree86/common/xf86Init.c 2015-06-05 12:19:40.000000000 -0300 16.15 ++++ xorg-server-1.17.2/hw/xfree86/common/xf86Init.c 2015-06-17 11:35:07.227581436 -0300 16.16 +@@ -340,6 +340,16 @@ 16.17 + return ret; 16.18 + } 16.19 + 16.20 ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); 16.21 ++static void 16.22 ++xf86AutoConfigOutputDevices(void) 16.23 ++{ 16.24 ++ int i; 16.25 ++ 16.26 ++ for (i = 0; i < xf86NumGPUScreens; i++) 16.27 ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); 16.28 ++} 16.29 ++ 16.30 + static void 16.31 + InstallSignalHandlers(void) 16.32 + { 16.33 +@@ -929,6 +939,8 @@ 16.34 + for (i = 0; i < xf86NumGPUScreens; i++) 16.35 + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); 16.36 + 16.37 ++ xf86AutoConfigOutputDevices(); 16.38 ++ 16.39 + xf86VGAarbiterWrapFunctions(); 16.40 + if (sigio_blocked) 16.41 + OsReleaseSIGIO(); 16.42 +diff -Naur xorg-server-1.17.2.orig/hw/xfree86/common/xf86platformBus.c xorg-server-1.17.2/hw/xfree86/common/xf86platformBus.c 16.43 +--- xorg-server-1.17.2.orig/hw/xfree86/common/xf86platformBus.c 2015-06-16 12:21:07.000000000 -0300 16.44 ++++ xorg-server-1.17.2/hw/xfree86/common/xf86platformBus.c 2015-06-17 11:35:07.227581436 -0300 16.45 +@@ -469,6 +469,8 @@ 16.46 + return foundScreen; 16.47 + } 16.48 + 16.49 ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); 16.50 ++ 16.51 + int 16.52 + xf86platformAddDevice(int index) 16.53 + { 16.54 +@@ -537,6 +539,7 @@ 16.55 + } 16.56 + /* attach unbound to 0 protocol screen */ 16.57 + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); 16.58 ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); 16.59 + 16.60 + RRResourcesChanged(xf86Screens[0]->pScreen); 16.61 + RRTellChanged(xf86Screens[0]->pScreen); 16.62 +diff -Naur xorg-server-1.17.2.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.17.2/hw/xfree86/modes/xf86Crtc.c 16.63 +--- xorg-server-1.17.2.orig/hw/xfree86/modes/xf86Crtc.c 2015-06-16 10:55:48.000000000 -0300 16.64 ++++ xorg-server-1.17.2/hw/xfree86/modes/xf86Crtc.c 2015-06-17 11:35:07.230581367 -0300 16.65 +@@ -3387,3 +3387,35 @@ 16.66 + crtc->x = crtc->y = 0; 16.67 + } 16.68 + } 16.69 ++ 16.70 ++ 16.71 ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) 16.72 ++{ 16.73 ++ RRProviderPtr master_provider; 16.74 ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); 16.75 ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); 16.76 ++ Bool unbound = FALSE; 16.77 ++ 16.78 ++ if (!config || !slave_config) 16.79 ++ return; 16.80 ++ 16.81 ++ master_provider = config->randr_provider; 16.82 ++ 16.83 ++ if ((master->capabilities & RR_Capability_SinkOffload) && 16.84 ++ pScrn->capabilities & RR_Capability_SourceOffload) { 16.85 ++ /* source offload */ 16.86 ++ 16.87 ++ DetachUnboundGPU(pScrn->pScreen); 16.88 ++ unbound = TRUE; 16.89 ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); 16.90 ++ slave_config->randr_provider->offload_sink = master_provider; 16.91 ++ } 16.92 ++ if ((master->capabilities & RR_Capability_SourceOutput) && 16.93 ++ pScrn->capabilities & RR_Capability_SinkOutput) { 16.94 ++ /* sink offload */ 16.95 ++ if (!unbound) 16.96 ++ DetachUnboundGPU(pScrn->pScreen); 16.97 ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); 16.98 ++ slave_config->randr_provider->output_source = master_provider; 16.99 ++ } 16.100 ++}
17.1 --- a/xorg-xkeyboard-config-dev/receipt Wed Mar 01 23:29:10 2017 +0200 17.2 +++ b/xorg-xkeyboard-config-dev/receipt Thu Mar 02 05:17:16 2017 +0200 17.3 @@ -1,19 +1,19 @@ 17.4 # SliTaz package receipt. 17.5 17.6 PACKAGE="xorg-xkeyboard-config-dev" 17.7 -VERSION="2.2.1" 17.8 +VERSION="2.18" 17.9 CATEGORY="development" 17.10 -SHORT_DESC="Xorg server keyboard devel files." 17.11 +SHORT_DESC="Keyboard configuration database for the X Window System (development files)" 17.12 MAINTAINER="pankso@slitaz.org" 17.13 LICENSE="MIT" 17.14 -WEB_SITE="http://www.x.org/" 17.15 +WEB_SITE="https://www.x.org/wiki/" 17.16 +HOST_ARCH="i486 arm" 17.17 + 17.18 WANTED="xorg-xkeyboard-config" 17.19 -HOST_ARCH="i486 arm" 17.20 +DEPENDS="xorg-xkeyboard-config" 17.21 17.22 # Rules to gen a SliTaz package suitable for Tazpkg. 17.23 genpkg_rules() 17.24 { 17.25 - mkdir -p $fs/usr/share 17.26 - cp -a $install/usr/share/pkgconfig $fs/usr/share 17.27 + cook_copy_files *.pc 17.28 } 17.29 -
18.1 --- a/xorg-xkeyboard-config/receipt Wed Mar 01 23:29:10 2017 +0200 18.2 +++ b/xorg-xkeyboard-config/receipt Thu Mar 02 05:17:16 2017 +0200 18.3 @@ -1,19 +1,18 @@ 18.4 # SliTaz package receipt. 18.5 18.6 PACKAGE="xorg-xkeyboard-config" 18.7 -VERSION="2.2.1" 18.8 +VERSION="2.18" 18.9 CATEGORY="x-window" 18.10 -SHORT_DESC="Xorg server keyboard definition files." 18.11 +SHORT_DESC="Keyboard configuration database for the X Window System" 18.12 MAINTAINER="pankso@slitaz.org" 18.13 LICENSE="MIT" 18.14 -SOURCE="xkeyboard-config" 18.15 -TARBALL="$SOURCE-$VERSION.tar.bz2" 18.16 -WEB_SITE="http://www.x.org/" 18.17 -WGET_URL="http://xorg.freedesktop.org/releases/individual/data/$SOURCE/$TARBALL" 18.18 +WEB_SITE="https://www.x.org/wiki/" 18.19 HOST_ARCH="i486 arm" 18.20 18.21 -DEPENDS="xorg-xkbcomp" 18.22 -BUILD_DEPENDS="perl-xml-parser xorg-xkbcomp xorg-xproto xorg-libX11-dev intltool" 18.23 +TARBALL="xkeyboard-config-$VERSION.tar.bz2" 18.24 +WGET_URL="$XORG_MIRROR/data/xkeyboard-config/$TARBALL" 18.25 + 18.26 +BUILD_DEPENDS="libxslt xorg-xproto xorg-libX11-dev intltool" 18.27 18.28 # Handle cross compilation. Use build host: xorg-xkbcomp perl-xml-parser 18.29 case "$ARCH" in 18.30 @@ -35,7 +34,5 @@ 18.31 # Rules to gen a SliTaz package suitable for Tazpkg. 18.32 genpkg_rules() 18.33 { 18.34 - mkdir -p $fs/usr/share 18.35 - cp -a $install/usr/share/X11 $fs/usr/share 18.36 + cook_copy_folders X11 18.37 } 18.38 -