From bee36f49898219e8604263ff4973e83f331a947f Mon Sep 17 00:00:00 2001 From: PktSurf Date: Sun, 20 Oct 2024 22:51:59 +0530 Subject: [PATCH] Upgraded base/asciidoc to 10.2.1 Upgraded base/pax-utils to 1.3.8 Upgraded base/x264 to 0.164 Rewrote base/docbook build file Discarded unnecessary hidden files in base/json-c Disabled support for native language support in base/libsecret,util-linux Added /usr prefix to several base build files --- base/asciidoc/asciidoc.SMBuild | 16 +- base/docbook/docbook.SMBuild | 229 +++++++++------------ base/gawk/gawk.SMBuild | 4 +- base/json-c/.deps/arraylist.Plo | 1 - base/json-c/.deps/debug.Plo | 1 - base/json-c/.deps/json_c_version.Plo | 1 - base/json-c/.deps/json_object.Plo | 1 - base/json-c/.deps/json_object_iterator.Plo | 1 - base/json-c/.deps/json_tokener.Plo | 1 - base/json-c/.deps/json_util.Plo | 1 - base/json-c/.deps/linkhash.Plo | 1 - base/json-c/.deps/printbuf.Plo | 1 - base/json-c/.deps/random_seed.Plo | 1 - base/json-c/.travis.yml | 25 --- base/libsecret/libsecret.SMBuild | 7 +- base/libvpx/libvpx.SMBuild | 2 +- base/pax-utils/pax-utils.SMBuild | 12 +- base/physfs/physfs.SMBuild | 4 +- base/util-linux/util-linux.SMBuild | 21 +- base/x264/x264.SMBuild | 18 +- 20 files changed, 148 insertions(+), 200 deletions(-) delete mode 100644 base/json-c/.deps/arraylist.Plo delete mode 100644 base/json-c/.deps/debug.Plo delete mode 100644 base/json-c/.deps/json_c_version.Plo delete mode 100644 base/json-c/.deps/json_object.Plo delete mode 100644 base/json-c/.deps/json_object_iterator.Plo delete mode 100644 base/json-c/.deps/json_tokener.Plo delete mode 100644 base/json-c/.deps/json_util.Plo delete mode 100644 base/json-c/.deps/linkhash.Plo delete mode 100644 base/json-c/.deps/printbuf.Plo delete mode 100644 base/json-c/.deps/random_seed.Plo delete mode 100644 base/json-c/.travis.yml diff --git a/base/asciidoc/asciidoc.SMBuild b/base/asciidoc/asciidoc.SMBuild index c31dcaa..7377da5 100755 --- a/base/asciidoc/asciidoc.SMBuild +++ b/base/asciidoc/asciidoc.SMBuild @@ -1,24 +1,28 @@ # Maintainer: PktSurf app=asciidoc -version=9.0.4 +version=10.2.1 build=1sml homepage="https://github.com/asciidoc/asciidoc-py3" download="" desc="Text document format for writing notes and documentation" requires="python3 libxslt docbook" +ignoreusrbin=1 prepbuilddir() { mkandenterbuilddir - rm -rf $app-"py3"-$version + rm -rf $app-$version - tar xf $srcdir/$app-"py3"-$version.tar.?z* - cd $app-"py3"-$version + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version fixbuilddirpermissions + + autoreconf -vif } build() { ./configure \ - --prefix= + --prefix=/usr \ + --bindir=/bin make make install DESTDIR=$pkg @@ -29,5 +33,5 @@ build() { } sha512sums=" -df71bb8a35fc0099c34dcfbcfe8c182b59c5a8e86326a994fe722fea2c902fb56d221d8ae42a7b967daa4acc8cadd82ec9c85add48a8013ad04d295bf1d728c4 asciidoc-py3-9.0.4.tar.lz +02d064aab8dfb05af4ae49a7c7bd1381156c6c90f95b2494218c80f01c39987cb971d68c533b5519abade77be9832b3fab653d8ae2ca7bb682c5bb720612839f asciidoc-10.2.1.tar.gz " diff --git a/base/docbook/docbook.SMBuild b/base/docbook/docbook.SMBuild index 4d07f78..49bb63c 100755 --- a/base/docbook/docbook.SMBuild +++ b/base/docbook/docbook.SMBuild @@ -4,8 +4,9 @@ version=1.0 build=1sml homepage="https://docbook.org" download="" -docbookv="4.5" -xslv="1.79.2" +xslstylesheetsver=1.79.2 +xmldtdver=4.5 +xmltover=0.0.28 desc="DocBook DTD for XML" requires="libxslt libxml2" @@ -13,180 +14,156 @@ prepbuilddir() { mkandenterbuilddir rm -rf $app-$version - tar xf $srcdir/docbook-xml-$docbookv.tar.?z* - cd docbook-xml-$docbookv + tar xf $srcdir/docbook-xml-$xmldtdver.tar.?z* + cd docbook-xml-$xmldtdver fixbuilddirpermissions } build() { xml_catalog="$pkg/etc/xml/catalog" - xml_docbook="$pkg/etc/xml/docbook" + xml_docbookcatalog="$pkg/etc/xml/docbook" cd docbook-4.5 - install -d -m755 "$pkg"/share/xml/docbook/xml-dtd-4.5 - install -d -m755 "$pkg"/etc/xml + # Install 4.x catalog: + mkdir -vpm755 $pkg/usr/share/xml/docbook/xml-dtd-$xmldtdver + cp -fav docbook.cat *.dtd *.mod ent/ \ + $pkg/usr/share/xml/docbook/xml-dtd-$xmldtdver - chown -R root:root . - cp -v -af docbook.cat *.dtd ent/ *.mod \ - "$pkg"/share/xml/docbook/xml-dtd-"$docbookv" - - # Create the docbook and catalog - xmlcatalog --noout --create "$xml_docbook" - xmlcatalog --noout --create "$xml_catalog" + mkdir -vpm755 $pkg/etc/xml + xmlcatalog --noout --create $xml_catalog + xmlcatalog --noout --create $xml_docbookcatalog xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V"$docbookv"//EN" \ - "http://www.oasis-open.org/docbook/xml/"$docbookv"/docbookx.dtd" \ - "$xml_docbook" + "-//OASIS//DTD DocBook XML V${xmldtdver}//EN" \ + "http://www.oasis-open.org/docbook/xml/${xmldtdver}/docbookx.dtd" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/calstblx.dtd" \ - "$xml_docbook" + "-//OASIS//DTD DocBook XML CALS Table Model V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/calstblx.dtd" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/soextblx.dtd" \ - "$xml_docbook" + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/soextblx.dtd" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/dbpoolx.mod" \ - "$xml_docbook" + "-//OASIS//ELEMENTS DocBook XML Information Pool V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/dbpoolx.mod" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/dbhierx.mod" \ - "$xml_docbook" + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/dbhierx.mod" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/htmltblx.mod" \ - "$xml_docbook" + "-//OASIS//ELEMENTS DocBook XML HTML Tables V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/htmltblx.mod" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/dbnotnx.mod" \ - "$xml_docbook" + "-//OASIS//ENTITIES DocBook XML Notations V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/dbnotnx.mod" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/dbcentx.mod" \ - "$xml_docbook" + "-//OASIS//ENTITIES DocBook XML Character Entities V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/dbcentx.mod" \ + $xml_docbookcatalog && xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V"$docbookv"//EN" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"/dbgenent.mod" \ - "$xml_docbook" + "-//OASIS//ENTITIES DocBook XML Additional General Entities V${xmldtdver}//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}/dbgenent.mod" \ + $xml_docbookcatalog && xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/"$docbookv"" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"" \ - "$xml_docbook" + "http://www.oasis-open.org/docbook/xml/${xmldtdver}" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}" \ + $xml_docbookcatalog && xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/"$docbookv"" \ - "file:///share/xml/docbook/xml-dtd-"$docbookv"" \ - "$xml_docbook" - + "http://www.oasis-open.org/docbook/xml/${xmldtdver}" \ + "file:///usr/share/xml/docbook/xml-dtd-${xmldtdver}" \ + $xml_docbookcatalog || exit 1 xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ "file:///etc/xml/docbook" \ - "$xml_catalog" + $xml_catalog && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ "file:///etc/xml/docbook" \ - "$xml_catalog" + $xml_catalog && xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook" \ - "$xml_catalog" + $xml_catalog && xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook" \ - "$xml_catalog" + $xml_catalog || exit 1 - - # Prep the older versions too - for DTDdocbookv in 4.1.2 4.2 4.3 4.4 + for DTDVERSION in 4.1.2 4.2 4.3 4.4 do - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V$DTDdocbookv//EN" \ - "http://www.oasis-open.org/docbook/xml/$DTDdocbookv/docbookx.dtd" \ - "$xml_docbook" - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/$DTDdocbookv" \ - "file:///share/xml/docbook/xml-dtd-$docbookv" \ - "$xml_docbook" - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/$DTDdocbookv" \ - "file:///share/xml/docbook/xml-dtd-$docbookv" \ - "$xml_docbook" - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/xml/$DTDdocbookv/" \ - "file:///etc/xml/docbook" \ - "$xml_catalog" - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/xml/$DTDdocbookv/" \ - "file:///etc/xml/docbook" \ - "$xml_catalog" + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \ + "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \ + $xml_docbookcatalog || exit 1 + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ + "file:///usr/share/xml/docbook/xml-dtd-$xmldtdver" \ + $xml_docbookcatalog || exit 1 + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ + "file:///usr/share/xml/docbook/xml-dtd-$xmldtdver" \ + $xml_docbookcatalog || exit 1 + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ + "file:///etc/xml/docbook" \ + $xml_catalog || exit 1 + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ + "file:///etc/xml/docbook" \ + $xml_catalog || exit 1 done - - tar xf $srcdir/docbook-xsl-nons-$xslv.tar.?z* - cd docbook-xsl-nons-$xslv + tar xf $srcdir/docbook-xsl-nons-$xslstylesheetsver.tar.?z* + cd docbook-xsl-nons-$xslstylesheetsver fixbuilddirpermissions applypatch $srcdir/non-recursive-string-subst.patch - install -v -m755 -d "$pkg"/share/xml/docbook/xsl-stylesheets-"$xslv" + install -v -m755 -d "$pkg/usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" cp -v -R VERSION common eclipse epub extensions fo highlighting html \ - htmlhelp images javahelp lib manpages params profiling \ - roundtrip slides template tests tools webhelp website \ - xhtml xhtml-1_1 \ - "$pkg/share/xml/docbook/xsl-stylesheets-$xslv" && + htmlhelp images javahelp lib manpages params profiling \ + roundtrip slides template tests tools webhelp website \ + xhtml xhtml-1_1 \ + "$pkg/usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" && + ( - cd "$pkg/share/xml/docbook/xsl-stylesheets-$xslv" + cd "$pkg/usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" ln -s VERSION VERSION.xsl ) - install -v -m644 -D README \ - "$pkg"/share/doc/docbook-xsl-"$xslv"/README.txt - install -v -m644 RELEASE-NOTES* NEWS* \ - "$pkg"/share/doc/docbook-xsl-"$xslv" +xmlcatalog --noout --add "rewriteSystem" \ + "http://cdn.docbook.org/release/xsl-nons/$xslstylesheetsver" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" \ + $xml_catalog || exit 1 +xmlcatalog --noout --add "rewriteURI" \ + "http://cdn.docbook.org/release/xsl-nons/$xslstylesheetsver" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" \ + $xml_catalog || exit 1 +xmlcatalog --noout --add "rewriteSystem" \ + "http://cdn.docbook.org/release/xsl-nons/current" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" \ + $xml_catalog || exit 1 +xmlcatalog --noout --add "rewriteURI" \ + "http://cdn.docbook.org/release/xsl-nons/current/" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" \ + $xml_catalog || exit 1 - xmlcatalog --noout --add "rewriteSystem" \ - "http://cdn.docbook.org/release/xsl-nons/"$xslv"" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" && - - xmlcatalog --noout --add "rewriteURI" \ - "http://cdn.docbook.org/release/xsl-nons/"$xslv"" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" - - xmlcatalog --noout --add "rewriteSystem" \ - "http://cdn.docbook.org/release/xsl-nons/current" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" && - - xmlcatalog --noout --add "rewriteURI" \ - "http://cdn.docbook.org/release/xsl-nons/current" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/"$xslv"" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" && - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/"$xslv"" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" && - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/share/xml/docbook/xsl-stylesheets-$xslv" \ - "$xml_catalog" +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" \ + $xml_catalog || exit 1 +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-$xslstylesheetsver" \ + $xml_catalog || exit 1 mkfinalpkg } diff --git a/base/gawk/gawk.SMBuild b/base/gawk/gawk.SMBuild index 7e2e0f5..31110bc 100755 --- a/base/gawk/gawk.SMBuild +++ b/base/gawk/gawk.SMBuild @@ -36,5 +36,5 @@ build() { } sha512sums=" -90611e4daba7226d5ce8230843bf479dc71c0101740c005d851ef7c5b935b6cd4c42089b858abc1619adc05ed25fc7234f993690a76d2ea0b8e61bcbb7dc5a58 gawk-5.2.2.tar.xz -" +b96e82265115800e703d3e2860f7d3463a827cf7e661d6227e8c5e711abeef63af3641cc411423f517d8a43c43be7ad68dd1ef3d7d90bceb6799b57746c9318f gawk-5.2.2.tar.lz +" \ No newline at end of file diff --git a/base/json-c/.deps/arraylist.Plo b/base/json-c/.deps/arraylist.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/arraylist.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/debug.Plo b/base/json-c/.deps/debug.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/debug.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/json_c_version.Plo b/base/json-c/.deps/json_c_version.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/json_c_version.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/json_object.Plo b/base/json-c/.deps/json_object.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/json_object.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/json_object_iterator.Plo b/base/json-c/.deps/json_object_iterator.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/json_object_iterator.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/json_tokener.Plo b/base/json-c/.deps/json_tokener.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/json_tokener.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/json_util.Plo b/base/json-c/.deps/json_util.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/json_util.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/linkhash.Plo b/base/json-c/.deps/linkhash.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/linkhash.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/printbuf.Plo b/base/json-c/.deps/printbuf.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/printbuf.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.deps/random_seed.Plo b/base/json-c/.deps/random_seed.Plo deleted file mode 100644 index 9ce06a8..0000000 --- a/base/json-c/.deps/random_seed.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/base/json-c/.travis.yml b/base/json-c/.travis.yml deleted file mode 100644 index 70e20eb..0000000 --- a/base/json-c/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -language: cpp - -compiler: - - gcc - - clang - -os: - - linux - - osx - -before_install: - - echo $LANG - - echo $LC_ALL - -install: - - sh autogen.sh - -before_script: - - ./configure - -script: - - make - -after_success: - - make check diff --git a/base/libsecret/libsecret.SMBuild b/base/libsecret/libsecret.SMBuild index cdd566f..32fe0e6 100755 --- a/base/libsecret/libsecret.SMBuild +++ b/base/libsecret/libsecret.SMBuild @@ -19,9 +19,12 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ + --prefix=/usr \ + --bindir=/bin \ --disable-static \ - --disable-introspection + --disable-introspection \ + --disable-manpages \ + --disable-nls make make install DESTDIR=$pkg diff --git a/base/libvpx/libvpx.SMBuild b/base/libvpx/libvpx.SMBuild index be52d86..b6d163e 100755 --- a/base/libvpx/libvpx.SMBuild +++ b/base/libvpx/libvpx.SMBuild @@ -23,7 +23,7 @@ build() { --prefix=/usr \ --enable-shared \ --disable-static \ - --disable-install-bins + --disable-install-bins make make install DESTDIR=$pkg diff --git a/base/pax-utils/pax-utils.SMBuild b/base/pax-utils/pax-utils.SMBuild index 5ddce09..bf847b3 100755 --- a/base/pax-utils/pax-utils.SMBuild +++ b/base/pax-utils/pax-utils.SMBuild @@ -1,11 +1,11 @@ # Maintainer: PktSurf app=pax-utils -version=1.3.7 +version=1.3.8 build=1sml homepage="https://github.com/gentoo/pax-utils" download="https://github.com/gentoo/pax-utils/archive/refs/tags/v$version.tar.gz" desc="ELF utilities for performing security checks on files" -requires="pyelftools" +requires="pyelftools docbook" prepbuilddir() { mkandenterbuilddir @@ -17,9 +17,11 @@ prepbuilddir() { } build() { - mkdir smbuild && cd smbuild + mkdir -p smbuild && cd smbuild meson .. \ - --prefix=/ + --prefix=/usr \ + --bindir=/bin \ + -Dbuild_manpages=enabled ninja DESTDIR="$pkg" ninja install @@ -30,5 +32,5 @@ build() { } sha512sums=" -64d61169cebf013401de442bbf2deae4b25eb3d07c90643775ea6443005b16783f41ceb41f398850507ed24c4a2d2c3f8552e047a574d884fbf314145bb8e6f9 pax-utils-1.3.7.tar.lz +19153a007511a6a1d7c6900a9bf33756e9aed685d2df7d49bd3b359cd14e74ea778ea8082786fb526f9431d21a1e0f8d14fbe2979795609c9eac8042f57b131d pax-utils-1.3.8.tar.lz " diff --git a/base/physfs/physfs.SMBuild b/base/physfs/physfs.SMBuild index 85bcc6a..3404066 100755 --- a/base/physfs/physfs.SMBuild +++ b/base/physfs/physfs.SMBuild @@ -19,11 +19,11 @@ prepbuilddir() { build() { mkdir -p smbuild && cd smbuild cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DPHYSFS_BUILD_SHARED=ON \ -DPHYSFS_BUILD_STATIC=OFF \ -DPHYSFS_BUILD_TEST=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_BUILD_TYPE=Release make make install DESTDIR=$pkg diff --git a/base/util-linux/util-linux.SMBuild b/base/util-linux/util-linux.SMBuild index 125d44e..2e611fd 100755 --- a/base/util-linux/util-linux.SMBuild +++ b/base/util-linux/util-linux.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=util-linux version=2.33 -build=4sml +build=1sml homepage="https://github.com/karelzak/util-linux" download="https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v$version/util-linux-$version.tar.xz" desc="A huge collection of essential utilities" @@ -21,24 +21,24 @@ prepbuilddir() { } build() { - CFLAGS="$CFLAGS -include sys/sysmacros.h" \ LDFLAGS="-lcurses -lterminfo" \ ./configure \ - --prefix= --bindir=/bin --sbindir=/bin --libdir=/lib \ - --includedir=/include \ - --disable-fsck\ + --prefix=/ --bindir=/bin --sbindir=/bin --mandir=/usr/share/man \ + --disable-fsck --includedir=/usr/include --libdir=/usr/lib \ + --with-bashcompletiondir=/usr/share/bash-completion/completions \ + --datarootdir=/usr/share \ --enable-libmount-support-mtab \ --disable-fdformat --disable-switch-root \ - --disable-kill --disable-login --disable-sulogin --disable-su\ + --disable-kill --disable-login --disable-sulogin --disable-su \ --disable-more --disable-pg --disable-agetty \ --without-systemd --disable-wdctl --enable-libuuid \ --enable-libblkid --enable-libmount --disable-uuidd \ --enable-static-programs="mount,umount" \ - --without-python + --without-python --disable-nls sed -i 's,/sbin,/bin,' config.status ./config.status - + make make install DESTDIR=$pkg @@ -48,12 +48,9 @@ build() { mv mount.static mount mv umount.static umount ) - + cp COPYING $pkgdocs/ - # rev is provided by busybox which is statically-linked - rm $pkg/bin/rev - mkfinalpkg } diff --git a/base/x264/x264.SMBuild b/base/x264/x264.SMBuild index dfdb6b5..9dbb62e 100755 --- a/base/x264/x264.SMBuild +++ b/base/x264/x264.SMBuild @@ -1,18 +1,17 @@ # Maintainer: PktSurf app=x264 -version=0.155 +version=0.164 build=1sml -longversion=snapshot-20180831-2245-stable homepage="http://www.videolan.org/developers/x264.html" -desc="free h264/avc encoder" +desc="free h264 encoder" requires="nasm" prepbuilddir() { mkandenterbuilddir - rm -rf "$app-$longversion" + rm -rf "$app-$version" - tar xf $srcdir/$app-$longversion.tar.?z* - cd "$app-$longversion" + tar xf $srcdir/$app-$version.tar.?z* + cd "$app-$version" fixbuilddirpermissions } @@ -21,7 +20,8 @@ build() { unset CFLAGS CXXFLAGS ./configure \ - --prefix= \ + --prefix=/usr \ + --bindir=/bin \ --enable-shared make @@ -33,5 +33,5 @@ build() { } sha512sums=" -e2472af814c2bf57c0ce293e0b74ca27cd567874ba953dcf995470ba2357b4c1b27a2c51b0033c01afff9d9897ed78f53ca4be30e24036106ec2df5671234223 x264-snapshot-20180831-2245-stable.tar.lz -" +e113a7759528be56c93d2a446ad3b89613f2e3182b03a4631073df3058cc17f5991caf6bd495ebf6602e7ebb515000b871dcd3600e966a91c4ab84f502d26e8f x264-0.164.tar.lz +" \ No newline at end of file