Merge remote-tracking branch 'volkerdi/master'HEADmaster

5 files changed, 28 insertions, 25 deletions

diff --git a/n/openssl/openssl-1.0.1j.tar.gz.asc b/n/openssl/openssl-1.0.1j.tar.gz.asc
deleted file mode 100644
index 034cd29..0000000
--- a/n/openssl/openssl-1.0.1j.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJUPm6ZAAoJENnE0m0OYESRnTMH/3C0nbnYzAn5mO+PIZUs/yJ5
-DWFKNY4nUeJDuI6V1M95qhnQVn4ae3ikCQeXXVQEMMeWf2giATGJAmt0bJsyylfE
-M/q9K6/hyshJDMXNWK0BvoC/XjE5ohwZQEFHjqvcS1+ednOsuLoBPNslghA2CNTC
-8+iv9+eOMcTJyraEh09jjCzn7WNaL2IMyvx1b7xtj4zvZ6chVEoqSSYM820NdqZQ
-1xoClVOXn/IEkoUOG81NgzsMol7AjPM8AVeG7UGHqqKy/TGKHAiik6gpLjOpGpzv
-iyU7nMzK+YhWU1UgJdXu7De0FjekTFgZgHCANdw1FmPcGpiXJsZcY+jPaYNCouQ=
-=h6ga
------END PGP SIGNATURE-----
diff --git a/n/openssl/openssl-1.0.1k.tar.gz.asc b/n/openssl/openssl-1.0.1k.tar.gz.asc
new file mode 100644
index 0000000..27cd786
--- /dev/null
+++ b/n/openssl/openssl-1.0.1k.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJUro4+AAoJENnE0m0OYESRdWQH/0h7DRno0VcesRBkHE0S8zyt
+DNbIyJ2QwyhFw3yKvUcau2qP6DCAi+6Fcs/MONRI6uRAN7NWxsROBstkjIVEWLq/
+fvhF27QWGCEUB9iYIk00dOtISGpUBuB0e5goOH5Gyb89c10wPkDa5ZLpAavZxzne
+BFdfXQU624nt8D4k2Can9JIme3QCr6LgxVQhbU7pmXQN+dFOv8Bza9Fnm5sfo2fP
+MDZNOIJusCpu15lSyJdoKpkCFy2OaQrDw6h/VAWfHENdklbkWJtCsJIV5zL6OlWn
+2+6hABhE0ErmS3ax9uhWbDW9/Z0fz6WLSRGuWOVHb1ighzOj7K4WgTdMILcINQg=
+=kQEU
+-----END PGP SIGNATURE-----
diff --git a/n/openssl/openssl0/openssl-0.9.8zc.tar.gz.asc b/n/openssl/openssl0/openssl-0.9.8zc.tar.gz.asc
deleted file mode 100644
index 528fd09..0000000
--- a/n/openssl/openssl0/openssl-0.9.8zc.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJUPm02AAoJENnE0m0OYESRGW0IALSPAfr5hpZwuktYojERPifz
-uD4ZYk67tGFffAhhkV09P57m2ahPO8f+7lG1aHmKr+/OiI8PPaTd3wetF9Nt5S1n
-dfptpmUPx/wFLvatD55litJtf4AmNhb5g+rvC8PSr9VaBvpudtoJVd+b22f8lCMc
-YoGBkg/AeTjvA1ddSCdMFTvlcjx4Z/BL3KHZldB9aoNs68ByDzFkbe9pW4uK3k8C
-Timj2HIS06HOVfEpnySk+iXMLXuEWAmlY6BsI3Ij2dTgJpAlN/vIRLb+aG9sO38W
-R1BxfbMsBPVBEQFGY/iTYIe2Ohyl/UoGLHfvMD3BYE8nTuSDuda/AIJ9AcIrMZ4=
-=1i6h
------END PGP SIGNATURE-----
diff --git a/n/openssl/openssl0/openssl-0.9.8zd.tar.gz.asc b/n/openssl/openssl0/openssl-0.9.8zd.tar.gz.asc
new file mode 100644
index 0000000..ae9dcca
--- /dev/null
+++ b/n/openssl/openssl0/openssl-0.9.8zd.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJUrpVNAAoJENnE0m0OYESRU8gH/1CrBXxPBd5xdixxZfp5g3F1
+6VPUHcnBk/Q8jFeD8LGfsdZ4vAQhsg6hLdCSyNSNbkLOw86ec/lKhMzgnnWGtSXW
+N7Pr93PU6mSVd/kEBg0m3JQNNyQbHPT0pkIDgJ2pyofx9ulIGhzGQhOZ5MY69du1
+NKrMGqufwH6K9KZpONnZCp9I3PSWPKDj67M04mmvdHlmrXTXqy6ErtayS57G5+it
+YFc1SfFWFz+I/RI470Yw/GI2lklbouxG7XvADLXAqXBw2b8I3HYGag0MVNmRnwpG
+D6rjYX2k1Z2X8mghiWTn35YYCmy1qpdZ9YCDrRBhcRiFsLEZ+V+6djo0wXMKXfM=
+=wrb0
+-----END PGP SIGNATURE-----
diff --git a/x/mesa/mesa.SlackBuild b/x/mesa/mesa.SlackBuild
index c86eef8..617f90f 100755
--- a/x/mesa/mesa.SlackBuild
+++ b/x/mesa/mesa.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=mesa
-VERSION=10.2.6
+VERSION=10.3.5
 DEMOVERS=8.2.0
 BUILD=${BUILD:-1}
 
@@ -77,13 +77,15 @@ find . \
 # Apply patches from git (and maybe elsewhere):
 # Patches obtained by:
 #   git checkout origin/10.2
-#   git format-patch 816d37e5c59b50167e0b13c5e290a08f04ee166c.. # 10.2.4 release
+#   git format-patch b14b3e678f011591ef7972fb61263bb202082add.. # 10.2.7 release
 if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
   for patch in $CWD/patches/*.patch ; do
     patch -p1 < $patch || exit 1 ; 
   done
 fi
 
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -99,7 +101,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-llvm-shared-libs \
   --enable-egl \
   --enable-texture-float \
-  --disable-gallium-egl \
+  --enable-gallium-egl \
   --enable-shared-glapi \
   --enable-xa \
   --enable-osmesa \
@@ -112,6 +114,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-glx-tls \
   --enable-gles1 \
   --enable-gles2 \
+  --enable-vdpau \
   --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1