diff options
Diffstat (limited to 'system/udftools')
| -rw-r--r-- | system/udftools/fix-compiler-errors.patch | 143 | ||||
| -rw-r--r-- | system/udftools/udftools-1.0.0b3-gcc5.patch | 13 | ||||
| -rw-r--r-- | system/udftools/udftools.SlackBuild | 26 | ||||
| -rw-r--r-- | system/udftools/udftools.exclude | 6 | ||||
| -rw-r--r-- | system/udftools/udftools.info | 6 |
5 files changed, 15 insertions, 179 deletions
diff --git a/system/udftools/fix-compiler-errors.patch b/system/udftools/fix-compiler-errors.patch deleted file mode 100644 index e6db4e808d..0000000000 --- a/system/udftools/fix-compiler-errors.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- udftools-1.0.0b3.orig/cdrwtool/cdrwtool.c 2002-12-28 15:48:51.000000000 +1100 -+++ udftools-1.0.0b3/cdrwtool/cdrwtool.c 2013-03-09 16:28:32.685490490 +1100 -@@ -27,6 +27,7 @@ - #include <unistd.h> - #include <getopt.h> - #include <signal.h> -+#include <limits.h> - - #include <sys/ioctl.h> - #include <asm/param.h> ---- udftools-1.0.0b3.orig/cdrwtool/main.c 2004-02-23 14:33:11.000000000 +1100 -+++ udftools-1.0.0b3/cdrwtool/main.c 2013-03-09 16:27:35.630406411 +1100 -@@ -30,6 +30,7 @@ - #include <time.h> - #include <sys/time.h> - #include <errno.h> -+#include <string.h> - - #include "cdrwtool.h" - #include "defaults.h" ---- udftools-1.0.0b3.orig/cdrwtool/options.c 2003-10-24 11:16:04.000000000 +1000 -+++ udftools-1.0.0b3/cdrwtool/options.c 2013-03-09 16:27:49.846422176 +1100 -@@ -23,6 +23,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <malloc.h> -+#include <string.h> - - #include "cdrwtool.h" - #include "libudffs.h" ---- udftools-1.0.0b3.orig/include/udf_endian.h 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/include/udf_endian.h 2013-03-09 16:24:42.000920607 +1100 -@@ -23,6 +23,7 @@ - #ifndef __UDF_ENDIAN_H - #define __UDF_ENDIAN_H - -+#include <string.h> - #include "bswap.h" - - static inline lb_addr lelb_to_cpu(lb_addr in) ---- udftools-1.0.0b3.orig/libudffs/file.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/libudffs/file.c 2013-03-09 16:25:21.175013609 +1100 -@@ -21,6 +21,7 @@ - */ - - #include <malloc.h> -+#include <string.h> - - #include "libudffs.h" - #include "defaults.h" ---- udftools-1.0.0b3.orig/libudffs/unicode.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/libudffs/unicode.c 2013-03-09 16:25:59.433223040 +1100 -@@ -20,6 +20,8 @@ - * - */ - -+#include <string.h> -+ - #include "libudffs.h" - #include "defaults.h" - #include "config.h" ---- udftools-1.0.0b3.orig/mkudffs/main.c 2004-02-23 14:33:11.000000000 +1100 -+++ udftools-1.0.0b3/mkudffs/main.c 2013-03-09 16:26:27.967171881 +1100 -@@ -31,6 +31,7 @@ - #include <sys/time.h> - #include <errno.h> - #include <limits.h> -+#include <string.h> - - #include "mkudffs.h" - #include "defaults.h" ---- udftools-1.0.0b3.orig/mkudffs/mkudffs.c 2004-02-23 14:35:33.000000000 +1100 -+++ udftools-1.0.0b3/mkudffs/mkudffs.c 2013-03-09 16:26:55.098244722 +1100 -@@ -30,6 +30,7 @@ - #include <time.h> - #include <sys/time.h> - #include <errno.h> -+#include <string.h> - - #include "mkudffs.h" - #include "defaults.h" ---- udftools-1.0.0b3.orig/mkudffs/options.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/mkudffs/options.c 2013-03-09 16:27:17.188691854 +1100 -@@ -24,6 +24,7 @@ - #include <stdlib.h> - #include <getopt.h> - #include <malloc.h> -+#include <string.h> - - #include "mkudffs.h" - #include "defaults.h" ---- udftools-1.0.0b3.orig/pktsetup/pktsetup.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/pktsetup/pktsetup.c 2013-03-09 16:30:53.851742260 +1100 -@@ -23,6 +23,7 @@ - #include <getopt.h> - #include <bits/types.h> - #include <sys/types.h> -+#include <limits.h> - - #include <linux/cdrom.h> - ---- udftools-1.0.0b3.orig/wrudf/ide-pc.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/wrudf/ide-pc.c 2013-03-09 16:29:57.634001857 +1100 -@@ -31,6 +31,7 @@ - #include <sys/types.h> /* for u_char etc. */ - #include <linux/cdrom.h> - #include <unistd.h> /* sleep() */ -+#include <stdlib.h> - - #include "bswap.h" - #include "ide-pc.h" ---- udftools-1.0.0b3.orig/wrudf/wrudf-cdr.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/wrudf/wrudf-cdr.c 2013-03-09 16:31:43.156091936 +1100 -@@ -6,6 +6,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <string.h> -+ - #include "wrudf.h" - #include "ide-pc.h" - #include "bswap.h" ---- udftools-1.0.0b3.orig/wrudf/wrudf-cdrw.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/wrudf/wrudf-cdrw.c 2013-03-09 16:29:05.652037738 +1100 -@@ -31,6 +31,7 @@ - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <linux/cdrom.h> /* for CDROM_DRIVE_STATUS */ -+#include <string.h> - - #include "wrudf.h" - #include "ide-pc.h" ---- udftools-1.0.0b3.orig/wrudf/wrudf.c 2002-11-26 18:18:51.000000000 +1100 -+++ udftools-1.0.0b3/wrudf/wrudf.c 2013-03-09 16:31:10.001538000 +1100 -@@ -245,7 +245,7 @@ - } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 ) - virtualPartitionNum = i; - } -- (char*)spm += spm->partitionMapLength; -+ spm += spm->partitionMapLength; - } - - if( medium == CDR ) { diff --git a/system/udftools/udftools-1.0.0b3-gcc5.patch b/system/udftools/udftools-1.0.0b3-gcc5.patch deleted file mode 100644 index 244683c5b0..0000000000 --- a/system/udftools/udftools-1.0.0b3-gcc5.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- udftools-1.0.0b3/include/libudffs.h 2004-02-23 04:33:11.000000000 +0100 -+++ udftools-1.0.0b3/include/libudffs.h 2015-06-27 18:53:17.000000000 +0200 -@@ -169,8 +169,8 @@ - struct udf_data *alloc_data(void *, int); - - /* desc.c */ --inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *); --inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *); -+extern inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *); -+extern inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *); - - /* file.c */ - tag query_tag(struct udf_disc *, struct udf_extent *, struct udf_desc *, uint16_t); diff --git a/system/udftools/udftools.SlackBuild b/system/udftools/udftools.SlackBuild index 8f209ab7a5..071685fc83 100644 --- a/system/udftools/udftools.SlackBuild +++ b/system/udftools/udftools.SlackBuild @@ -22,13 +22,13 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=udftools -VERSION=${VERSION:-1.0.0b3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" @@ -63,15 +63,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -patch -p1 < $CWD/fix-compiler-errors.patch - -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778153 -patch -p1 < $CWD/udftools-1.0.0b3-gcc5.patch + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -86,6 +81,9 @@ 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/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 diff --git a/system/udftools/udftools.exclude b/system/udftools/udftools.exclude deleted file mode 100644 index 26e04de8f3..0000000000 --- a/system/udftools/udftools.exclude +++ /dev/null @@ -1,6 +0,0 @@ -udftools/udftools-1.0.0b3 -udftools/udftools-1.0.0b3.orig -udftools/udftools-1.0.0b3.tar.gz -udftools/*.log -udftools/*~ -udftools/zzz-config.help diff --git a/system/udftools/udftools.info b/system/udftools/udftools.info index a8bed5bc11..523b61fabc 100644 --- a/system/udftools/udftools.info +++ b/system/udftools/udftools.info @@ -1,8 +1,8 @@ PRGNAM="udftools" -VERSION="1.0.0b3" +VERSION="2.3" HOMEPAGE="https://sourceforge.net/projects/linux-udf/" -DOWNLOAD="https://downloads.sourceforge.net/project/linux-udf/udftools/1.0.0b3/udftools-1.0.0b3.tar.gz" -MD5SUM="2f491ddd63f31040797236fe18db9e60" +DOWNLOAD="https://github.com/pali/udftools/releases/download/2.3/udftools-2.3.tar.gz" +MD5SUM="eada8dd40a675763ec71c35655cfd85e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |