Slackware 14.2slackware-14.2

Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!

The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2.  The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system.  Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Have fun!  :-)

2 files changed, 9 insertions, 27 deletions

diff --git a/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff b/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff
deleted file mode 100644
index fe65dabdb..000000000
--- a/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c libgphoto2-2.4.11/packaging/generic/print-camera-list.c
---- libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c	2011-04-06 16:42:09.000000000 -0500
-+++ libgphoto2-2.4.11/packaging/generic/print-camera-list.c	2011-12-10 20:31:37.621092267 -0600
-@@ -409,7 +409,7 @@
- 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n"
- 		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n"
- 		"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n"
--		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n"
-+		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n"
- 		/* ignore mass storage class having devices in mark-up */
- 		"ENV{ID_USB_INTERFACES}==\"*:08*:*\", GOTO=\"libgphoto2_usb_end\"\n"
- 		/* shortcut the most common camera driver, ptp class, so we avoid parsing 1000
diff --git a/source/l/libgphoto2/libgphoto2.SlackBuild b/source/l/libgphoto2/libgphoto2.SlackBuild
index f4b823c24..ccfb26203 100755
--- a/source/l/libgphoto2/libgphoto2.SlackBuild
+++ b/source/l/libgphoto2/libgphoto2.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ BUILD=${BUILD:-1}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -38,8 +38,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,9 +72,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# udev-175 bundles usb_id into the udevd binary
-zcat $CWD/fix-usb_id-callout-for-udev-175.diff.gz | patch -p1 || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -112,16 +109,13 @@ LD_LIBRARY_PATH=$PKG/usr/lib${LIBDIRSUFFIX}
 CAMLIBS=$PKG/usr/lib${LIBDIRSUFFIX}/$PKGNAM/$VERSION 
 LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX}
 export LD_LIBRARY_PATH CAMLIBS LIBDIR
-# Generate udev rules
+# Generate udev rules -- for udev <= 200
 mkdir -p $PKG/lib/udev/rules.d
-$PKG/usr/bin/print-camera-list udev-rules version 136 mode 0660 owner root group plugdev \
+$PKG/usr/bin/print-camera-list udev-rules version 175 mode 0660 owner root group plugdev \
   > $PKG/lib/udev/rules.d/40-libgphoto2.rules
-# Generate fdi files
-mkdir -p $PKG/usr/share/hal/fdi/information/20thirdparty
-$PKG/usr/bin/print-camera-list hal-fdi \
-  > $PKG/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-$PKG/usr/bin/print-camera-list hal-fdi-device \
-  > $PKG/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi
+# For udev >= 201
+mkdir -p $PKG/lib/udev/hwdb.d/
+$PKG/usr/bin/print-camera-list hwdb > $PKG/lib/udev/hwdb.d/20-gphoto.conf
 unset LD_LIBRARY_PATH CAMLIBS LIBDIR   # Unset these just in case
 
 # Compress and link manpages, if any: