wok-next rev 20328
Up libextractor, libmad, liboil, pciids, pciutils
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Tue Nov 14 03:01:24 2017 +0200 (2017-11-14) |
parents | 77cced9ad887 |
children | 0b3c35d905d2 |
files | libextractor-dev/receipt libextractor/receipt libmad-dev/receipt libmad/receipt libmad/stuff/patches/amd64-64bit.diff libmad/stuff/patches/frame_length.diff libmad/stuff/patches/libmad.patch libmad/stuff/patches/makefile.patch libmad/stuff/patches/optimize.diff libmad/stuff/patches/series liboil-dev/receipt liboil/receipt pciids/receipt pciutils-dev/receipt pciutils/receipt |
line diff
1.1 --- a/libextractor-dev/receipt Tue Nov 14 00:52:23 2017 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,22 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="libextractor-dev" 1.7 -VERSION="0.6.2" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="Extract meta data from files of arbitrary type, development files." 1.10 -MAINTAINER="pascal.bellard@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -WEB_SITE="http://www.gnu.org/software/libextractor" 1.13 -WANTED="libextractor" 1.14 - 1.15 -DEPENDS="libextractor pkg-config" 1.16 - 1.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.18 -genpkg_rules() 1.19 -{ 1.20 - mkdir -p $fs/usr/lib/libextractor 1.21 - cp -a $install/usr/include $fs/usr 1.22 - cp -a $install/usr/lib/*a $fs/usr/lib 1.23 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.24 - cp -a $install/usr/lib/libextractor/*a $fs/usr/lib/libextractor 1.25 -}
2.1 --- a/libextractor/receipt Tue Nov 14 00:52:23 2017 +0200 2.2 +++ b/libextractor/receipt Tue Nov 14 03:01:24 2017 +0200 2.3 @@ -1,34 +1,67 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="libextractor" 2.8 -VERSION="0.6.2" 2.9 -CATEGORY="network" 2.10 -SHORT_DESC="Extract meta data from files of arbitrary type." 2.11 +VERSION="1.6" 2.12 +CATEGORY="utilities" 2.13 +SHORT_DESC="Extract meta data from files of arbitrary type" 2.14 MAINTAINER="pascal.bellard@slitaz.org" 2.15 LICENSE="GPL2" 2.16 +WEB_SITE="https://www.gnu.org/software/libextractor/" 2.17 + 2.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.19 -WEB_SITE="http://www.gnu.org/software/libextractor" 2.20 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 2.21 2.22 -DEPENDS="zlib" 2.23 -BUILD_DEPENDS="libtool gettext zlib-dev flac-dev libogg-dev lcms-dev" 2.24 +BUILD_DEPENDS="libtool iso-codes libvorbis-dev flac-dev zlib-dev bzip2-dev \ 2.25 +libmpeg2-dev libjpeg-turbo-dev tiff-dev libarchive-dev exiv2-dev giflib-dev \ 2.26 +libmagic-dev tidy-dev gettext glib-dev gdk-pixbuf-dev libgsf-dev ffmpeg-dev" 2.27 +SPLIT="libextractor-archive libextractor-exiv2 libextractor-flac \ 2.28 +libextractor-gif libextractor-jpeg libextractor-mime libextractor-mpeg \ 2.29 +libextractor-ogg libextractor-ole2 libextractor-thumbnailffmpeg \ 2.30 +libextractor-thumbnailgtk libextractor-tiff libextractor libextractor-dev" 2.31 2.32 -# Rules to configure and make the package. 2.33 -compile_rules() 2.34 -{ 2.35 - cd $src 2.36 - ./configure --prefix=/usr --mandir=/usr/share/man \ 2.37 - --localstatedir=/var \ 2.38 +compile_rules() { 2.39 + ./configure \ 2.40 + --enable-shared \ 2.41 + --disable-static \ 2.42 $CONFIGURE_ARGS && 2.43 make -j 1 && 2.44 - make DESTDIR=$DESTDIR install 2.45 + make install 2.46 } 2.47 2.48 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.49 -genpkg_rules() 2.50 -{ 2.51 - mkdir -p $fs/usr/lib/libextractor 2.52 - cp -a $install/usr/bin $fs/usr 2.53 - cp -a $install/usr/lib/*.so* $fs/usr/lib 2.54 - cp -a $install/usr/lib/libextractor/*.so* $fs/usr/lib/libextractor 2.55 +genpkg_rules() { 2.56 + case $PACKAGE in 2.57 + libextractor) 2.58 + copy @std @rm 2.59 + DEPENDS="bzlib libltdl zlib" 2.60 + ;; 2.61 + *-dev) 2.62 + copy @dev 2.63 + DEPENDS="${SPLIT/$PACKAGE/} acl-dev attr-dev bzip2-dev curl-dev \ 2.64 + exiv2-dev expat-dev ffmpeg-dev flac-dev gdk-pixbuf-dev giflib-dev \ 2.65 + glib-dev libjpeg-turbo-dev libarchive-dev libffi-dev libgsf-dev \ 2.66 + libidn2-dev libmagic-dev libmpeg2-dev libogg-dev libpng16-dev \ 2.67 + libssh2-dev libtool libvorbis-dev libxml2-dev lz4-lib lzo-dev \ 2.68 + nettle-dev openssl-dev pcre-dev tiff-dev util-linux-blkid-dev \ 2.69 + util-linux-mount-dev util-linux-uuid-dev xz-dev zlib-dev" 2.70 + ;; 2.71 + *) 2.72 + copy libextractor_${PACKAGE/libextractor-/}.so 2.73 + CAT="utilities|${PACKAGE/libextractor-/} plugin" 2.74 + ;; 2.75 + esac 2.76 + 2.77 + case $PACKAGE in 2.78 + *-archive) DEPENDS="libarchive";; 2.79 + *-exiv2) DEPENDS="exiv2";; 2.80 + *-flac) DEPENDS="flac";; 2.81 + *-gif) DEPENDS="giflib";; 2.82 + *-jpeg) DEPENDS="libjpeg-turbo";; 2.83 + *-mime) DEPENDS="libmagic";; 2.84 + *-mpeg) DEPENDS="libmpeg2";; 2.85 + *-ogg) DEPENDS="libogg libvorbis";; 2.86 + *-ole2) DEPENDS="glib libextractor libgsf libxml2";; 2.87 + *ffmpeg) DEPENDS="ffmpeg libmagic";; 2.88 + *gtk) DEPENDS="gdk-pixbuf glib libmagic";; 2.89 + *-tiff) DEPENDS="tiff";; 2.90 + esac 2.91 }
3.1 --- a/libmad-dev/receipt Tue Nov 14 00:52:23 2017 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,39 +0,0 @@ 3.4 -# SliTaz package receipt. 3.5 - 3.6 -PACKAGE="libmad-dev" 3.7 -VERSION="0.15.1b" 3.8 -CATEGORY="development" 3.9 -SHORT_DESC="MAD is a high-quality MPEG audio decoder devel files." 3.10 -MAINTAINER="pankso@slitaz.org" 3.11 -LICENSE="GPL2" 3.12 -WANTED="libmad" 3.13 -WEB_SITE="http://www.underbit.com/products/mad/" 3.14 -HOST_ARCH="i486 arm" 3.15 - 3.16 -DEPENDS="libmad pkg-config" 3.17 - 3.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.19 -genpkg_rules() 3.20 -{ 3.21 - mkdir -p $fs/usr/lib 3.22 - cp -a $install/usr/include $fs/usr 3.23 - cp -a $install/usr/lib/*.*a $fs/usr/lib 3.24 - 3.25 - # mad.pc patch 3.26 - mkdir -p $fs/usr/lib/pkgconfig 3.27 - cat > $fs/usr/lib/pkgconfig/mad.pc << "EOF" 3.28 -prefix=/usr 3.29 -exec_prefix=${prefix} 3.30 -libdir=${exec_prefix}/lib 3.31 -includedir=${prefix}/include 3.32 - 3.33 -Name: mad 3.34 -Description: MPEG audio decoder 3.35 -Version: 0.15.1b 3.36 - 3.37 -Libs: -L${libdir} -lmad 3.38 -Cflags: -I${includedir} 3.39 -EOF 3.40 - 3.41 -} 3.42 -
4.1 --- a/libmad/receipt Tue Nov 14 00:52:23 2017 +0200 4.2 +++ b/libmad/receipt Tue Nov 14 03:01:24 2017 +0200 4.3 @@ -1,30 +1,35 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="libmad" 4.8 VERSION="0.15.1b" 4.9 CATEGORY="multimedia" 4.10 -SHORT_DESC="MAD is a high-quality MPEG audio decoder." 4.11 +SHORT_DESC="MPEG audio decoder library" 4.12 MAINTAINER="pankso@slitaz.org" 4.13 LICENSE="GPL2" 4.14 -TARBALL="$PACKAGE-$VERSION.tar.gz" 4.15 WEB_SITE="http://www.underbit.com/products/mad/" 4.16 -WGET_URL="$SF_MIRROR/mad/$TARBALL" 4.17 HOST_ARCH="i486 arm" 4.18 4.19 -BUILD_DEPENDS="gfortran" 4.20 +TARBALL="$PACKAGE-$VERSION.tar.gz" 4.21 +WGET_URL="$SF_MIRROR/mad/$TARBALL" 4.22 4.23 -# Rules to configure and make the package. 4.24 -compile_rules() 4.25 -{ 4.26 - sed -i '/-fforce-mem/d' ./configure 4.27 - ./configure --prefix=/usr $CONFIGURE_ARGS && 4.28 - make && make DESTDIR=$DESTDIR install 4.29 +BUILD_DEPENDS="automake libtool gfortran" 4.30 +SPLIT="libmad-dev" 4.31 + 4.32 +compile_rules() { 4.33 + CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1" 4.34 + touch NEWS AUTHORS ChangeLog 4.35 + autoreconf -fi || return 1 4.36 + 4.37 + ./configure $CONFIGURE_ARGS && make && make install 4.38 } 4.39 4.40 -# Rules to gen a SliTaz package suitable for Tazpkg. 4.41 -genpkg_rules() 4.42 -{ 4.43 - mkdir -p $fs/usr/lib 4.44 - cp -a $install/usr/lib/*.so* $fs/usr/lib 4.45 +genpkg_rules() { 4.46 + case $PACKAGE in 4.47 + libmad) 4.48 + copy @std 4.49 + ;; 4.50 + *-dev) 4.51 + copy @dev 4.52 + ;; 4.53 + esac 4.54 } 4.55 -
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/libmad/stuff/patches/amd64-64bit.diff Tue Nov 14 03:01:24 2017 +0200 5.3 @@ -0,0 +1,12 @@ 5.4 +Index: libmad-0.15.1b/configure.ac 5.5 +=================================================================== 5.6 +--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:33:05.000000000 +0000 5.7 ++++ libmad-0.15.1b/configure.ac 2008-03-07 20:33:31.000000000 +0000 5.8 +@@ -233,6 +233,7 @@ 5.9 + then 5.10 + case "$host" in 5.11 + i?86-*) FPM="INTEL" ;; 5.12 ++ x86_64*) FPM="64BIT" ;; 5.13 + arm*-*) FPM="ARM" ;; 5.14 + mips*-*) FPM="MIPS" ;; 5.15 + sparc*-*) FPM="SPARC" ;;
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/libmad/stuff/patches/frame_length.diff Tue Nov 14 03:01:24 2017 +0200 6.3 @@ -0,0 +1,197 @@ 6.4 +; You can calculate where the next frame will start depending on things 6.5 +; like the bitrate. See mad_header_decode(). It seems that when decoding 6.6 +; the frame you can go past that boundary. This attempts to catch those cases, 6.7 +; but might not catch all of them. 6.8 +; For more info see http://bugs.debian.org/508133 6.9 +Index: libmad-0.15.1b/layer12.c 6.10 +=================================================================== 6.11 +--- libmad-0.15.1b.orig/layer12.c 2008-12-23 21:38:07.000000000 +0100 6.12 ++++ libmad-0.15.1b/layer12.c 2008-12-23 21:38:12.000000000 +0100 6.13 +@@ -134,6 +134,12 @@ 6.14 + for (sb = 0; sb < bound; ++sb) { 6.15 + for (ch = 0; ch < nch; ++ch) { 6.16 + nb = mad_bit_read(&stream->ptr, 4); 6.17 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.18 ++ { 6.19 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.20 ++ stream->sync = 0; 6.21 ++ return -1; 6.22 ++ } 6.23 + 6.24 + if (nb == 15) { 6.25 + stream->error = MAD_ERROR_BADBITALLOC; 6.26 +@@ -146,6 +152,12 @@ 6.27 + 6.28 + for (sb = bound; sb < 32; ++sb) { 6.29 + nb = mad_bit_read(&stream->ptr, 4); 6.30 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.31 ++ { 6.32 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.33 ++ stream->sync = 0; 6.34 ++ return -1; 6.35 ++ } 6.36 + 6.37 + if (nb == 15) { 6.38 + stream->error = MAD_ERROR_BADBITALLOC; 6.39 +@@ -162,6 +174,12 @@ 6.40 + for (ch = 0; ch < nch; ++ch) { 6.41 + if (allocation[ch][sb]) { 6.42 + scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6); 6.43 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.44 ++ { 6.45 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.46 ++ stream->sync = 0; 6.47 ++ return -1; 6.48 ++ } 6.49 + 6.50 + # if defined(OPT_STRICT) 6.51 + /* 6.52 +@@ -187,6 +205,12 @@ 6.53 + frame->sbsample[ch][s][sb] = nb ? 6.54 + mad_f_mul(I_sample(&stream->ptr, nb), 6.55 + sf_table[scalefactor[ch][sb]]) : 0; 6.56 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.57 ++ { 6.58 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.59 ++ stream->sync = 0; 6.60 ++ return -1; 6.61 ++ } 6.62 + } 6.63 + } 6.64 + 6.65 +@@ -195,6 +219,12 @@ 6.66 + mad_fixed_t sample; 6.67 + 6.68 + sample = I_sample(&stream->ptr, nb); 6.69 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.70 ++ { 6.71 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.72 ++ stream->sync = 0; 6.73 ++ return -1; 6.74 ++ } 6.75 + 6.76 + for (ch = 0; ch < nch; ++ch) { 6.77 + frame->sbsample[ch][s][sb] = 6.78 +@@ -403,7 +433,15 @@ 6.79 + nbal = bitalloc_table[offsets[sb]].nbal; 6.80 + 6.81 + for (ch = 0; ch < nch; ++ch) 6.82 ++ { 6.83 + allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal); 6.84 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.85 ++ { 6.86 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.87 ++ stream->sync = 0; 6.88 ++ return -1; 6.89 ++ } 6.90 ++ } 6.91 + } 6.92 + 6.93 + for (sb = bound; sb < sblimit; ++sb) { 6.94 +@@ -411,6 +449,13 @@ 6.95 + 6.96 + allocation[0][sb] = 6.97 + allocation[1][sb] = mad_bit_read(&stream->ptr, nbal); 6.98 ++ 6.99 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.100 ++ { 6.101 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.102 ++ stream->sync = 0; 6.103 ++ return -1; 6.104 ++ } 6.105 + } 6.106 + 6.107 + /* decode scalefactor selection info */ 6.108 +@@ -419,6 +464,12 @@ 6.109 + for (ch = 0; ch < nch; ++ch) { 6.110 + if (allocation[ch][sb]) 6.111 + scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2); 6.112 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.113 ++ { 6.114 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.115 ++ stream->sync = 0; 6.116 ++ return -1; 6.117 ++ } 6.118 + } 6.119 + } 6.120 + 6.121 +@@ -442,6 +493,12 @@ 6.122 + for (ch = 0; ch < nch; ++ch) { 6.123 + if (allocation[ch][sb]) { 6.124 + scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6); 6.125 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.126 ++ { 6.127 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.128 ++ stream->sync = 0; 6.129 ++ return -1; 6.130 ++ } 6.131 + 6.132 + switch (scfsi[ch][sb]) { 6.133 + case 2: 6.134 +@@ -452,11 +509,23 @@ 6.135 + 6.136 + case 0: 6.137 + scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6); 6.138 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.139 ++ { 6.140 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.141 ++ stream->sync = 0; 6.142 ++ return -1; 6.143 ++ } 6.144 + /* fall through */ 6.145 + 6.146 + case 1: 6.147 + case 3: 6.148 + scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6); 6.149 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.150 ++ { 6.151 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.152 ++ stream->sync = 0; 6.153 ++ return -1; 6.154 ++ } 6.155 + } 6.156 + 6.157 + if (scfsi[ch][sb] & 1) 6.158 +@@ -488,6 +557,12 @@ 6.159 + index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1]; 6.160 + 6.161 + II_samples(&stream->ptr, &qc_table[index], samples); 6.162 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.163 ++ { 6.164 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.165 ++ stream->sync = 0; 6.166 ++ return -1; 6.167 ++ } 6.168 + 6.169 + for (s = 0; s < 3; ++s) { 6.170 + frame->sbsample[ch][3 * gr + s][sb] = 6.171 +@@ -506,6 +581,12 @@ 6.172 + index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1]; 6.173 + 6.174 + II_samples(&stream->ptr, &qc_table[index], samples); 6.175 ++ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) 6.176 ++ { 6.177 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.178 ++ stream->sync = 0; 6.179 ++ return -1; 6.180 ++ } 6.181 + 6.182 + for (ch = 0; ch < nch; ++ch) { 6.183 + for (s = 0; s < 3; ++s) { 6.184 +Index: libmad-0.15.1b/layer3.c 6.185 +=================================================================== 6.186 +--- libmad-0.15.1b.orig/layer3.c 2008-12-23 21:38:07.000000000 +0100 6.187 ++++ libmad-0.15.1b/layer3.c 2008-12-23 21:38:12.000000000 +0100 6.188 +@@ -2608,6 +2608,12 @@ 6.189 + next_md_begin = 0; 6.190 + 6.191 + md_len = si.main_data_begin + frame_space - next_md_begin; 6.192 ++ if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN) 6.193 ++ { 6.194 ++ stream->error = MAD_ERROR_LOSTSYNC; 6.195 ++ stream->sync = 0; 6.196 ++ return -1; 6.197 ++ } 6.198 + 6.199 + frame_used = 0; 6.200 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/libmad/stuff/patches/libmad.patch Tue Nov 14 03:01:24 2017 +0200 7.3 @@ -0,0 +1,117 @@ 7.4 +diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am 7.5 +--- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000 7.6 ++++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000 7.7 +@@ -33,9 +33,12 @@ 7.8 + minimad_INCLUDES = 7.9 + minimad_LDADD = libmad.la 7.10 + 7.11 +-EXTRA_DIST = mad.h.sed \ 7.12 ++EXTRA_DIST = mad.h.sed mad.pc.in \ 7.13 + CHANGES COPYRIGHT CREDITS README TODO VERSION 7.14 + 7.15 ++pkgconfigdir = $(libdir)/pkgconfig 7.16 ++pkgconfig_DATA= mad.pc 7.17 ++ 7.18 + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ 7.19 + synth.h decoder.h 7.20 + 7.21 +diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in 7.22 +--- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000 7.23 ++++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000 7.24 +@@ -14,6 +14,8 @@ 7.25 + 7.26 + @SET_MAKE@ 7.27 + 7.28 ++pkgconfigdir = $(libdir)/pkgconfig 7.29 ++pkgconfig_DATA = mad.pc 7.30 + 7.31 + SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES) 7.32 + 7.33 +@@ -43,7 +45,7 @@ 7.34 + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 7.35 + $(srcdir)/config.h.in $(srcdir)/libmad.list.in \ 7.36 + $(top_srcdir)/configure COPYING INSTALL TODO config.guess \ 7.37 +- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs 7.38 ++ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in 7.39 + subdir = . 7.40 + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 7.41 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac 7.42 +@@ -53,7 +55,7 @@ 7.43 + configure.lineno configure.status.lineno 7.44 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 7.45 + CONFIG_HEADER = config.h 7.46 +-CONFIG_CLEAN_FILES = libmad.list 7.47 ++CONFIG_CLEAN_FILES = libmad.list mad.pc 7.48 + am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) 7.49 + libLTLIBRARIES_INSTALL = $(INSTALL) 7.50 + LTLIBRARIES = $(lib_LTLIBRARIES) 7.51 +@@ -218,7 +220,7 @@ 7.52 + minimad_SOURCES = minimad.c 7.53 + minimad_INCLUDES = 7.54 + minimad_LDADD = libmad.la 7.55 +-EXTRA_DIST = mad.h.sed \ 7.56 ++EXTRA_DIST = mad.h.sed mad.pc.in \ 7.57 + CHANGES COPYRIGHT CREDITS README TODO VERSION 7.58 + 7.59 + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ 7.60 +@@ -298,6 +300,28 @@ 7.61 + rm -f stamp-h1 7.62 + touch $@ 7.63 + 7.64 ++mad.pc: $(top_builddir)/config.status mad.pc.in 7.65 ++ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 7.66 ++ 7.67 ++install-pkgconfigDATA: $(pkgconfig_DATA) 7.68 ++ @$(NORMAL_INSTALL) 7.69 ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) 7.70 ++ @list='$(pkgconfig_DATA)'; for p in $$list; do \ 7.71 ++ if test -f $(srcdir)/$$p; then \ 7.72 ++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ 7.73 ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ 7.74 ++ else if test -f $$p; then \ 7.75 ++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ 7.76 ++ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ 7.77 ++ fi; fi; \ 7.78 ++ done 7.79 ++ 7.80 ++uninstall-pkgconfigDATA: 7.81 ++ @$(NORMAL_UNINSTALL) 7.82 ++ list='$(pkgconfig_DATA)'; for p in $$list; do \ 7.83 ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ 7.84 ++ done 7.85 ++ 7.86 + distclean-hdr: 7.87 + -rm -f config.h stamp-h1 7.88 + libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in 7.89 +@@ -726,7 +750,7 @@ 7.90 + 7.91 + info-am: 7.92 + 7.93 +-install-data-am: install-includeHEADERS 7.94 ++install-data-am: install-includeHEADERS install-pkgconfigDATA 7.95 + 7.96 + install-exec-am: install-libLTLIBRARIES 7.97 + 7.98 +@@ -757,7 +781,7 @@ 7.99 + ps-am: 7.100 + 7.101 + uninstall-am: uninstall-includeHEADERS uninstall-info-am \ 7.102 +- uninstall-libLTLIBRARIES 7.103 ++ uninstall-libLTLIBRARIES install-pkgconfigDATA 7.104 + 7.105 + uninstall-info: uninstall-info-recursive 7.106 + 7.107 +diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in 7.108 +--- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000 7.109 ++++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000 7.110 +@@ -0,0 +1,10 @@ 7.111 ++prefix=@prefix@ 7.112 ++exec_prefix=@exec_prefix@ 7.113 ++libdir=@libdir@ 7.114 ++includedir=@includedir@ 7.115 ++ 7.116 ++Name: MAD 7.117 ++Description: libmad - MPEG audio decoder library 7.118 ++Version: @VERSION@ 7.119 ++Libs: -L${libdir} -lmad 7.120 ++Cflags:
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/libmad/stuff/patches/makefile.patch Tue Nov 14 03:01:24 2017 +0200 8.3 @@ -0,0 +1,14 @@ 8.4 +Add rule for making mad.pc 8.5 + 8.6 +--- a/Makefile.am 8.7 ++++ b/Makefile.am 8.8 +@@ -130,6 +130,9 @@ 8.9 + echo '}'; \ 8.10 + echo "# endif") >$@ 8.11 + 8.12 ++mad.pc: $(top_builddir)/config.status mad.pc.in 8.13 ++ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 8.14 ++ 8.15 + libtool: $(LIBTOOL_DEPS) 8.16 + $(SHELL) ./config.status --recheck 8.17 +
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/libmad/stuff/patches/optimize.diff Tue Nov 14 03:01:24 2017 +0200 9.3 @@ -0,0 +1,77 @@ 9.4 +Index: libmad-0.15.1b/configure.ac 9.5 +=================================================================== 9.6 +--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000 9.7 ++++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000 9.8 +@@ -124,71 +124,7 @@ 9.9 + 9.10 + if test "$GCC" = yes 9.11 + then 9.12 +- if test -z "$arch" 9.13 +- then 9.14 +- case "$host" in 9.15 +- i386-*) ;; 9.16 +- i?86-*) arch="-march=i486" ;; 9.17 +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; 9.18 +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; 9.19 +- powerpc-*) ;; 9.20 +- mips*-agenda-*) arch="-mcpu=vr4100" ;; 9.21 +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; 9.22 +- esac 9.23 +- fi 9.24 +- 9.25 +- case "$optimize" in 9.26 +- -O|"-O "*) 9.27 +- optimize="-O" 9.28 +- optimize="$optimize -fforce-mem" 9.29 +- optimize="$optimize -fforce-addr" 9.30 +- : #x optimize="$optimize -finline-functions" 9.31 +- : #- optimize="$optimize -fstrength-reduce" 9.32 +- optimize="$optimize -fthread-jumps" 9.33 +- optimize="$optimize -fcse-follow-jumps" 9.34 +- optimize="$optimize -fcse-skip-blocks" 9.35 +- : #x optimize="$optimize -frerun-cse-after-loop" 9.36 +- : #x optimize="$optimize -frerun-loop-opt" 9.37 +- : #x optimize="$optimize -fgcse" 9.38 +- optimize="$optimize -fexpensive-optimizations" 9.39 +- optimize="$optimize -fregmove" 9.40 +- : #* optimize="$optimize -fdelayed-branch" 9.41 +- : #x optimize="$optimize -fschedule-insns" 9.42 +- optimize="$optimize -fschedule-insns2" 9.43 +- : #? optimize="$optimize -ffunction-sections" 9.44 +- : #? optimize="$optimize -fcaller-saves" 9.45 +- : #> optimize="$optimize -funroll-loops" 9.46 +- : #> optimize="$optimize -funroll-all-loops" 9.47 +- : #x optimize="$optimize -fmove-all-movables" 9.48 +- : #x optimize="$optimize -freduce-all-givs" 9.49 +- : #? optimize="$optimize -fstrict-aliasing" 9.50 +- : #* optimize="$optimize -fstructure-noalias" 9.51 +- 9.52 +- case "$host" in 9.53 +- arm*-*) 9.54 +- optimize="$optimize -fstrength-reduce" 9.55 +- ;; 9.56 +- mips*-*) 9.57 +- optimize="$optimize -fstrength-reduce" 9.58 +- optimize="$optimize -finline-functions" 9.59 +- ;; 9.60 +- i?86-*) 9.61 +- optimize="$optimize -fstrength-reduce" 9.62 +- ;; 9.63 +- powerpc-apple-*) 9.64 +- # this triggers an internal compiler error with gcc2 9.65 +- : #optimize="$optimize -fstrength-reduce" 9.66 +- 9.67 +- # this is really only beneficial with gcc3 9.68 +- : #optimize="$optimize -finline-functions" 9.69 +- ;; 9.70 +- *) 9.71 +- # this sometimes provokes bugs in gcc 2.95.2 9.72 +- : #optimize="$optimize -fstrength-reduce" 9.73 +- ;; 9.74 +- esac 9.75 +- ;; 9.76 +- esac 9.77 ++ optimize="-O2" 9.78 + fi 9.79 + 9.80 + case "$host" in
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/libmad/stuff/patches/series Tue Nov 14 03:01:24 2017 +0200 10.3 @@ -0,0 +1,7 @@ 10.4 +makefile.patch 10.5 + 10.6 +# from https://www.archlinux.org/packages/extra/i686/libmad/ 10.7 +libmad.patch 10.8 +amd64-64bit.diff 10.9 +frame_length.diff 10.10 +optimize.diff
11.1 --- a/liboil-dev/receipt Tue Nov 14 00:52:23 2017 +0200 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,21 +0,0 @@ 11.4 -# SliTaz package receipt. 11.5 - 11.6 -PACKAGE="liboil-dev" 11.7 -VERSION="0.3.17" 11.8 -CATEGORY="development" 11.9 -SHORT_DESC="Library of simple functions that are optimized for various CPUs" 11.10 -MAINTAINER="jozee@slitaz.org" 11.11 -LICENSE="BSD" 11.12 -WANTED="liboil" 11.13 -WEB_SITE="http://liboil.freedesktop.org/download/" 11.14 - 11.15 -DEPENDS="liboil pkg-config" 11.16 - 11.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 11.18 -genpkg_rules() 11.19 -{ 11.20 - mkdir -p $fs/usr/lib 11.21 - cp -a $install/usr/include $fs/usr 11.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 11.23 - cp -a $install/usr/lib/*.*a $fs/usr/lib/ 11.24 -}
12.1 --- a/liboil/receipt Tue Nov 14 00:52:23 2017 +0200 12.2 +++ b/liboil/receipt Tue Nov 14 03:01:24 2017 +0200 12.3 @@ -1,31 +1,34 @@ 12.4 -# SliTaz package receipt. 12.5 +# SliTaz package receipt v2. 12.6 12.7 PACKAGE="liboil" 12.8 VERSION="0.3.17" 12.9 CATEGORY="development" 12.10 -SHORT_DESC="Library of simple functions that are optimized for various CPUs" 12.11 +SHORT_DESC="Library of Optimized Inner Loops" 12.12 MAINTAINER="jozee@slitaz.org" 12.13 LICENSE="BSD" 12.14 +WEB_SITE="https://liboil.freedesktop.org/wiki/" 12.15 + 12.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 12.17 -WEB_SITE="http://liboil.freedesktop.org/download/" 12.18 -WGET_URL="$WEB_SITE/$TARBALL" 12.19 +WGET_URL="http://liboil.freedesktop.org/download/$TARBALL" 12.20 12.21 -DEPENDS="" 12.22 -BUILD_DEPENDS="glibc-base glibc-dev" 12.23 +SPLIT="liboil-dev" 12.24 +COOKOPTS="skip-log-errors" 12.25 12.26 -# Rules to configure and make the package. 12.27 -compile_rules() 12.28 -{ 12.29 - cd $src 12.30 - ./configure --prefix=/usr --sysconfdir=/etc $CONFIGURE_ARGS 12.31 - make 2>&1 | grep -v "cmp: liboilarray.c:" 12.32 - make DESTDIR=$DESTDIR install 12.33 +compile_rules() { 12.34 + ./configure \ 12.35 + --prefix=/usr \ 12.36 + --sysconfdir=/etc \ 12.37 + $CONFIGURE_ARGS && 12.38 + make && 12.39 + make install || return 1 12.40 + 12.41 + mv $install/usr/include/liboil-0.3/liboil/ $install/usr/include/ 12.42 + rmdir $install/usr/include/liboil-0.3/ 12.43 } 12.44 12.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.46 -genpkg_rules() 12.47 -{ 12.48 - mkdir -p $fs/usr/lib 12.49 - cp -a $install/usr/bin $fs/usr 12.50 - cp -a $install/usr/lib/*.so* $fs/usr/lib/ 12.51 +genpkg_rules() { 12.52 + case $PACKAGE in 12.53 + liboil) copy @std;; 12.54 + *-dev) copy @dev;; 12.55 + esac 12.56 }
13.1 --- a/pciids/receipt Tue Nov 14 00:52:23 2017 +0200 13.2 +++ b/pciids/receipt Tue Nov 14 03:01:24 2017 +0200 13.3 @@ -1,7 +1,8 @@ 13.4 -# SliTaz package receipt. 13.5 +# SliTaz package receipt v2. 13.6 13.7 PACKAGE="pciids" 13.8 -VERSION="9cecb39" 13.9 +VERSION="171021" 13.10 +COMMIT="5a521cc" 13.11 CATEGORY="misc" 13.12 SHORT_DESC="List of PCI ID's" 13.13 MAINTAINER="slaxemulator@gmail.com" 13.14 @@ -9,21 +10,15 @@ 13.15 WEB_SITE="http://pci-ids.ucw.cz/" 13.16 HOST_ARCH="i486 arm" 13.17 13.18 -TARBALL="$PACKAGE-$VERSION.tar.gz" 13.19 -WGET_URL="$GITHUB/pciutils/pciids/tarball/$VERSION" 13.20 +TARBALL="$PACKAGE-$COMMIT.tar.gz" 13.21 +WGET_URL="$GITHUB/pciutils/pciids/tarball/$COMMIT" 13.22 13.23 -BUILD_DEPENDS="advancecomp" 13.24 - 13.25 -# Rules to configure and make the package. 13.26 -compile_rules() 13.27 -{ 13.28 - gzip pci.ids 13.29 - advdef -z4 pci.ids.gz 13.30 +compile_rules() { 13.31 + mkdir -p $install/usr/share/misc 13.32 + gzip -1 pci.ids 13.33 + cp pci.ids.gz $install/usr/share/misc 13.34 } 13.35 13.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 13.37 -genpkg_rules() 13.38 -{ 13.39 - mkdir -p $fs/usr/share/misc 13.40 - cp $src/pci.ids.gz $fs/usr/share/misc 13.41 +genpkg_rules() { 13.42 + copy @std 13.43 }
14.1 --- a/pciutils-dev/receipt Tue Nov 14 00:52:23 2017 +0200 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,21 +0,0 @@ 14.4 -# SliTaz package receipt. 14.5 - 14.6 -PACKAGE="pciutils-dev" 14.7 -VERSION="3.2.1" 14.8 -CATEGORY="development" 14.9 -SHORT_DESC="devel files for pciutils" 14.10 -MAINTAINER="slaxemulator@gmail.com" 14.11 -LICENSE="GPL2" 14.12 -WEB_SITE="http://mj.ucw.cz/sw/pciutils/" 14.13 -WANTED="pciutils" 14.14 - 14.15 -DEPENDS="pciutils pkg-config" 14.16 - 14.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 14.18 -genpkg_rules() 14.19 -{ 14.20 - mkdir -p $fs/usr/lib 14.21 - cp -a $install/usr/include $fs/usr 14.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 14.23 - cp -a $install/usr/lib/*a $fs/usr/lib 14.24 -}
15.1 --- a/pciutils/receipt Tue Nov 14 00:52:23 2017 +0200 15.2 +++ b/pciutils/receipt Tue Nov 14 03:01:24 2017 +0200 15.3 @@ -1,45 +1,64 @@ 15.4 -# SliTaz package receipt. 15.5 +# SliTaz package receipt v2. 15.6 15.7 PACKAGE="pciutils" 15.8 -VERSION="3.2.1" 15.9 +VERSION="3.5.5" 15.10 CATEGORY="system-tools" 15.11 SHORT_DESC="Linux PCI Utilities" 15.12 MAINTAINER="pankso@slitaz.org" 15.13 LICENSE="GPL2" 15.14 +WEB_SITE="http://mj.ucw.cz/sw/pciutils/" 15.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pciutils.html" 15.16 + 15.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 15.18 -WEB_SITE="http://mj.ucw.cz/pciutils.html" 15.19 WGET_URL="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$TARBALL" 15.20 15.21 -DEPENDS="glibc-base zlib pciids" 15.22 -BUILD_DEPENDS="zlib-dev" 15.23 +BUILD_DEPENDS="kmod-dev eudev-dev zlib-dev" 15.24 +SPLIT="pciutils-dev" 15.25 15.26 -# Rules to configure and make the package. 15.27 -compile_rules() 15.28 -{ 15.29 - make OPT="${CFLAGS} -fPIC -DPIC" SHARED=no PREFIX=/usr SHAREDIR=/usr/share/misc MANDIR=/usr/share/man all 15.30 - cp -a lib/libpci.a $WOK/$PACKAGE/source 15.31 - make clean 15.32 - make OPT="${CFLAGS}" ZLIB=yes SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/misc MANDIR=/usr/share/man all 15.33 - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/misc MANDIR=/usr/share/man DESTDIR="$DESTDIR" install install-lib 15.34 - cp -a $WOK/$PACKAGE/source/libpci.a $DESTDIR/usr/lib 15.35 +compile_rules() { 15.36 + make \ 15.37 + OPT="$CFLAGS -fPIC -DPIC" \ 15.38 + ZLIB=yes \ 15.39 + SHARED=no \ 15.40 + PREFIX=/usr \ 15.41 + SHAREDIR=/usr/share/misc \ 15.42 + MANDIR=/usr/share/man \ 15.43 + SBINDIR=/usr/bin \ 15.44 + lib/libpci.a && 15.45 + cp lib/libpci.a $src/../ && 15.46 + 15.47 + make clean && 15.48 + make \ 15.49 + OPT="$CFLAGS" \ 15.50 + ZLIB=yes \ 15.51 + SHARED=yes \ 15.52 + PREFIX=/usr \ 15.53 + SBINDIR=/usr/bin \ 15.54 + SHAREDIR=/usr/share/misc \ 15.55 + MANDIR=/usr/share/man \ 15.56 + all && 15.57 + 15.58 + make \ 15.59 + SHARED=yes \ 15.60 + PREFIX=/usr \ 15.61 + SBINDIR=/usr/bin \ 15.62 + SHAREDIR=/usr/share/misc \ 15.63 + MANDIR=/usr/share/man \ 15.64 + DESTDIR=$install \ 15.65 + install install-lib && 15.66 + 15.67 + mv $src/../libpci.a $install/usr/lib 15.68 } 15.69 15.70 -# Rules to gen a SliTaz package suitable for Tazpkg. 15.71 -genpkg_rules() 15.72 -{ 15.73 - mkdir -p $fs/usr/bin $fs/usr/lib 15.74 - cp -a $install/usr/sbin/lspci $fs/usr/bin 15.75 - cp -a $install/usr/sbin/setpci $fs/usr/bin 15.76 - cp -a $install/usr/lib/*.so* $fs/usr/lib 15.77 +genpkg_rules() { 15.78 + case $PACKAGE in 15.79 + pciutils) 15.80 + copy @std 15.81 + rm -rf $fs/usr/share/ 15.82 + DEPENDS="eudev kmod liblzma zlib pciids" 15.83 + ;; 15.84 + *-dev) 15.85 + copy @dev 15.86 + ;; 15.87 + esac 15.88 } 15.89 - 15.90 -# Overlap busybox 15.91 -pre_install() 15.92 -{ 15.93 - rm -f "$1/usr/bin/lspci" 15.94 -} 15.95 - 15.96 -post_remove() 15.97 -{ 15.98 - ln -s /bin/busybox "$1/usr/bin/lspci" 15.99 -}