diff --git a/multimedia/dvdbackup/README b/multimedia/dvdbackup/README index 1e9c1fd8cf..7b398dfdbd 100644 --- a/multimedia/dvdbackup/README +++ b/multimedia/dvdbackup/README @@ -6,11 +6,6 @@ underscores with spaces and converting to "Proper Case". To turn this "feature" off and retain the original VOLUME_ID formatting, pass CLOBBER="no" to the script. -For those who wish to test this on current (15.0 EXPERIMENTAL), -pass CURRENT="yes" to the script. Just bear in mind that -functions -M, (mirror entire disc), -T (mirror titleset) -and -F (main feature) are nonfunctional ATM under current. - NOTE: Copyright laws vary from nation to nation, so bear in mind that this program is only intended for personal backups. diff --git a/multimedia/dvdbackup/dvdbackup.SlackBuild b/multimedia/dvdbackup/dvdbackup.SlackBuild index 8ada2fb78e..7eeca58d1f 100644 --- a/multimedia/dvdbackup/dvdbackup.SlackBuild +++ b/multimedia/dvdbackup/dvdbackup.SlackBuild @@ -55,8 +55,6 @@ else LIBDIRSUFFIX="" fi -CURRENT=${CURRENT:-"no"} - set -e rm -rf $PKG @@ -81,17 +79,10 @@ fi patch -p0 < $CWD/patches/do_not_treat_automake_warnings_as_errors.patch patch -p0 < $CWD/patches/remove_PATH_MAX_limitation.patch -# Patch for the new libdvdread -if [ "$CURRENT" = "yes" ]; then - patch -p1 < $CWD/patches/dvdbackup-build-with-new-libdvdread.patch -fi - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -100,8 +91,8 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +# | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done @@ -111,11 +102,6 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -if [ "$CURRENT" = "yes" ]; then - # Don't ship .la files: - rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -fi - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc