wok-next rev 19647
Forgotten changes: libdrm-*, dbus, fontconfig, harfbuzz, libdrm, pixman, xorg-glproto.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Feb 23 00:58:26 2017 +0200 (2017-02-23) |
| parents | bd19ab320b7d |
| children | d7743923b5c6 |
| files | dbus-dev/receipt dbus-helper/receipt dbus/receipt dbus/stuff/etc/X11/xinit/xinitrc.d/30-dbus fontconfig-dev/receipt fontconfig/receipt harfbuzz-apps/receipt harfbuzz-dev/receipt harfbuzz-icu/receipt harfbuzz/receipt libdrm-amdgpu/receipt libdrm-dev/receipt libdrm-exynos/receipt libdrm-intel/receipt libdrm-nouveau/receipt libdrm-omap/receipt libdrm-radeon/receipt libdrm-tegra/receipt libdrm/receipt libdrm/stuff/libdrm-2.4.21-b803918f3f.patch pixman-dev/receipt pixman/receipt xorg-glproto/receipt |
line diff
1.1 --- a/dbus-dev/receipt Wed Feb 22 11:00:54 2017 +0200 1.2 +++ b/dbus-dev/receipt Thu Feb 23 00:58:26 2017 +0200 1.3 @@ -1,23 +1,19 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="dbus-dev" 1.7 -VERSION="1.6.22" 1.8 +VERSION="1.10.14" 1.9 CATEGORY="development" 1.10 -SHORT_DESC="D-Bus is a message bus system devel files." 1.11 -WANTED="dbus" 1.12 +SHORT_DESC="D-Bus, a message bus system, development files" 1.13 MAINTAINER="pankso@slitaz.org" 1.14 LICENSE="GPL2" 1.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus" 1.16 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" 1.17 HOST_ARCH="i486 arm" 1.18 1.19 -DEPENDS="dbus pkg-config" 1.20 +WANTED="dbus" 1.21 +DEPENDS="dbus" 1.22 1.23 # Rules to gen a SliTaz package suitable for Tazpkg. 1.24 genpkg_rules() 1.25 { 1.26 - mkdir -p $fs/usr/lib 1.27 - cp -a $install/usr/include $fs/usr 1.28 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.29 - cp -a $install/usr/lib/dbus-1.0 $fs/usr/lib 1.30 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.31 + cook_copy_files *.h *.la *.pc 1.32 }
2.1 --- a/dbus-helper/receipt Wed Feb 22 11:00:54 2017 +0200 2.2 +++ b/dbus-helper/receipt Thu Feb 23 00:58:26 2017 +0200 2.3 @@ -1,21 +1,20 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="dbus-helper" 2.7 -VERSION="1.6.22" 2.8 -CATEGORY="development" 2.9 -SHORT_DESC="D-Bus is a message bus system devel files." 2.10 -WANTED="dbus" 2.11 +VERSION="1.10.14" 2.12 +CATEGORY="x-window" 2.13 +SHORT_DESC="D-Bus, a message bus system, dbus-daemon-launch-helper" 2.14 MAINTAINER="pankso@slitaz.org" 2.15 LICENSE="GPL2" 2.16 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus" 2.17 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus" 2.18 2.19 +WANTED="dbus" 2.20 DEPENDS="dbus" 2.21 2.22 # Rules to gen a SliTaz package suitable for Tazpkg. 2.23 genpkg_rules() 2.24 { 2.25 - mkdir -p $fs/usr/lib 2.26 - cp -a $install/usr/lib/dbus $fs/usr/lib 2.27 - chown root.25 $fs/usr/lib/dbus/dbus-daemon-launch-helper 2.28 - chmod 4750 $fs/usr/lib/dbus/dbus-daemon-launch-helper 2.29 + cook_copy_files dbus-daemon-launch-helper 2.30 + chown root:18 $fs/usr/libexec/dbus-daemon-launch-helper 2.31 + chmod 4750 $fs/usr/libexec/dbus-daemon-launch-helper 2.32 }
3.1 --- a/dbus/receipt Wed Feb 22 11:00:54 2017 +0200 3.2 +++ b/dbus/receipt Thu Feb 23 00:58:26 2017 +0200 3.3 @@ -1,27 +1,34 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="dbus" 3.7 -VERSION="1.6.22" 3.8 +VERSION="1.10.14" 3.9 CATEGORY="x-window" 3.10 -SHORT_DESC="D-Bus is a message bus system." 3.11 +SHORT_DESC="D-Bus, a message bus system" 3.12 MAINTAINER="pankso@slitaz.org" 3.13 LICENSE="GPL2" 3.14 -TARBALL="$PACKAGE-$VERSION.tar.gz" 3.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus" 3.16 -WGET_URL="http://dbus.freedesktop.org/releases/dbus/$TARBALL" 3.17 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" 3.18 HOST_ARCH="i486 arm" 3.19 3.20 -DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \ 3.21 -xorg-libXau xorg-libXdmcp util-linux-uuid" 3.22 -BUILD_DEPENDS="xorg-libX11-dev expat-dev util-linux-uuid-dev" 3.23 +TARBALL="$PACKAGE-$VERSION.tar.gz" 3.24 +WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL" 3.25 + 3.26 +DEPENDS="expat xorg-libX11 slitaz-base-files" 3.27 +BUILD_DEPENDS="expat-dev xorg-libX11-dev" 3.28 +SPLIT="dbus-helper" 3.29 3.30 # Rules to configure and make the package. 3.31 compile_rules() 3.32 { 3.33 ./configure \ 3.34 - --libexecdir=/usr/lib/dbus \ 3.35 --sysconfdir=/etc \ 3.36 --localstatedir=/var \ 3.37 + --disable-doxygen-docs \ 3.38 + --disable-xml-docs \ 3.39 + --disable-static \ 3.40 + --disable-systemd \ 3.41 + --without-systemdsystemunitdir \ 3.42 + --with-console-auth-dir=/run/console/ \ 3.43 + --docdir=/usr/share/doc/dbus-$VERSION \ 3.44 $CONFIGURE_ARGS && 3.45 make && make -j 1 install 3.46 } 3.47 @@ -29,17 +36,12 @@ 3.48 # Rules to gen a SliTaz package suitable for Tazpkg. 3.49 genpkg_rules() 3.50 { 3.51 - mkdir -p $fs/usr/lib $fs/usr/share 3.52 - cp -a $install/etc $fs 3.53 - cp -a $install/var $fs 3.54 - cp -a $install/usr/bin $fs/usr 3.55 - cp -a $install/usr/lib/*.so* $fs/usr/lib 3.56 - cp -a $install/usr/lib/dbus $fs/usr/lib 3.57 - # Remove helper --> dbus-helper 3.58 - rm $fs/usr/lib/dbus/dbus-daemon-launch-helper 3.59 - cp -a $install/usr/share/dbus* $fs/usr/share 3.60 + cook_copy_folders var bin dbus-1 3.61 + cook_copy_files *.so* 3.62 + 3.63 # Init script 3.64 cp -a $stuff/etc $fs 3.65 + 3.66 chown -R root.root $fs 3.67 } 3.68 3.69 @@ -49,15 +51,15 @@ 3.70 # was found. 3.71 if ! grep -qs 'messagebus' "$1/etc/passwd"; then 3.72 action 'Adding user: messagebus...' 3.73 - echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd" 3.74 + echo 'messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false' >> "$1/etc/passwd" 3.75 echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow" 3.76 - echo 'messagebus:x:25:' >> "$1/etc/group" 3.77 + echo 'messagebus:x:18:' >> "$1/etc/group" 3.78 echo 'messagebus:!::' >> "$1/etc/gshadow" 3.79 status 3.80 fi 3.81 if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then 3.82 action 'Configuring %s/etc/daemons.conf...' "$1" 3.83 - cat >> "$1/etc/daemons.conf" << "EOT" 3.84 + cat >> "$1/etc/daemons.conf" <<EOT 3.85 # DBUS daemon options. 3.86 DBUS_OPTIONS="--system" 3.87 3.88 @@ -70,7 +72,7 @@ 3.89 pre_remove() 3.90 { 3.91 if [ -z "$1" ]; then 3.92 - /etc/init.d/dbus stop 2> /dev/null 3.93 + /etc/init.d/dbus stop 2>/dev/null 3.94 deluser messagebus 3.95 fi 3.96 }
4.1 --- a/dbus/stuff/etc/X11/xinit/xinitrc.d/30-dbus Wed Feb 22 11:00:54 2017 +0200 4.2 +++ b/dbus/stuff/etc/X11/xinit/xinitrc.d/30-dbus Thu Feb 23 00:58:26 2017 +0200 4.3 @@ -2,8 +2,7 @@ 4.4 4.5 # launches a session dbus instance 4.6 4.7 -dbuslaunch="`which dbus-launch 2>/dev/null`" 4.8 -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then 4.9 - eval `$dbuslaunch --sh-syntax --exit-with-session` 4.10 +dbuslaunch="$(which dbus-launch 2>/dev/null)" 4.11 +if [ -n "$dbuslaunch" -a -x "$dbuslaunch" -a -z "$DBUS_SESSION_BUS_ADDRESS" ]; then 4.12 + eval $($dbuslaunch --sh-syntax --exit-with-session) 4.13 fi 4.14 -
5.1 --- a/fontconfig-dev/receipt Wed Feb 22 11:00:54 2017 +0200 5.2 +++ b/fontconfig-dev/receipt Thu Feb 23 00:58:26 2017 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="fontconfig-dev" 5.7 -VERSION="2.10.91" 5.8 +VERSION="2.12.1" 5.9 CATEGORY="development" 5.10 SHORT_DESC="Font configuration utilities and library devel files" 5.11 MAINTAINER="pankso@slitaz.org" 5.12 @@ -15,8 +15,5 @@ 5.13 # Rules to gen a SliTaz package suitable for Tazpkg. 5.14 genpkg_rules() 5.15 { 5.16 - mkdir -p $fs/usr/lib 5.17 - cp -a $install/usr/include $fs/usr 5.18 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 5.19 - cp -a $install/usr/lib/*.*a $fs/usr/lib 5.20 + cook_copy_files *.h *.la *.pc 5.21 }
6.1 --- a/fontconfig/receipt Wed Feb 22 11:00:54 2017 +0200 6.2 +++ b/fontconfig/receipt Thu Feb 23 00:58:26 2017 +0200 6.3 @@ -1,15 +1,16 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="fontconfig" 6.7 -VERSION="2.10.91" 6.8 +VERSION="2.12.1" 6.9 CATEGORY="x-window" 6.10 SHORT_DESC="Font configuration utilities and library" 6.11 MAINTAINER="pankso@slitaz.org" 6.12 LICENSE="MIT" 6.13 WEB_SITE="http://www.fontconfig.org/wiki/" 6.14 +HOST_ARCH="i486 arm" 6.15 + 6.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 6.17 WGET_URL="http://www.freedesktop.org/software/fontconfig/release/$TARBALL" 6.18 -HOST_ARCH="i486 arm" 6.19 6.20 DEPENDS="bzlib expat freetype libxml2" 6.21 BUILD_DEPENDS="libxml2-dev freetype-dev" 6.22 @@ -33,13 +34,11 @@ 6.23 # Rules to gen a SliTaz package suitable for Tazpkg. 6.24 genpkg_rules() 6.25 { 6.26 - mkdir -p $fs/usr/lib 6.27 - cp -a $install/etc $fs 6.28 - cp -a $install/usr/bin $fs/usr 6.29 - cp -a $install/usr/lib/*.so* $fs/usr/lib 6.30 - cp -a $install/usr/share $fs/usr 6.31 - cp -a $install/var $fs 6.32 + cook_copy_folders etc bin share var 6.33 + cook_copy_files *.so* 6.34 6.35 + # Which the app uses the next? 6.36 + # There are 10-hinting-{full,medium,none,slight}.conf already exists... 6.37 cd $fs/usr/share/fontconfig/conf.avail 6.38 for h in hintslight hintmedium hintfull; do 6.39 cat > 10-hintstyle-$h.conf <<EOT 6.40 @@ -56,7 +55,7 @@ 6.41 6.42 # Fontconfig warning: "/etc/fonts/conf.d/50-user.conf", line 14: reading 6.43 # configurations from ~/.fonts.conf is deprecated. 6.44 - sed '/~\/\.fonts\.conf</d' $fs/usr/share/fontconfig/conf.avail/50-user.conf 6.45 + sed -i '/~\/\.fonts\.conf</d' $fs/usr/share/fontconfig/conf.avail/50-user.conf 6.46 6.47 - chown -R root.root $fs 6.48 +# chown -R root.root $fs 6.49 }
7.1 --- a/harfbuzz-apps/receipt Wed Feb 22 11:00:54 2017 +0200 7.2 +++ b/harfbuzz-apps/receipt Thu Feb 23 00:58:26 2017 +0200 7.3 @@ -1,21 +1,20 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="harfbuzz-apps" 7.7 -VERSION="1.2.7" 7.8 +VERSION="1.3.0" 7.9 CATEGORY="system-tools" 7.10 SHORT_DESC="OpenType text shaping engine, apps" 7.11 MAINTAINER="pankso@slitaz.org" 7.12 LICENSE="GPL2" 7.13 WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" 7.14 +HOST_ARCH="i486 arm" 7.15 +BUGS="hb-view failed when cairo built with slow xlib-xcb" 7.16 + 7.17 WANTED="harfbuzz" 7.18 -HOST_ARCH="i486 arm" 7.19 - 7.20 DEPENDS="harfbuzz cairo-gl" 7.21 -BUGS="hb-view failed when cairo built with slow xlib-xcb" 7.22 7.23 # Rules to gen a SliTaz package suitable for Tazpkg. 7.24 genpkg_rules() 7.25 { 7.26 - mkdir -p $fs/usr/bin 7.27 - cp -a $install/usr/bin $fs/usr 7.28 + cook_copy_folders bin 7.29 }
8.1 --- a/harfbuzz-dev/receipt Wed Feb 22 11:00:54 2017 +0200 8.2 +++ b/harfbuzz-dev/receipt Thu Feb 23 00:58:26 2017 +0200 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="harfbuzz-dev" 8.7 -VERSION="1.2.7" 8.8 +VERSION="1.3.0" 8.9 CATEGORY="development" 8.10 SHORT_DESC="harfbuzz development files" 8.11 MAINTAINER="pankso@slitaz.org" 8.12 @@ -10,7 +10,8 @@ 8.13 HOST_ARCH="i486 arm" 8.14 8.15 WANTED="harfbuzz" 8.16 -DEPENDS="harfbuzz bzip2-dev freetype-dev glib-dev libffi-dev libpng-dev pcre-dev" 8.17 +DEPENDS="harfbuzz bzip2-dev freetype-dev glib-dev libffi-dev libpng-dev \ 8.18 +pcre-dev" 8.19 8.20 # Rules to gen a SliTaz package suitable for Tazpkg. 8.21 genpkg_rules()
9.1 --- a/harfbuzz-icu/receipt Wed Feb 22 11:00:54 2017 +0200 9.2 +++ b/harfbuzz-icu/receipt Thu Feb 23 00:58:26 2017 +0200 9.3 @@ -1,16 +1,16 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="harfbuzz-icu" 9.7 -SOURCE="harfbuzz" 9.8 -VERSION="1.0.3" 9.9 +VERSION="1.3.0" 9.10 CATEGORY="system-tools" 9.11 -SHORT_DESC="OpenType text shaping engine with icu support" 9.12 +SHORT_DESC="OpenType text shaping engine with ICU support" 9.13 MAINTAINER="pankso@slitaz.org" 9.14 LICENSE="GPL2" 9.15 -TARBALL="$SOURCE-$VERSION.tar.bz2" 9.16 -WEB_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" 9.17 +WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz" 9.18 +PROVIDE="harfbuzz" 9.19 + 9.20 +TARBALL="harfbuzz-$VERSION.tar.bz2" 9.21 WGET_URL="http://www.freedesktop.org/software/harfbuzz/release/$TARBALL" 9.22 -PROVIDE="harfbuzz" 9.23 9.24 DEPENDS="glib freetype icu" 9.25 BUILD_DEPENDS="glib-dev freetype-dev icu-dev" 9.26 @@ -23,14 +23,12 @@ 9.27 --with-freetype \ 9.28 --with-gobject \ 9.29 --with-icu=yes \ 9.30 - $CONFIGURE_ARGS && 9.31 + $CONFIGURE_ARGS && 9.32 make && make install 9.33 } 9.34 9.35 # Rules to gen a SliTaz package suitable for Tazpkg. 9.36 genpkg_rules() 9.37 { 9.38 - mkdir -p $fs/usr/lib 9.39 - cp -a $install/usr/bin $fs/usr 9.40 - cp -a $install/usr/lib/*.so* $fs/usr/lib 9.41 + cook_copy_files *.so* 9.42 }
10.1 --- a/harfbuzz/receipt Wed Feb 22 11:00:54 2017 +0200 10.2 +++ b/harfbuzz/receipt Thu Feb 23 00:58:26 2017 +0200 10.3 @@ -1,18 +1,20 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="harfbuzz" 10.7 -VERSION="1.2.7" 10.8 +VERSION="1.3.0" 10.9 CATEGORY="system-tools" 10.10 SHORT_DESC="OpenType text shaping engine" 10.11 MAINTAINER="pankso@slitaz.org" 10.12 LICENSE="GPL2" 10.13 WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" 10.14 +HOST_ARCH="i486 arm" 10.15 + 10.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 10.17 WGET_URL="https://www.freedesktop.org/software/harfbuzz/release/$TARBALL" 10.18 -HOST_ARCH="i486 arm" 10.19 10.20 DEPENDS="glib cairo freetype libffi pcre" 10.21 BUILD_DEPENDS="glib-dev cairo-dev fontconfig-dev freetype-dev" 10.22 +SPLIT="harfbuzz-apps" 10.23 10.24 # Rules to configure and make the package. 10.25 compile_rules() 10.26 @@ -29,7 +31,5 @@ 10.27 # Rules to gen a SliTaz package suitable for Tazpkg. 10.28 genpkg_rules() 10.29 { 10.30 - mkdir -p $fs/usr/lib 10.31 - #cp -a $install/usr/bin $fs/usr 10.32 - cp -a $install/usr/lib/*.so* $fs/usr/lib 10.33 + cook_copy_files *.so* 10.34 }
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/libdrm-amdgpu/receipt Thu Feb 23 00:58:26 2017 +0200 11.3 @@ -0,0 +1,18 @@ 11.4 +# SliTaz package receipt. 11.5 + 11.6 +PACKAGE="libdrm-amdgpu" 11.7 +VERSION="2.4.70" 11.8 +CATEGORY="x-window" 11.9 +SHORT_DESC="Freedesktop DRM Library (AMDGPU API)" 11.10 +MAINTAINER="al.bobylev@gmail.com" 11.11 +LICENSE="MIT" 11.12 +WEB_SITE="https://dri.freedesktop.org/" 11.13 + 11.14 +WANTED="libdrm" 11.15 +DEPENDS="libdrm" 11.16 + 11.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 11.18 +genpkg_rules() 11.19 +{ 11.20 + cook_copy_files libdrm_amdgpu.so* 11.21 +}
12.1 --- a/libdrm-dev/receipt Wed Feb 22 11:00:54 2017 +0200 12.2 +++ b/libdrm-dev/receipt Thu Feb 23 00:58:26 2017 +0200 12.3 @@ -1,23 +1,20 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="libdrm-dev" 12.7 -VERSION="2.4.68" 12.8 +VERSION="2.4.70" 12.9 CATEGORY="development" 12.10 -SHORT_DESC="Lib DRM devel files." 12.11 +SHORT_DESC="Freedesktop DRM library, development files" 12.12 MAINTAINER="pankso@slitaz.org" 12.13 LICENSE="MIT" 12.14 -WEB_SITE="http://dri.freedesktop.org/" 12.15 +WEB_SITE="https://dri.freedesktop.org/" 12.16 HOST_ARCH="i486 arm" 12.17 12.18 WANTED="libdrm" 12.19 -DEPENDS="libdrm libdrm-intel libdrm-radeon pkg-config" 12.20 +DEPENDS="libdrm libdrm-amdgpu libdrm-exynos libdrm-intel libdrm-nouveau \ 12.21 +libdrm-omap libdrm-radeon libdrm-tegra" 12.22 12.23 # Rules to gen a SliTaz package suitable for Tazpkg. 12.24 genpkg_rules() 12.25 { 12.26 - mkdir -p $fs/usr/lib 12.27 - cp -a $install/usr/include $fs/usr 12.28 - cp -a $install/usr/lib/*.*a $fs/usr/lib 12.29 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 12.30 + cook_copy_files *.h *.la *.pc 12.31 } 12.32 -
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/libdrm-exynos/receipt Thu Feb 23 00:58:26 2017 +0200 13.3 @@ -0,0 +1,18 @@ 13.4 +# SliTaz package receipt. 13.5 + 13.6 +PACKAGE="libdrm-exynos" 13.7 +VERSION="2.4.70" 13.8 +CATEGORY="x-window" 13.9 +SHORT_DESC="Freedesktop DRM Library (EXYNOS API)" 13.10 +MAINTAINER="al.bobylev@gmail.com" 13.11 +LICENSE="MIT" 13.12 +WEB_SITE="https://dri.freedesktop.org/" 13.13 + 13.14 +WANTED="libdrm" 13.15 +DEPENDS="libdrm" 13.16 + 13.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 13.18 +genpkg_rules() 13.19 +{ 13.20 + cook_copy_files libdrm_exynos.so* 13.21 +}
14.1 --- a/libdrm-intel/receipt Wed Feb 22 11:00:54 2017 +0200 14.2 +++ b/libdrm-intel/receipt Thu Feb 23 00:58:26 2017 +0200 14.3 @@ -1,19 +1,18 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="libdrm-intel" 14.7 -VERSION="2.4.68" 14.8 +VERSION="2.4.70" 14.9 CATEGORY="x-window" 14.10 -SHORT_DESC="Freedesktop DRM Library (intel library)." 14.11 +SHORT_DESC="Freedesktop DRM Library (Intel API)" 14.12 MAINTAINER="pankso@slitaz.org" 14.13 LICENSE="MIT" 14.14 -WEB_SITE="http://dri.freedesktop.org/" 14.15 +WEB_SITE="https://dri.freedesktop.org/" 14.16 14.17 WANTED="libdrm" 14.18 -DEPENDS="glibc-base udev libdrm" 14.19 +DEPENDS="libdrm xorg-libpciaccess" 14.20 14.21 # Rules to gen a SliTaz package suitable for Tazpkg. 14.22 genpkg_rules() 14.23 { 14.24 - mkdir -p $fs/usr/lib 14.25 - cp -a $install/usr/lib/libdrm_intel*.so* $fs/usr/lib 14.26 + cook_copy_files libdrm_intel.so* 14.27 }
15.1 --- a/libdrm-nouveau/receipt Wed Feb 22 11:00:54 2017 +0200 15.2 +++ b/libdrm-nouveau/receipt Thu Feb 23 00:58:26 2017 +0200 15.3 @@ -1,19 +1,18 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="libdrm-nouveau" 15.7 -VERSION="2.4.68" 15.8 +VERSION="2.4.70" 15.9 CATEGORY="x-window" 15.10 -SHORT_DESC="Freedesktop DRM Library (nouveau library)." 15.11 +SHORT_DESC="Freedesktop DRM Library (Nouveau API)" 15.12 MAINTAINER="pankso@slitaz.org" 15.13 LICENSE="MIT" 15.14 +WEB_SITE="https://dri.freedesktop.org/" 15.15 + 15.16 WANTED="libdrm" 15.17 -WEB_SITE="http://dri.freedesktop.org/" 15.18 - 15.19 -DEPENDS="glibc-base udev libdrm" 15.20 +DEPENDS="libdrm" 15.21 15.22 # Rules to gen a SliTaz package suitable for Tazpkg. 15.23 genpkg_rules() 15.24 { 15.25 - mkdir -p $fs/usr/lib 15.26 - cp -a $install/usr/lib/libdrm_nouveau*.so* $fs/usr/lib 15.27 + cook_copy_files libdrm_nouveau.so* 15.28 }
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/libdrm-omap/receipt Thu Feb 23 00:58:26 2017 +0200 16.3 @@ -0,0 +1,18 @@ 16.4 +# SliTaz package receipt. 16.5 + 16.6 +PACKAGE="libdrm-omap" 16.7 +VERSION="2.4.70" 16.8 +CATEGORY="x-window" 16.9 +SHORT_DESC="Freedesktop DRM Library (OMAP API)" 16.10 +MAINTAINER="al.bobylev@gmail.com" 16.11 +LICENSE="MIT" 16.12 +WEB_SITE="https://dri.freedesktop.org/" 16.13 + 16.14 +WANTED="libdrm" 16.15 +DEPENDS="libdrm" 16.16 + 16.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 16.18 +genpkg_rules() 16.19 +{ 16.20 + cook_copy_files libdrm_omap.so* 16.21 +}
17.1 --- a/libdrm-radeon/receipt Wed Feb 22 11:00:54 2017 +0200 17.2 +++ b/libdrm-radeon/receipt Thu Feb 23 00:58:26 2017 +0200 17.3 @@ -1,19 +1,18 @@ 17.4 # SliTaz package receipt. 17.5 17.6 PACKAGE="libdrm-radeon" 17.7 -VERSION="2.4.68" 17.8 +VERSION="2.4.70" 17.9 CATEGORY="x-window" 17.10 -SHORT_DESC="Freedesktop DRM Library (radeon library)." 17.11 +SHORT_DESC="Freedesktop DRM Library (Radeon API)" 17.12 MAINTAINER="pankso@slitaz.org" 17.13 LICENSE="MIT" 17.14 +WEB_SITE="https://dri.freedesktop.org/" 17.15 + 17.16 WANTED="libdrm" 17.17 -WEB_SITE="http://dri.freedesktop.org/" 17.18 - 17.19 -DEPENDS="glibc-base udev libdrm" 17.20 +DEPENDS="libdrm" 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/lib 17.26 - cp -a $install/usr/lib/libdrm_radeon*.so* $fs/usr/lib 17.27 + cook_copy_files libdrm_radeon.so* 17.28 }
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/libdrm-tegra/receipt Thu Feb 23 00:58:26 2017 +0200 18.3 @@ -0,0 +1,18 @@ 18.4 +# SliTaz package receipt. 18.5 + 18.6 +PACKAGE="libdrm-tegra" 18.7 +VERSION="2.4.70" 18.8 +CATEGORY="x-window" 18.9 +SHORT_DESC="Freedesktop DRM Library (Tegra API)" 18.10 +MAINTAINER="al.bobylev@gmail.com" 18.11 +LICENSE="MIT" 18.12 +WEB_SITE="https://dri.freedesktop.org/" 18.13 + 18.14 +WANTED="libdrm" 18.15 +DEPENDS="libdrm" 18.16 + 18.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 18.18 +genpkg_rules() 18.19 +{ 18.20 + cook_copy_files libdrm_tegra.so* 18.21 +}
19.1 --- a/libdrm/receipt Wed Feb 22 11:00:54 2017 +0200 19.2 +++ b/libdrm/receipt Thu Feb 23 00:58:26 2017 +0200 19.3 @@ -1,30 +1,35 @@ 19.4 # SliTaz package receipt. 19.5 19.6 PACKAGE="libdrm" 19.7 -VERSION="2.4.68" 19.8 +VERSION="2.4.70" 19.9 CATEGORY="x-window" 19.10 SHORT_DESC="Freedesktop DRM Library." 19.11 MAINTAINER="pankso@slitaz.org" 19.12 LICENSE="MIT" 19.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 19.14 -WEB_SITE="http://dri.freedesktop.org/" 19.15 -WGET_URL="http://dri.freedesktop.org/libdrm/$TARBALL" 19.16 +WEB_SITE="https://dri.freedesktop.org/" 19.17 HOST_ARCH="i486 arm" 19.18 19.19 -DEPENDS="glibc-base udev linux-drm xorg-libpciaccess" 19.20 -BUILD_DEPENDS="libpthread-stubs-dev gc-dev pkg-config udev-dev \ 19.21 -xorg-libpciaccess-dev" 19.22 -#xorg-dev xorg-dev-proto 19.23 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 19.24 +WGET_URL="https://dri.freedesktop.org/libdrm/$TARBALL" 19.25 + 19.26 +DEPENDS="glibc-base eudev linux-drm xorg-libpciaccess" 19.27 +BUILD_DEPENDS="autoconf automake libtool xorg-util-macros libxslt \ 19.28 +xorg-libpciaccess-dev cairo-dev eudev-dev libxslt docbook-xsl" 19.29 +SPLIT="libdrm-amdgpu libdrm-exynos libdrm-intel libdrm-nouveau libdrm-omap \ 19.30 +libdrm-radeon libdrm-tegra" 19.31 19.32 # Rules to configure and make the package. 19.33 compile_rules() 19.34 { 19.35 + sed -i "/pthread-stubs/d" configure.ac && 19.36 + autoreconf -fiv && 19.37 + 19.38 ./configure \ 19.39 - --enable-intel \ 19.40 - --enable-radeon \ 19.41 - --enable-vmwgfx-experimental-api \ 19.42 - --enable-nouveau-experimental-api \ 19.43 --enable-udev \ 19.44 + --enable-vmwgfx \ 19.45 + --enable-omap-experimental-api \ 19.46 + --enable-exynos-experimental-api \ 19.47 + --enable-tegra-experimental-api \ 19.48 $CONFIGURE_ARGS && 19.49 make && make install 19.50 } 19.51 @@ -32,7 +37,5 @@ 19.52 # Rules to gen a SliTaz package suitable for Tazpkg. 19.53 genpkg_rules() 19.54 { 19.55 - mkdir -p $fs/usr/lib 19.56 - cp -a $install/usr/lib/libdrm.so* $fs/usr/lib 19.57 - cp -a $install/usr/lib/libkms*.so* $fs/usr/lib 19.58 + cook_copy_files libdrm.so* libkms.so* 19.59 }
20.1 --- a/libdrm/stuff/libdrm-2.4.21-b803918f3f.patch Wed Feb 22 11:00:54 2017 +0200 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,506 +0,0 @@ 20.4 -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c 20.5 -index a8e072d..3446390 100644 20.6 ---- a/intel/intel_bufmgr_gem.c 20.7 -+++ b/intel/intel_bufmgr_gem.c 20.8 -@@ -93,6 +93,7 @@ typedef struct _drm_intel_bufmgr_gem { 20.9 - /** Array of lists of cached gem objects of power-of-two sizes */ 20.10 - struct drm_intel_gem_bo_bucket cache_bucket[14 * 4]; 20.11 - int num_buckets; 20.12 -+ time_t time; 20.13 - 20.14 - uint64_t gtt_size; 20.15 - int available_fences; 20.16 -@@ -132,6 +133,7 @@ struct _drm_intel_bo_gem { 20.17 - */ 20.18 - uint32_t tiling_mode; 20.19 - uint32_t swizzle_mode; 20.20 -+ unsigned long stride; 20.21 - 20.22 - time_t free_time; 20.23 - 20.24 -@@ -200,8 +202,9 @@ drm_intel_gem_bo_get_tiling(drm_intel_bo *bo, uint32_t * tiling_mode, 20.25 - uint32_t * swizzle_mode); 20.26 - 20.27 - static int 20.28 --drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode, 20.29 -- uint32_t stride); 20.30 -+drm_intel_gem_bo_set_tiling_internal(drm_intel_bo *bo, 20.31 -+ uint32_t tiling_mode, 20.32 -+ uint32_t stride); 20.33 - 20.34 - static void drm_intel_gem_bo_unreference_locked_timed(drm_intel_bo *bo, 20.35 - time_t time); 20.36 -@@ -251,7 +254,7 @@ drm_intel_gem_bo_tile_size(drm_intel_bufmgr_gem *bufmgr_gem, unsigned long size, 20.37 - */ 20.38 - static unsigned long 20.39 - drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem, 20.40 -- unsigned long pitch, uint32_t tiling_mode) 20.41 -+ unsigned long pitch, uint32_t *tiling_mode) 20.42 - { 20.43 - unsigned long tile_width; 20.44 - unsigned long i; 20.45 -@@ -259,10 +262,10 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem, 20.46 - /* If untiled, then just align it so that we can do rendering 20.47 - * to it with the 3D engine. 20.48 - */ 20.49 -- if (tiling_mode == I915_TILING_NONE) 20.50 -+ if (*tiling_mode == I915_TILING_NONE) 20.51 - return ALIGN(pitch, 64); 20.52 - 20.53 -- if (tiling_mode == I915_TILING_X) 20.54 -+ if (*tiling_mode == I915_TILING_X) 20.55 - tile_width = 512; 20.56 - else 20.57 - tile_width = 128; 20.58 -@@ -271,6 +274,14 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem, 20.59 - if (bufmgr_gem->gen >= 4) 20.60 - return ROUND_UP_TO(pitch, tile_width); 20.61 - 20.62 -+ /* The older hardware has a maximum pitch of 8192 with tiled 20.63 -+ * surfaces, so fallback to untiled if it's too large. 20.64 -+ */ 20.65 -+ if (pitch > 8192) { 20.66 -+ *tiling_mode = I915_TILING_NONE; 20.67 -+ return ALIGN(pitch, 64); 20.68 -+ } 20.69 -+ 20.70 - /* Pre-965 needs power of two tile width */ 20.71 - for (i = tile_width; i < pitch; i <<= 1) 20.72 - ; 20.73 -@@ -549,7 +560,9 @@ static drm_intel_bo * 20.74 - drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr, 20.75 - const char *name, 20.76 - unsigned long size, 20.77 -- unsigned long flags) 20.78 -+ unsigned long flags, 20.79 -+ uint32_t tiling_mode, 20.80 -+ unsigned long stride) 20.81 - { 20.82 - drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr; 20.83 - drm_intel_bo_gem *bo_gem; 20.84 -@@ -615,6 +628,13 @@ retry: 20.85 - bucket); 20.86 - goto retry; 20.87 - } 20.88 -+ 20.89 -+ if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo, 20.90 -+ tiling_mode, 20.91 -+ stride)) { 20.92 -+ drm_intel_gem_bo_free(&bo_gem->bo); 20.93 -+ goto retry; 20.94 -+ } 20.95 - } 20.96 - } 20.97 - pthread_mutex_unlock(&bufmgr_gem->lock); 20.98 -@@ -642,6 +662,17 @@ retry: 20.99 - return NULL; 20.100 - } 20.101 - bo_gem->bo.bufmgr = bufmgr; 20.102 -+ 20.103 -+ bo_gem->tiling_mode = I915_TILING_NONE; 20.104 -+ bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; 20.105 -+ bo_gem->stride = 0; 20.106 -+ 20.107 -+ if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo, 20.108 -+ tiling_mode, 20.109 -+ stride)) { 20.110 -+ drm_intel_gem_bo_free(&bo_gem->bo); 20.111 -+ return NULL; 20.112 -+ } 20.113 - } 20.114 - 20.115 - bo_gem->name = name; 20.116 -@@ -650,8 +681,6 @@ retry: 20.117 - bo_gem->reloc_tree_fences = 0; 20.118 - bo_gem->used_as_reloc_target = 0; 20.119 - bo_gem->has_error = 0; 20.120 -- bo_gem->tiling_mode = I915_TILING_NONE; 20.121 -- bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE; 20.122 - bo_gem->reusable = 1; 20.123 - 20.124 - drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); 20.125 -@@ -669,7 +698,8 @@ drm_intel_gem_bo_alloc_for_render(drm_intel_bufmgr *bufmgr, 20.126 - unsigned int alignment) 20.127 - { 20.128 - return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 20.129 -- BO_ALLOC_FOR_RENDER); 20.130 -+ BO_ALLOC_FOR_RENDER, 20.131 -+ I915_TILING_NONE, 0); 20.132 - } 20.133 - 20.134 - static drm_intel_bo * 20.135 -@@ -678,7 +708,8 @@ drm_intel_gem_bo_alloc(drm_intel_bufmgr *bufmgr, 20.136 - unsigned long size, 20.137 - unsigned int alignment) 20.138 - { 20.139 -- return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0); 20.140 -+ return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0, 20.141 -+ I915_TILING_NONE, 0); 20.142 - } 20.143 - 20.144 - static drm_intel_bo * 20.145 -@@ -687,10 +718,8 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name, 20.146 - unsigned long *pitch, unsigned long flags) 20.147 - { 20.148 - drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bufmgr; 20.149 -- drm_intel_bo *bo; 20.150 - unsigned long size, stride; 20.151 - uint32_t tiling; 20.152 -- int ret; 20.153 - 20.154 - do { 20.155 - unsigned long aligned_y; 20.156 -@@ -717,24 +746,17 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name, 20.157 - aligned_y = ALIGN(y, 32); 20.158 - 20.159 - stride = x * cpp; 20.160 -- stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, tiling); 20.161 -+ stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, tiling_mode); 20.162 - size = stride * aligned_y; 20.163 - size = drm_intel_gem_bo_tile_size(bufmgr_gem, size, tiling_mode); 20.164 - } while (*tiling_mode != tiling); 20.165 -- 20.166 -- bo = drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags); 20.167 -- if (!bo) 20.168 -- return NULL; 20.169 -- 20.170 -- ret = drm_intel_gem_bo_set_tiling(bo, tiling_mode, stride); 20.171 -- if (ret != 0) { 20.172 -- drm_intel_gem_bo_unreference(bo); 20.173 -- return NULL; 20.174 -- } 20.175 -- 20.176 - *pitch = stride; 20.177 - 20.178 -- return bo; 20.179 -+ if (tiling == I915_TILING_NONE) 20.180 -+ stride = 0; 20.181 -+ 20.182 -+ return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags, 20.183 -+ tiling, stride); 20.184 - } 20.185 - 20.186 - /** 20.187 -@@ -791,6 +813,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr, 20.188 - } 20.189 - bo_gem->tiling_mode = get_tiling.tiling_mode; 20.190 - bo_gem->swizzle_mode = get_tiling.swizzle_mode; 20.191 -+ /* XXX stride is unknown */ 20.192 - drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); 20.193 - 20.194 - DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name); 20.195 -@@ -829,6 +852,9 @@ drm_intel_gem_cleanup_bo_cache(drm_intel_bufmgr_gem *bufmgr_gem, time_t time) 20.196 - { 20.197 - int i; 20.198 - 20.199 -+ if (bufmgr_gem->time == time) 20.200 -+ return; 20.201 -+ 20.202 - for (i = 0; i < bufmgr_gem->num_buckets; i++) { 20.203 - struct drm_intel_gem_bo_bucket *bucket = 20.204 - &bufmgr_gem->cache_bucket[i]; 20.205 -@@ -846,6 +872,8 @@ drm_intel_gem_cleanup_bo_cache(drm_intel_bufmgr_gem *bufmgr_gem, time_t time) 20.206 - drm_intel_gem_bo_free(&bo_gem->bo); 20.207 - } 20.208 - } 20.209 -+ 20.210 -+ bufmgr_gem->time = time; 20.211 - } 20.212 - 20.213 - static void 20.214 -@@ -854,7 +882,6 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time) 20.215 - drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; 20.216 - drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; 20.217 - struct drm_intel_gem_bo_bucket *bucket; 20.218 -- uint32_t tiling_mode; 20.219 - int i; 20.220 - 20.221 - /* Unreference all the target buffers */ 20.222 -@@ -883,9 +910,7 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time) 20.223 - 20.224 - bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size); 20.225 - /* Put the buffer into our internal cache for reuse if we can. */ 20.226 -- tiling_mode = I915_TILING_NONE; 20.227 - if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL && 20.228 -- drm_intel_gem_bo_set_tiling(bo, &tiling_mode, 0) == 0 && 20.229 - drm_intel_gem_bo_madvise_internal(bufmgr_gem, bo_gem, 20.230 - I915_MADV_DONTNEED)) { 20.231 - bo_gem->free_time = time; 20.232 -@@ -894,8 +919,6 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time) 20.233 - bo_gem->validate_index = -1; 20.234 - 20.235 - DRMLISTADDTAIL(&bo_gem->head, &bucket->head); 20.236 -- 20.237 -- drm_intel_gem_cleanup_bo_cache(bufmgr_gem, time); 20.238 - } else { 20.239 - drm_intel_gem_bo_free(bo); 20.240 - } 20.241 -@@ -925,6 +948,7 @@ static void drm_intel_gem_bo_unreference(drm_intel_bo *bo) 20.242 - 20.243 - pthread_mutex_lock(&bufmgr_gem->lock); 20.244 - drm_intel_gem_bo_unreference_final(bo, time.tv_sec); 20.245 -+ drm_intel_gem_cleanup_bo_cache(bufmgr_gem, time.tv_sec); 20.246 - pthread_mutex_unlock(&bufmgr_gem->lock); 20.247 - } 20.248 - } 20.249 -@@ -982,12 +1006,9 @@ static int drm_intel_gem_bo_map(drm_intel_bo *bo, int write_enable) 20.250 - &set_domain); 20.251 - } while (ret == -1 && errno == EINTR); 20.252 - if (ret != 0) { 20.253 -- ret = -errno; 20.254 - fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n", 20.255 - __FILE__, __LINE__, bo_gem->gem_handle, 20.256 - strerror(errno)); 20.257 -- pthread_mutex_unlock(&bufmgr_gem->lock); 20.258 -- return ret; 20.259 - } 20.260 - 20.261 - pthread_mutex_unlock(&bufmgr_gem->lock); 20.262 -@@ -1062,9 +1083,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo) 20.263 - DRM_IOCTL_I915_GEM_SET_DOMAIN, 20.264 - &set_domain); 20.265 - } while (ret == -1 && errno == EINTR); 20.266 -- 20.267 - if (ret != 0) { 20.268 -- ret = -errno; 20.269 - fprintf(stderr, "%s:%d: Error setting domain %d: %s\n", 20.270 - __FILE__, __LINE__, bo_gem->gem_handle, 20.271 - strerror(errno)); 20.272 -@@ -1072,7 +1091,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo) 20.273 - 20.274 - pthread_mutex_unlock(&bufmgr_gem->lock); 20.275 - 20.276 -- return ret; 20.277 -+ return 0; 20.278 - } 20.279 - 20.280 - int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo) 20.281 -@@ -1587,7 +1606,7 @@ drm_intel_gem_bo_mrb_exec2(drm_intel_bo *bo, int used, 20.282 - 20.283 - if (ret != 0) { 20.284 - ret = -errno; 20.285 -- if (ret == -ENOMEM) { 20.286 -+ if (ret == -ENOSPC) { 20.287 - fprintf(stderr, 20.288 - "Execbuffer fails to pin. " 20.289 - "Estimate: %u. Actual: %u. Available: %u\n", 20.290 -@@ -1671,34 +1690,56 @@ drm_intel_gem_bo_unpin(drm_intel_bo *bo) 20.291 - } 20.292 - 20.293 - static int 20.294 --drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode, 20.295 -- uint32_t stride) 20.296 -+drm_intel_gem_bo_set_tiling_internal(drm_intel_bo *bo, 20.297 -+ uint32_t tiling_mode, 20.298 -+ uint32_t stride) 20.299 - { 20.300 - drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; 20.301 - drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; 20.302 - struct drm_i915_gem_set_tiling set_tiling; 20.303 - int ret; 20.304 - 20.305 -- if (bo_gem->global_name == 0 && *tiling_mode == bo_gem->tiling_mode) 20.306 -+ if (bo_gem->global_name == 0 && 20.307 -+ tiling_mode == bo_gem->tiling_mode && 20.308 -+ stride == bo_gem->stride) 20.309 - return 0; 20.310 - 20.311 - memset(&set_tiling, 0, sizeof(set_tiling)); 20.312 -- set_tiling.handle = bo_gem->gem_handle; 20.313 -- 20.314 - do { 20.315 -- set_tiling.tiling_mode = *tiling_mode; 20.316 -+ set_tiling.handle = bo_gem->gem_handle; 20.317 -+ set_tiling.tiling_mode = tiling_mode; 20.318 - set_tiling.stride = stride; 20.319 - 20.320 - ret = ioctl(bufmgr_gem->fd, 20.321 - DRM_IOCTL_I915_GEM_SET_TILING, 20.322 - &set_tiling); 20.323 - } while (ret == -1 && errno == EINTR); 20.324 -- if (ret == 0) { 20.325 -- bo_gem->tiling_mode = set_tiling.tiling_mode; 20.326 -- bo_gem->swizzle_mode = set_tiling.swizzle_mode; 20.327 -+ if (ret == -1) 20.328 -+ return -errno; 20.329 -+ 20.330 -+ bo_gem->tiling_mode = set_tiling.tiling_mode; 20.331 -+ bo_gem->swizzle_mode = set_tiling.swizzle_mode; 20.332 -+ bo_gem->stride = set_tiling.stride; 20.333 -+ return 0; 20.334 -+} 20.335 -+ 20.336 -+static int 20.337 -+drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode, 20.338 -+ uint32_t stride) 20.339 -+{ 20.340 -+ drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; 20.341 -+ drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; 20.342 -+ int ret; 20.343 -+ 20.344 -+ /* Linear buffers have no stride. By ensuring that we only ever use 20.345 -+ * stride 0 with linear buffers, we simplify our code. 20.346 -+ */ 20.347 -+ if (*tiling_mode == I915_TILING_NONE) 20.348 -+ stride = 0; 20.349 -+ 20.350 -+ ret = drm_intel_gem_bo_set_tiling_internal(bo, *tiling_mode, stride); 20.351 -+ if (ret == 0) 20.352 - drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); 20.353 -- } else 20.354 -- ret = -errno; 20.355 - 20.356 - *tiling_mode = bo_gem->tiling_mode; 20.357 - return ret; 20.358 -diff --git a/xf86drmMode.c b/xf86drmMode.c 20.359 -index f330e6f..ecb1fd5 100644 20.360 ---- a/xf86drmMode.c 20.361 -+++ b/xf86drmMode.c 20.362 -@@ -52,6 +52,12 @@ 20.363 - #define U642VOID(x) ((void *)(unsigned long)(x)) 20.364 - #define VOID2U64(x) ((uint64_t)(unsigned long)(x)) 20.365 - 20.366 -+static inline DRM_IOCTL(int fd, int cmd, void *arg) 20.367 -+{ 20.368 -+ int ret = drmIoctl(fd, cmd, arg); 20.369 -+ return ret < 0 ? -errno : ret; 20.370 -+} 20.371 -+ 20.372 - /* 20.373 - * Util functions 20.374 - */ 20.375 -@@ -242,7 +248,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, 20.376 - f.depth = depth; 20.377 - f.handle = bo_handle; 20.378 - 20.379 -- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_ADDFB, &f))) 20.380 -+ if ((ret = DRM_IOCTL(fd, DRM_IOCTL_MODE_ADDFB, &f))) 20.381 - return ret; 20.382 - 20.383 - *buf_id = f.fb_id; 20.384 -@@ -251,7 +257,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth, 20.385 - 20.386 - int drmModeRmFB(int fd, uint32_t bufferId) 20.387 - { 20.388 -- return drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId); 20.389 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, &bufferId); 20.390 - 20.391 - 20.392 - } 20.393 -@@ -289,7 +295,7 @@ int drmModeDirtyFB(int fd, uint32_t bufferId, 20.394 - dirty.clips_ptr = VOID2U64(clips); 20.395 - dirty.num_clips = num_clips; 20.396 - 20.397 -- return drmIoctl(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty); 20.398 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty); 20.399 - } 20.400 - 20.401 - 20.402 -@@ -344,7 +350,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId, 20.403 - } else 20.404 - crtc.mode_valid = 0; 20.405 - 20.406 -- return drmIoctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc); 20.407 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETCRTC, &crtc); 20.408 - } 20.409 - 20.410 - /* 20.411 -@@ -361,7 +367,7 @@ int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t width 20.412 - arg.height = height; 20.413 - arg.handle = bo_handle; 20.414 - 20.415 -- return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg); 20.416 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg); 20.417 - } 20.418 - 20.419 - int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y) 20.420 -@@ -373,7 +379,7 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y) 20.421 - arg.x = x; 20.422 - arg.y = y; 20.423 - 20.424 -- return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg); 20.425 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg); 20.426 - } 20.427 - 20.428 - /* 20.429 -@@ -510,7 +516,7 @@ int drmModeAttachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_inf 20.430 - memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo)); 20.431 - res.connector_id = connector_id; 20.432 - 20.433 -- return drmIoctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res); 20.434 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_ATTACHMODE, &res); 20.435 - } 20.436 - 20.437 - int drmModeDetachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_info) 20.438 -@@ -520,7 +526,7 @@ int drmModeDetachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_inf 20.439 - memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo)); 20.440 - res.connector_id = connector_id; 20.441 - 20.442 -- return drmIoctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res); 20.443 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE, &res); 20.444 - } 20.445 - 20.446 - 20.447 -@@ -637,16 +643,12 @@ int drmModeConnectorSetProperty(int fd, uint32_t connector_id, uint32_t property 20.448 - uint64_t value) 20.449 - { 20.450 - struct drm_mode_connector_set_property osp; 20.451 -- int ret; 20.452 - 20.453 - osp.connector_id = connector_id; 20.454 - osp.prop_id = property_id; 20.455 - osp.value = value; 20.456 - 20.457 -- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp))) 20.458 -- return ret; 20.459 -- 20.460 -- return 0; 20.461 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp); 20.462 - } 20.463 - 20.464 - /* 20.465 -@@ -715,7 +717,6 @@ int drmCheckModesettingSupported(const char *busid) 20.466 - int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, 20.467 - uint16_t *red, uint16_t *green, uint16_t *blue) 20.468 - { 20.469 -- int ret; 20.470 - struct drm_mode_crtc_lut l; 20.471 - 20.472 - l.crtc_id = crtc_id; 20.473 -@@ -724,16 +725,12 @@ int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, 20.474 - l.green = VOID2U64(green); 20.475 - l.blue = VOID2U64(blue); 20.476 - 20.477 -- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_GETGAMMA, &l))) 20.478 -- return ret; 20.479 -- 20.480 -- return 0; 20.481 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_GETGAMMA, &l); 20.482 - } 20.483 - 20.484 - int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size, 20.485 - uint16_t *red, uint16_t *green, uint16_t *blue) 20.486 - { 20.487 -- int ret; 20.488 - struct drm_mode_crtc_lut l; 20.489 - 20.490 - l.crtc_id = crtc_id; 20.491 -@@ -742,10 +739,7 @@ int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size, 20.492 - l.green = VOID2U64(green); 20.493 - l.blue = VOID2U64(blue); 20.494 - 20.495 -- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETGAMMA, &l))) 20.496 -- return ret; 20.497 -- 20.498 -- return 0; 20.499 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETGAMMA, &l); 20.500 - } 20.501 - 20.502 - int drmHandleEvent(int fd, drmEventContextPtr evctx) 20.503 -@@ -810,5 +804,5 @@ int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, 20.504 - flip.flags = flags; 20.505 - flip.reserved = 0; 20.506 - 20.507 -- return drmIoctl(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip); 20.508 -+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip); 20.509 - }
21.1 --- a/pixman-dev/receipt Wed Feb 22 11:00:54 2017 +0200 21.2 +++ b/pixman-dev/receipt Thu Feb 23 00:58:26 2017 +0200 21.3 @@ -1,12 +1,12 @@ 21.4 # SliTaz package receipt. 21.5 21.6 PACKAGE="pixman-dev" 21.7 -VERSION="0.32.6" 21.8 +VERSION="0.34.0" 21.9 CATEGORY="development" 21.10 SHORT_DESC="Pixman library devel files" 21.11 MAINTAINER="pankso@slitaz.org" 21.12 LICENSE="MIT" 21.13 -WEB_SITE="http://www.cairographics.org/" 21.14 +WEB_SITE="https://www.cairographics.org/" 21.15 HOST_ARCH="i486 arm" 21.16 21.17 WANTED="pixman" 21.18 @@ -15,8 +15,5 @@ 21.19 # Rules to gen a SliTaz package suitable for Tazpkg. 21.20 genpkg_rules() 21.21 { 21.22 - mkdir -p $fs/usr/lib 21.23 - cp -a $install/usr/include $fs/usr 21.24 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 21.25 - cp -a $install/usr/lib/*.*a $fs/usr/lib 21.26 + cook_copy_files *.h *.la *.pc 21.27 }
22.1 --- a/pixman/receipt Wed Feb 22 11:00:54 2017 +0200 22.2 +++ b/pixman/receipt Thu Feb 23 00:58:26 2017 +0200 22.3 @@ -1,16 +1,17 @@ 22.4 # SliTaz package receipt. 22.5 22.6 PACKAGE="pixman" 22.7 -VERSION="0.32.6" 22.8 +VERSION="0.34.0" 22.9 CATEGORY="x-window" 22.10 SHORT_DESC="Pixel-manipulation library for X and Cairo" 22.11 MAINTAINER="pankso@slitaz.org" 22.12 LICENSE="MIT" 22.13 +WEB_SITE="https://www.cairographics.org/" 22.14 +HOST_ARCH="i486 arm" 22.15 + 22.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 22.17 -WEB_SITE="http://www.cairographics.org/" 22.18 #WGET_URL="$XORG_MIRROR/lib/$TARBALL" 22.19 WGET_URL="${WEB_SITE}releases/$TARBALL" 22.20 -HOST_ARCH="i486 arm" 22.21 22.22 DEPENDS="glibc-base" 22.23 BUILD_DEPENDS="libpng-dev" 22.24 @@ -21,6 +22,7 @@ 22.25 ./configure \ 22.26 --enable-gtk=no \ 22.27 --enable-libpng \ 22.28 + --disable-static \ 22.29 $CONFIGURE_ARGS && 22.30 make && 22.31 make install 22.32 @@ -29,6 +31,5 @@ 22.33 # Rules to gen a SliTaz package suitable for Tazpkg. 22.34 genpkg_rules() 22.35 { 22.36 - mkdir -p $fs/usr/lib 22.37 - cp -a $install/usr/lib/*.so* $fs/usr/lib 22.38 + cook_copy_files *.so* 22.39 }
23.1 --- a/xorg-glproto/receipt Wed Feb 22 11:00:54 2017 +0200 23.2 +++ b/xorg-glproto/receipt Thu Feb 23 00:58:26 2017 +0200 23.3 @@ -12,7 +12,7 @@ 23.4 TARBALL="glproto-$VERSION.tar.bz2" 23.5 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 23.6 23.7 -DEPENDS="xorg-xproto mesa-dev pkg-config" 23.8 +DEPENDS="xorg-xproto" 23.9 BUILD_DEPENDS="xorg-util-macros" 23.10 23.11 # Rules to configure and make the package.