April 2019 - crux-commits

ports/compat-32 (3.4): orc-32: 0.4.27 -> 0.4.29
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit c4d85689aa659289981d45731df3b8872c8d4b12 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 17:54:48 2019 +1000 orc-32: 0.4.27 -> 0.4.29 diff --git a/orc-32/.footprint b/orc-32/.footprint index 7e2a672..8619192 100644 --- a/orc-32/.footprint +++ b/orc-32/.footprint @@ -1,12 +1,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rwxr-xr-x root/root usr/lib32/liborc-0.4.la -lrwxrwxrwx root/root usr/lib32/liborc-0.4.so -> liborc-0.4.so.0.27.0 -lrwxrwxrwx root/root usr/lib32/liborc-0.4.so.0 -> liborc-0.4.so.0.27.0 --rwxr-xr-x root/root usr/lib32/liborc-0.4.so.0.27.0 +lrwxrwxrwx root/root usr/lib32/liborc-0.4.so -> liborc-0.4.so.0.29.0 +lrwxrwxrwx root/root usr/lib32/liborc-0.4.so.0 -> liborc-0.4.so.0.29.0 +-rwxr-xr-x root/root usr/lib32/liborc-0.4.so.0.29.0 -rwxr-xr-x root/root usr/lib32/liborc-test-0.4.la -lrwxrwxrwx root/root usr/lib32/liborc-test-0.4.so -> liborc-test-0.4.so.0.27.0 -lrwxrwxrwx root/root usr/lib32/liborc-test-0.4.so.0 -> liborc-test-0.4.so.0.27.0 --rwxr-xr-x root/root usr/lib32/liborc-test-0.4.so.0.27.0 +lrwxrwxrwx root/root usr/lib32/liborc-test-0.4.so -> liborc-test-0.4.so.0.29.0 +lrwxrwxrwx root/root usr/lib32/liborc-test-0.4.so.0 -> liborc-test-0.4.so.0.29.0 +-rwxr-xr-x root/root usr/lib32/liborc-test-0.4.so.0.29.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/orc-0.4.pc +-rw-r--r-- root/root usr/lib32/pkgconfig/orc-test-0.4.pc diff --git a/orc-32/.md5sum b/orc-32/.md5sum deleted file mode 100644 index d31a71b..0000000 --- a/orc-32/.md5sum +++ /dev/null @@ -1 +0,0 @@ -5837dc20dacb5b668935bbded10cbb61 orc-0.4.27.tar.xz diff --git a/orc-32/.signature b/orc-32/.signature index e23d979..a2c1124 100644 --- a/orc-32/.signature +++ b/orc-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXRCjb0djnGoFb99RZVSHSQvJPjKafEVNF2CQYz3HFnDZYHdtkSd+NmqArWWEOI0ctnvbVaVaalCjevof3EItDAA= -SHA256 (Pkgfile) = 1c5c5c8bd3098fdfacef520f96e9df981c1c37d4d18ecd6d0669d0305977a6d9 -SHA256 (.footprint) = 05c36e372c8e98fc81b0e98f86e945f53aff77a91f4555c38b909a9660c4f830 -SHA256 (orc-0.4.27.tar.xz) = 51e53e58fc8158e5986a1f1a49a6d970c5b16493841cf7b9de2c2bde7ce36b93 +RWSwxGo/zH7eXSnEFMByyTPpg4ucuWf1+pXf435Ps3PGKNmbg2evMeaJxrwZaaoBgeYyRH1LMz+OOtJMwYynd1M99pzXHT7v6gA= +SHA256 (Pkgfile) = a979672c33cb4ba0a8a282ced0b88881c5b0b6dbca3f2b5ada8ea57615c9ae12 +SHA256 (.footprint) = c9f1a54ecbf013e4c7fd1e8af25bc7b923930f52935bc704de6cbb04aae3223d +SHA256 (orc-0.4.29.tar.xz) = 4f8901f9144b5ec17dffdb33548b5f4c7f8049b0d1023be3462cdd64ec5a3ab2 diff --git a/orc-32/Pkgfile b/orc-32/Pkgfile index 9fae118..a1548ac 100644 --- a/orc-32/Pkgfile +++ b/orc-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: orc name=orc-32 -version=0.4.27 +version=0.4.29 release=1 source=(https://gstreamer.freedesktop.org/src/orc/orc-$version.tar.xz)

1 0

ports/contrib (3.4): spirv-tools: 2018.5 -> 2019.2
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit e85dd2f044b8e89fae680159e4421ca6f28209f3 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 20:01:43 2019 +1000 spirv-tools: 2018.5 -> 2019.2 diff --git a/spirv-tools/.footprint b/spirv-tools/.footprint index 22eaaf01..8fe8eec5 100644 --- a/spirv-tools/.footprint +++ b/spirv-tools/.footprint @@ -6,10 +6,12 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/spirv-lesspipe.sh -rwxr-xr-x root/root usr/bin/spirv-link -rwxr-xr-x root/root usr/bin/spirv-opt +-rwxr-xr-x root/root usr/bin/spirv-reduce -rwxr-xr-x root/root usr/bin/spirv-stats -rwxr-xr-x root/root usr/bin/spirv-val drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/spirv-tools/ +-rw-r--r-- root/root usr/include/spirv-tools/instrument.hpp -rw-r--r-- root/root usr/include/spirv-tools/libspirv.h -rw-r--r-- root/root usr/include/spirv-tools/libspirv.hpp -rw-r--r-- root/root usr/include/spirv-tools/linker.hpp @@ -17,6 +19,7 @@ drwxr-xr-x root/root usr/include/spirv-tools/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libSPIRV-Tools-link.a -rw-r--r-- root/root usr/lib/libSPIRV-Tools-opt.a +-rw-r--r-- root/root usr/lib/libSPIRV-Tools-reduce.a -rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so -rw-r--r-- root/root usr/lib/libSPIRV-Tools.a drwxr-xr-x root/root usr/lib/pkgconfig/ diff --git a/spirv-tools/.signature b/spirv-tools/.signature index 6d01e776..1023bce9 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34j+Dd6JTqLPXTDqIMCgJqMyDeqr2bkqJnVVkdRqGFQtHYYF3bVsFMOtdSjAlnhpx4mcjk1LMRGhySXx1hINLwc= -SHA256 (Pkgfile) = dc39964b29c9a658030c38db9d6f26cdaab851424852c2b687b2bccebf2a81ee -SHA256 (.footprint) = ebe56e1cb3e3ea28669c31e328c704adac320318cd0427ad2f5e0cf5dc86b02a -SHA256 (SPIRV-Tools-v2018.5.tar.gz) = bc56f1b53827811095aad330e078604f06319c4b0648a4bbe183a4bfe5b3ef58 -SHA256 (8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23.tar.gz) = a67f839a8968bbf6fb50b77f20a55e699797c349d59fa6328303cb00d1e65cbd +RWSagIOpLGJF33X0x72PsxWbS8DxZHnZWy1JHXh/pxLUDBblKFkH4ptRtfC59kNeAyy9vWv8lygPUsjUGSQtZwiT95xnM4KRagE= +SHA256 (Pkgfile) = af4e3519cc4933864a51f5598c7db84d36c210573d95e7e2d9b88a0a39b50d48 +SHA256 (.footprint) = 7eedf8b657a2884ff56545bbbd6b3fe09a193d07ed7c65683e6a9f0a8f78e0ce +SHA256 (SPIRV-Tools-v2019.2.tar.gz) = 1fde9d2a0df920a401441cd77253fc7b3b9ab0578eabda8caaaceaa6c7638440 +SHA256 (2434b89345a50c018c84f42a310b0fad4f3fd94f.tar.gz) = 9213bc1c80ca176b7bf79e2b138c7708d8babc0b069a06ac4fa9ef467fa9322a diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index 74431fc9..6d10a21c 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -4,8 +4,8 @@ # Depends on: cmake python3 name=spirv-tools -version=2018.5 -_commit=8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23 +version=2019.2 +_commit=2434b89345a50c018c84f42a310b0fad4f3fd94f release=1 source=( https://github.com/KhronosGroup/SPIRV-Tools/archive//v$version/SPIRV-Tools-…

1 0

ports/contrib (3.4): bind: updated .signature
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit 476fcd767c211a0083ae6c7f10d3fa8a08bfd01a Author: Matt Housh <jaeger(a)crux.ninja> Date: Sat Apr 20 01:07:26 2019 -0500 bind: updated .signature diff --git a/bind/.signature b/bind/.signature index ef5d0017..5fe048ea 100644 --- a/bind/.signature +++ b/bind/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35sI2R2gffU0eQjInrWMyYJxmAm8Qg2gM3wKrzmHDpqOTxpz/H2C5SGke7wBYdux2pNNFZ9YM0KMDNKk0O4crQ8= +RWSagIOpLGJF30ZuaUhSOFmInJjKVI+o3CdtPJmU/4120pP+faGpp9IvFux32WsoHXFUrQQ55ewNHqva6EpVNjJHBMMdGigFfQw= SHA256 (Pkgfile) = 2f445e5c7f4f4f0809bbdeec8a711f16273712cb9a9f84fa932b72c5054806f6 SHA256 (.footprint) = d4c5a812fe52f2cd50abef8fa6f48aa47ed1619210c91eaec5b15dc74531ed85 SHA256 (bind-9.14.0.tar.gz) = 4edd459830bb97f749e25a5d42a2a4a093d7800e9962fca4300996cf7ea680af -SHA256 (named.root) = 2e19682ad79bee201e3fc0454b73d45d04be7ba7dceb28612ec71fff0add6de4 +SHA256 (named.root) = 9fe5d2aa2e0537e30d370ca76c62982acfeb13c292d52e40e6e70a486b373d25 SHA256 (db.0.0.127) = 6c82640080a1c311005e7a264a2abbaabb7198f39430389b3ddf37cf22f42ff5 SHA256 (db.localhost) = 1a61cc85da0581a784c06535b2462f027bc850270ac7287c1152b8479dc7a053 SHA256 (db.ip6.arpa) = 0a12d01de471bf4169ac96a2aa985068742d50145aa393caa01e506bb3bb4166

1 0

ports/compat-32 (3.4): libgpg-error-32: 1.31 -> 1.36
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit c7ccda44939de157e0ba1e4b12c871bc77a20c59 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 13:25:06 2019 +1000 libgpg-error-32: 1.31 -> 1.36 diff --git a/libgpg-error-32/.footprint b/libgpg-error-32/.footprint index 11ce3d8..4dd1c7b 100644 --- a/libgpg-error-32/.footprint +++ b/libgpg-error-32/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgpg-error.a -rwxr-xr-x root/root usr/lib32/libgpg-error.la -lrwxrwxrwx root/root usr/lib32/libgpg-error.so -> libgpg-error.so.0.24.2 -lrwxrwxrwx root/root usr/lib32/libgpg-error.so.0 -> libgpg-error.so.0.24.2 --rwxr-xr-x root/root usr/lib32/libgpg-error.so.0.24.2 +lrwxrwxrwx root/root usr/lib32/libgpg-error.so -> libgpg-error.so.0.27.0 +lrwxrwxrwx root/root usr/lib32/libgpg-error.so.0 -> libgpg-error.so.0.27.0 +-rwxr-xr-x root/root usr/lib32/libgpg-error.so.0.27.0 +drwxr-xr-x root/root usr/lib32/pkgconfig/ +-rw-r--r-- root/root usr/lib32/pkgconfig/gpg-error.pc diff --git a/libgpg-error-32/.md5sum b/libgpg-error-32/.md5sum deleted file mode 100644 index de4d851..0000000 --- a/libgpg-error-32/.md5sum +++ /dev/null @@ -1 +0,0 @@ -5cc6df0fea27832e9cdbafc60f51561b libgpg-error-1.31.tar.bz2 diff --git a/libgpg-error-32/.signature b/libgpg-error-32/.signature index d84fe8a..8a305c2 100644 --- a/libgpg-error-32/.signature +++ b/libgpg-error-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXQ6ws8bHzsBPGY6dSEdnpSQT3nZo2jyjYdaLO9ucJgWIyvJFRYYgM2nOVJw+7Qxf49lTvP+c8lAZVEadRqUYrg8= -SHA256 (Pkgfile) = 7f3e5fc67f0ccdd26dd76de69d37ef4b86f28f42cf134d533960d8837b7ac093 -SHA256 (.footprint) = a639f60bf5ea07d3a9d2ab85bbd0ee9275f60c9abf2b75856860ce03a1b2ba7e -SHA256 (libgpg-error-1.31.tar.bz2) = 40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef +RWSwxGo/zH7eXUx3qyGT+Rl0855il+db0KBnl3glgSsIxdZpt+c5f85h3iJXOOU1zj5ikjvGGF9eyXspY78+s7dIq6XLIzjySwM= +SHA256 (Pkgfile) = c5fbe8bb6dbe8c88cdaa718c016d9f851814b31a2839c2107a48195afeec6f24 +SHA256 (.footprint) = 72e3c8fde4aef4c57b1adddc1ffe5d05a9d595329a750469c267a3631a51134e +SHA256 (libgpg-error-1.36.tar.bz2) = babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c +SHA256 (gawk.patch) = f6030ebc1b14723b36adb4e5de80693c3875932b444bbb7baaa5e81779f05797 diff --git a/libgpg-error-32/Pkgfile b/libgpg-error-32/Pkgfile index e04e0a0..17f71c8 100644 --- a/libgpg-error-32/Pkgfile +++ b/libgpg-error-32/Pkgfile @@ -4,13 +4,18 @@ # Depends on: libgpg-error name=libgpg-error-32 -version=1.31 +version=1.36 release=1 -source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar.bz2) +source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar.bz2 + gawk.patch) build() { cd ${name%-*}-$version + patch -p1 -i $SRC/gawk.patch + + autoreconf + ./configure \ --prefix=/usr \ --libdir=/usr/lib32 \ diff --git a/libgpg-error-32/gawk.patch b/libgpg-error-32/gawk.patch new file mode 100644 index 0000000..715bffb --- /dev/null +++ b/libgpg-error-32/gawk.patch @@ -0,0 +1,158 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe(a)fsij.org> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0. + +* src/Makefile.am: Use pkg_namespace (instead of namespace). +* src/mkerrnos.awk: Likewise. +* lang/cl/mkerrcodes.awk: Don't escape # in regexp. +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. + +-- + +In Gawk 5.0, regexp routines are replaced by Gnulib implementation, +which only allows escaping specific characters. + +GnuPG-bug-id: 4459 +Reported-by: Marius Schamschula +Signed-off-by: NIIBE Yutaka <gniibe(a)fsij.org> +--- + lang/cl/mkerrcodes.awk | 2 +- + src/Makefile.am | 2 +- + src/mkerrcodes.awk | 2 +- + src/mkerrcodes1.awk | 2 +- + src/mkerrcodes2.awk | 2 +- + src/mkerrnos.awk | 2 +- + src/mkstrtable.awk | 10 +++++----- + 7 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk +index ae29043..9a1fc18 100644 +--- a/lang/cl/mkerrcodes.awk ++++ b/lang/cl/mkerrcodes.awk +@@ -122,7 +122,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/Makefile.am b/src/Makefile.am +index ce1b882..f2590cb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk +index 46d436c..e9c857c 100644 +--- a/src/mkerrcodes.awk ++++ b/src/mkerrcodes.awk +@@ -85,7 +85,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk +index a771a73..4578e29 100644 +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -81,7 +81,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk +index ea58503..188f7a4 100644 +--- a/src/mkerrcodes2.awk ++++ b/src/mkerrcodes2.awk +@@ -91,7 +91,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk +index f79df66..15b1aad 100644 +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -83,7 +83,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk +index c9de9c1..285e45f 100644 +--- a/src/mkstrtable.awk ++++ b/src/mkstrtable.awk +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ header { + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ END { + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ END { + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pkg_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + +-- +2.11.0 +

1 0

ports/contrib (3.4): [notify] mpv: Vulkan support, new dependency shaderc
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit 7860d220718fbfd010857ab9002cf8bb926fe958 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 11:57:18 2019 +1000 [notify] mpv: Vulkan support, new dependency shaderc diff --git a/mpv/.signature b/mpv/.signature index 2d5355ba..e8b03a3c 100644 --- a/mpv/.signature +++ b/mpv/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31CIctbAUyvZ/UxjFkqDYwDrAI7HSud5EFd3WQtig8vDfbQwc+vB+r8N/eaidcs/97EhZWMCMDIcD3l41Vagcwk= -SHA256 (Pkgfile) = 79593cae5ea7c8d183a8bba09c62ce726894b2a93fb8eb3ce8c9e9cb80554bfa +RWSagIOpLGJF3/zgyFxVoShNb5p+HE2PbbWkeKdyCeRfKGh4FD2NTqmL24HTl4Svm1tqGLB1PG33DN8u3tssE3j7c9IVLMUzKws= +SHA256 (Pkgfile) = 8d412d8a64097451c83190a87bc8759d965c9d44c860011cff557db94f236edc SHA256 (.footprint) = cef8e1c34e137b615933b633f17702039ca05bd350dc81f1c9b4c61036bb884e SHA256 (mpv-v0.29.1.tar.gz) = f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 diff --git a/mpv/Pkgfile b/mpv/Pkgfile index b31c9876..4ca99041 100644 --- a/mpv/Pkgfile +++ b/mpv/Pkgfile @@ -1,12 +1,12 @@ # Description: General Purpose video player based on MPlayer and mplayer2 # URL: https://mpv.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: docutils ffmpeg libass util-linux xorg-libxscrnsaver +# Depends on: docutils ffmpeg libass shaderc util-linux xorg-libxscrnsaver # Optional: youtube-dl libquvi libdvdnav libbluray libcdio-paranoia libvdpau rubberband vulkan-loader name=mpv version=0.29.1 -release=1 +release=2 source=(https://github.com/$name-player/$name/archive/v$version/$name-v$ver… build() { diff --git a/mpv/README b/mpv/README index 1b0ea7c0..e085baad 100644 --- a/mpv/README +++ b/mpv/README @@ -5,3 +5,5 @@ For optical audio/dvd/blu-ray playback you need to install For nvidia hardware decoding x.264 support you need to install "ffnvcodec-headers", then either force rebuild ffmpeg or compile ffmpeg. + +To use Vulkan API add "--vo=gpu --gpu-api=vulkan" to mpv.

1 0

ports/contrib (3.4): shaderc: initial import
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit e3971b7e71c9e75cf9c56beb2e668f07badede15 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 11:48:32 2019 +1000 shaderc: initial import diff --git a/shaderc/.footprint b/shaderc/.footprint new file mode 100644 index 00000000..7bc39ded --- /dev/null +++ b/shaderc/.footprint @@ -0,0 +1,13 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/glslc +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/shaderc/ +-rw-r--r-- root/root usr/include/shaderc/shaderc.h +-rw-r--r-- root/root usr/include/shaderc/shaderc.hpp +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libshaderc.a +-rw-r--r-- root/root usr/lib/libshaderc_combined.a +lrwxrwxrwx root/root usr/lib/libshaderc_shared.so -> libshaderc_shared.so.1 +-rwxr-xr-x root/root usr/lib/libshaderc_shared.so.1 +-rw-r--r-- root/root usr/lib/libshaderc_util.a diff --git a/shaderc/.signature b/shaderc/.signature new file mode 100644 index 00000000..b04f0675 --- /dev/null +++ b/shaderc/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF371GTbgUPufTmR0tFTdyAtBaRo56fn/dzuwcNV/oi25B63Dbe2fRYEbYunpABNFH/qMHZdXY/oXF/kLGsyBxTAk= +SHA256 (Pkgfile) = 18eb6194163dd19914ed1ddf5aa5c78e4a234f8d20bbf82739238f40dd3266f9 +SHA256 (.footprint) = da2cc5a9f214dd43b006db6f17cc4fdbdaeef2703bf9e2d5480feb69ff1ca9e9 +SHA256 (shaderc-v2018.0.tar.gz) = b96f27e7375a6df08732ebd47c18febf82bd0a87e541fd7814fd8c3aa6c8913a +SHA256 (fix-glslang-link-order.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile new file mode 100644 index 00000000..15a0dc88 --- /dev/null +++ b/shaderc/Pkgfile @@ -0,0 +1,44 @@ +# Description: Collection of tools, libraries and tests for shader compilation. +# URL: https://github.com/google/shaderc +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: glslang ninja + +name=shaderc +version=2018.0 +release=1 +source=(https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz + fix-glslang-link-order.patch) + +build() { + cd $name-$version + + patch -p1 -i $SRC/fix-glslang-link-order.patch + + # de-vendor libs and disable git versioning + sed '/examples/d;/third_party/d' -i CMakeLists.txt + sed '/build-version/d' -i glslc/CMakeLists.txt + cat <<- EOF > glslc/src/build-version.inc +"${pkgver}\\n" +"$(prt-get info spirv-tools | awk '/^Version:/ {print $2}')\\n" +"$(prt-get info glslang | awk '/^Version:/ {print $2}')\\n" +EOF + + mkdir build + cd build + + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DSHADERC_SKIP_TESTS=ON \ + -GNinja \ + -DSHADERC_ENABLE_NV_EXTENSIONS=OFF # Currently requires glslang-git + + ninja -j ${JOBS:-1} + + DESTDIR=$PKG ninja install + + #cd ../glslc + #asciidoctor -b manpage README.asciidoc -o glslc.1 + #install -D -m 0644 -t $PKG/usr/share/man/man1 glslc/glslc.1 +} diff --git a/shaderc/fix-glslang-link-order.patch b/shaderc/fix-glslang-link-order.patch new file mode 100644 index 00000000..a404c858 --- /dev/null +++ b/shaderc/fix-glslang-link-order.patch @@ -0,0 +1,44 @@ +From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001 +From: Niklas Haas <git(a)haasn.xyz> +Date: Tue, 29 May 2018 07:34:00 +0200 +Subject: [PATCH] Fix the link order of libglslang and libHLSL + +libglslang depends on libHLSL, so the latter needs to be specified last. +This fixes an issue when trying to build shaderc against system-wide +versions of libglslang/libHLSL, rather than the in-tree versions from +third_party. + +Additionally, libshaderc_util also depends on SPIRV-Tools +--- + glslc/CMakeLists.txt | 2 +- + libshaderc_util/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt +index acf6fb0b..0f5d8886 100644 +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -18,7 +18,7 @@ add_library(glslc STATIC + shaderc_default_compile_options(glslc) + target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) + target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler +- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT}) ++ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(glslc PRIVATE shaderc_util shaderc) + + add_executable(glslc_exe src/main.cc) +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 873540ab..6d0c465c 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) + target_link_libraries(shaderc_util PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV +- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) ++ glslang OSDependent OGLCompiler glslang HLSL SPIRV ++ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) + + shaderc_add_tests( + TEST_PREFIX shaderc_util

1 0

ports/contrib (3.4): [notify] glslang: new dependency spirv-tools
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit 3729a0573fdb1e25a8b68413537e2cbde63aa0a5 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 11:47:51 2019 +1000 [notify] glslang: new dependency spirv-tools diff --git a/glslang/.footprint b/glslang/.footprint index a9041d55..0839bba1 100644 --- a/glslang/.footprint +++ b/glslang/.footprint @@ -1,16 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/glslangValidator --rwxr-xr-x root/root usr/bin/spirv-as --rwxr-xr-x root/root usr/bin/spirv-cfg --rwxr-xr-x root/root usr/bin/spirv-dis --rwxr-xr-x root/root usr/bin/spirv-lesspipe.sh --rwxr-xr-x root/root usr/bin/spirv-link --rwxr-xr-x root/root usr/bin/spirv-opt --rwxr-xr-x root/root usr/bin/spirv-reduce -rwxr-xr-x root/root usr/bin/spirv-remap --rwxr-xr-x root/root usr/bin/spirv-stats --rwxr-xr-x root/root usr/bin/spirv-val drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/SPIRV/ -rw-r--r-- root/root usr/include/SPIRV/GLSL.ext.AMD.h @@ -65,25 +56,20 @@ drwxr-xr-x root/root usr/include/glslang/MachineIndependent/preprocessor/ -rw-r--r-- root/root usr/include/glslang/MachineIndependent/reflection.h drwxr-xr-x root/root usr/include/glslang/Public/ -rw-r--r-- root/root usr/include/glslang/Public/ShaderLang.h -drwxr-xr-x root/root usr/include/spirv-tools/ --rw-r--r-- root/root usr/include/spirv-tools/instrument.hpp --rw-r--r-- root/root usr/include/spirv-tools/libspirv.h --rw-r--r-- root/root usr/include/spirv-tools/libspirv.hpp --rw-r--r-- root/root usr/include/spirv-tools/linker.hpp --rw-r--r-- root/root usr/include/spirv-tools/optimizer.hpp drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libHLSL.a -rwxr-xr-x root/root usr/lib/libHLSL.so +lrwxrwxrwx root/root usr/lib/libHLSL.so.0 -> libHLSL.so -rw-r--r-- root/root usr/lib/libOGLCompiler.a -rw-r--r-- root/root usr/lib/libOSDependent.a --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-link.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-opt.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-reduce.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so --rwxr-xr-x root/root usr/lib/libSPIRV-Tools.so +-rw-r--r-- root/root usr/lib/libSPIRV.a -rwxr-xr-x root/root usr/lib/libSPIRV.so +lrwxrwxrwx root/root usr/lib/libSPIRV.so.0 -> libSPIRV.so +-rw-r--r-- root/root usr/lib/libSPVRemapper.a -rwxr-xr-x root/root usr/lib/libSPVRemapper.so +lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.0 -> libSPVRemapper.so -rwxr-xr-x root/root usr/lib/libglslang-default-resource-limits.so +lrwxrwxrwx root/root usr/lib/libglslang-default-resource-limits.so.0 -> libglslang-default-resource-limits.so +-rw-r--r-- root/root usr/lib/libglslang.a -rwxr-xr-x root/root usr/lib/libglslang.so -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools-shared.pc --rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools.pc +lrwxrwxrwx root/root usr/lib/libglslang.so.0 -> libglslang.so diff --git a/glslang/.signature b/glslang/.signature index 4f6c80cc..308f9780 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35ZoDEAqP/dvk4jcWJKOEOy83uqYeNHLq2u5VWCh4g3DLFjgzIkoy+svf0l5eiIMHwbP9Cf7IsJ0vvxgZt5aGgo= -SHA256 (Pkgfile) = 67d520f9ac908b1c65876f054c4cede7a4313b2a77e1207eba83f69fcc07112c -SHA256 (.footprint) = 35fb146142d61e33717e5d383b97477555ace56a0306e309b983ebfe22f0ef0f +RWSagIOpLGJF3wAlS/nnZzxtjIQQqCfdMvzdLPV5Ivqs+lCGMxth80YxxGuuwB2Fq6jCtweRitRgvSYgS6uf1ghn1H+ThSoKpwY= +SHA256 (Pkgfile) = ffeed3e18664eab46cc3b39cbc8a5924e6fe2450858b45f47d95f79684539bdc +SHA256 (.footprint) = 6efc8343d6d8e000bcb8127c467203b1c2938fcc087ab826a00dd97c6f5b51e0 SHA256 (glslang-7.11.3113.tar.gz) = 4d238000162029f791cfcd65a28f10defa574516b94d9392695d27c8a1ce8b62 diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 6b5f2c24..e5a2eff9 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -1,23 +1,40 @@ # Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator # URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler # Maintainer: Pedja, predivan at mts dot rs -# Depends on: cmake git +# Depends on: spirv-tools name=glslang version=7.11.3113 -release=1 +release=2 source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$ver… #source=(https://bitbucket.org/predivan/distfiles/downloads/$name-$version.tar.bz2) build() { cd $name-$version - python update_glslang_sources.py - mkdir build - cd build - cmake \ + + mkdir -p build-{shared,static} + + (cd build-shared + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON + make + ) + + (cd build-static + cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=ON ../ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF make - make DESTDIR=$PKG install + ) + + make -C build-shared DESTDIR=$PKG install + make -C build-static DESTDIR=$PKG install + + cd $PKG/usr/lib + for lib in *.so; do + ln -sf "${lib}" "${lib}.0" + done }

1 0

ports/contrib (3.4): [notify] spirv-tools: initial import, this will have files that clash with glslang, either force install or remove glslang first then rebuild glslang
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit 87055a3fc2baf4f0041e24a74e34cdc2215f0b1e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 20 11:46:01 2019 +1000 [notify] spirv-tools: initial import, this will have files that clash with glslang, either force install or remove glslang first then rebuild glslang diff --git a/spirv-tools/.footprint b/spirv-tools/.footprint new file mode 100644 index 00000000..22eaaf01 --- /dev/null +++ b/spirv-tools/.footprint @@ -0,0 +1,24 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/spirv-as +-rwxr-xr-x root/root usr/bin/spirv-cfg +-rwxr-xr-x root/root usr/bin/spirv-dis +-rwxr-xr-x root/root usr/bin/spirv-lesspipe.sh +-rwxr-xr-x root/root usr/bin/spirv-link +-rwxr-xr-x root/root usr/bin/spirv-opt +-rwxr-xr-x root/root usr/bin/spirv-stats +-rwxr-xr-x root/root usr/bin/spirv-val +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/spirv-tools/ +-rw-r--r-- root/root usr/include/spirv-tools/libspirv.h +-rw-r--r-- root/root usr/include/spirv-tools/libspirv.hpp +-rw-r--r-- root/root usr/include/spirv-tools/linker.hpp +-rw-r--r-- root/root usr/include/spirv-tools/optimizer.hpp +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libSPIRV-Tools-link.a +-rw-r--r-- root/root usr/lib/libSPIRV-Tools-opt.a +-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so +-rw-r--r-- root/root usr/lib/libSPIRV-Tools.a +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools-shared.pc +-rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools.pc diff --git a/spirv-tools/.signature b/spirv-tools/.signature new file mode 100644 index 00000000..6d01e776 --- /dev/null +++ b/spirv-tools/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF34j+Dd6JTqLPXTDqIMCgJqMyDeqr2bkqJnVVkdRqGFQtHYYF3bVsFMOtdSjAlnhpx4mcjk1LMRGhySXx1hINLwc= +SHA256 (Pkgfile) = dc39964b29c9a658030c38db9d6f26cdaab851424852c2b687b2bccebf2a81ee +SHA256 (.footprint) = ebe56e1cb3e3ea28669c31e328c704adac320318cd0427ad2f5e0cf5dc86b02a +SHA256 (SPIRV-Tools-v2018.5.tar.gz) = bc56f1b53827811095aad330e078604f06319c4b0648a4bbe183a4bfe5b3ef58 +SHA256 (8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23.tar.gz) = a67f839a8968bbf6fb50b77f20a55e699797c349d59fa6328303cb00d1e65cbd diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile new file mode 100644 index 00000000..74431fc9 --- /dev/null +++ b/spirv-tools/Pkgfile @@ -0,0 +1,31 @@ +# Description: API and commands for processing SPIR-V modules +# URL: https://www.khronos.org/vulkan/ +# Maintainer: Pedja, predivan at mts dot rs +# Depends on: cmake python3 + +name=spirv-tools +version=2018.5 +_commit=8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23 +release=1 +source=( + https://github.com/KhronosGroup/SPIRV-Tools/archive//v$version/SPIRV-Tools-… + https://github.com/KhronosGroup/SPIRV-Headers/archive/$_commit.tar.gz +) + +build() { + mv SPIRV-Headers-$_commit SPIRV-Headers + cd SPIRV-Tools-$version + + mkdir build + cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DSPIRV_WERROR=Off \ + -DSPIRV-Headers_SOURCE_DIR=${SRC}/SPIRV-Headers + + make + make DESTDIR=$PKG install +}

1 0

ports/contrib (3.5): sdl2_net: initial import
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit 9f6dce9a0f4066ec9c1be603387fad048d056a73 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 13 18:41:04 2019 +1000 sdl2_net: initial import diff --git a/sdl2_net/.footprint b/sdl2_net/.footprint new file mode 100644 index 00000000..0697a44d --- /dev/null +++ b/sdl2_net/.footprint @@ -0,0 +1,12 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/SDL2/ +-rw-r--r-- root/root usr/include/SDL2/SDL_net.h +drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libSDL2_net-2.0.so.0 -> libSDL2_net-2.0.so.0.0.1 +-rwxr-xr-x root/root usr/lib/libSDL2_net-2.0.so.0.0.1 +-rw-r--r-- root/root usr/lib/libSDL2_net.a +-rwxr-xr-x root/root usr/lib/libSDL2_net.la +lrwxrwxrwx root/root usr/lib/libSDL2_net.so -> libSDL2_net-2.0.so.0.0.1 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/SDL2_net.pc diff --git a/sdl2_net/.signature b/sdl2_net/.signature new file mode 100644 index 00000000..4df9656e --- /dev/null +++ b/sdl2_net/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF37D0AsI1Ew0AXGtL78lHNZ3BgFWN0BNekc8B3tt5BUXrlsWG3HbPokSpPd94S3aMKcK8k9hYuu1rUG3YPYKw/Qk= +SHA256 (Pkgfile) = 3196131e028ab0bdece13d20512ba5b3c57bde816f64c7ba59f3679bd41db5e7 +SHA256 (.footprint) = 43643fc880b24363de87f532de7f91ec6674ee6aac64d56ff059b6c940818955 +SHA256 (SDL2_net-2.0.1.tar.gz) = 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21 diff --git a/sdl2_net/Pkgfile b/sdl2_net/Pkgfile new file mode 100644 index 00000000..4209329d --- /dev/null +++ b/sdl2_net/Pkgfile @@ -0,0 +1,16 @@ +# Description: A cross-platform networking library for SDL2. +# URL: https://www.libsdl.org/projects/SDL_net/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: libsdl2 + +name=sdl2_net +version=2.0.1 +release=1 +source=(https://www.libsdl.org/projects/SDL_net/release/SDL2_net-$version.tar.gz) + +build() { + cd SDL2_net-$version + ./configure --prefix=/usr + make + make DESTDIR=$PKG install +}

1 0

ports/contrib (3.5): sdl_ttf: bug fixes
by crux＠crux.nu 20 Apr '19

20 Apr '19

commit 51f2ccbc7330229c8cd94b7fa5f30da498d5e4e6 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 13 18:32:05 2019 +1000 sdl_ttf: bug fixes diff --git a/sdl_ttf/.signature b/sdl_ttf/.signature index 1aeb9198..cfd1a814 100644 --- a/sdl_ttf/.signature +++ b/sdl_ttf/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35ZMPrk6lAHTWPgYOpiHd0eyNdrzlJ+H3Q0MCUgy1azkShMSyWwjuU6oRpuF6qZhjfqv319/hJM6tJhWsrQhow0= -SHA256 (Pkgfile) = f0d74da071ad9acc2046ed5d0d9c2d1ef81ca8d2e277e301c03707190f6cbdc9 +RWSagIOpLGJF3wMqgmpyDXwlGyPhyvwrmPk2OI86dHHRGph+X2+whDeQ0ziGycEkXcF7dR7ifLvloQiPeviUQ/nc16eFqQO+Lwg= +SHA256 (Pkgfile) = 7670b947de6ffed51a2aee18014edd70840c90cf45d7ac9dfd55bf1a5c37626e SHA256 (.footprint) = 2b4e678b2ec669dfd9c984c938bb395b191ff84f71b12239239087ab514f50d2 SHA256 (SDL_ttf-2.0.11.tar.gz) = 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 +SHA256 (freetype-pkgconfig.patch) = 87412f614b97b4724cb4845db882f07c15caf098dee57a856d6dbae0f58de80d +SHA256 (bug1433.patch) = 4baea703454b9bca9498a920485552f1b8489a5007f8f1366080b14a4cd74c90 diff --git a/sdl_ttf/Pkgfile b/sdl_ttf/Pkgfile index 2e4b770d..47367dbf 100644 --- a/sdl_ttf/Pkgfile +++ b/sdl_ttf/Pkgfile @@ -1,21 +1,25 @@ # Description: TrueType library for libsdl. -# URL: http://www.libsdl.org/projects/SDL_ttf/ +# URL: https://www.libsdl.org/projects/SDL_ttf/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Simone Rota, sip at crux dot nu # Depends on: freetype libsdl name=sdl_ttf version=2.0.11 -release=1 -source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$version.tar.gz) +release=2 +source=(https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$version.tar.gz + freetype-pkgconfig.patch + bug1433.patch) build() { cd SDL_ttf-$version - ./configure \ - --prefix=/usr \ - --disable-dependency-tracking + patch -i $SRC/bug1433.patch + patch -p1 -i $SRC/freetype-pkgconfig.patch + touch NEWS README AUTHORS ChangeLog + autoreconf -vi + + ./configure --prefix=/usr make make DESTDIR=$PKG install } diff --git a/sdl_ttf/bug1433.patch b/sdl_ttf/bug1433.patch new file mode 100644 index 00000000..b402fb3e --- /dev/null +++ b/sdl_ttf/bug1433.patch @@ -0,0 +1,11 @@ +--- SDL_ttf.c.orig 2012-02-12 16:36:41.859977617 +0100 ++++ SDL_ttf.c 2012-02-12 16:36:53.696580159 +0100 +@@ -1747,7 +1747,7 @@ + /* Copy the character from the pixmap */ + src = glyph->pixmap.buffer; + dst = (Uint8*) textbuf->pixels; +- for ( row = 0; row < glyph->bitmap.rows; ++row ) { ++ for ( row = 0; row < glyph->pixmap.rows; ++row ) { + memcpy( dst, src, glyph->pixmap.width ); + src += glyph->pixmap.pitch; + dst += textbuf->pitch; \ No newline at end of file diff --git a/sdl_ttf/freetype-pkgconfig.patch b/sdl_ttf/freetype-pkgconfig.patch new file mode 100644 index 00000000..02b06356 --- /dev/null +++ b/sdl_ttf/freetype-pkgconfig.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/654758 + +--- SDL_ttf-2.0.11/configure.in ++++ SDL_ttf-2.0.11/configure.in +@@ -64,6 +64,7 @@ + ;; + esac + ++PKG_PROG_PKG_CONFIG + + dnl Check for iconv (character conversion library; see iconv.m4) + dnl This isn't available on many systems +@@ -94,6 +95,17 @@ + dnl + dnl Get the cflags and libraries from the freetype-config script + dnl ++PKG_CHECK_MODULES( ++ FREETYPE2, ++ freetype2, ++ [ ++ ft_found=yes ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LIBS="$LIBS $FREETYPE2_LIBS" ++ ], ++ ft_found=no ++) ++ + AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is + installed (optional)], + freetype_prefix="$withval", freetype_prefix="") +@@ -101,6 +113,7 @@ + where FREETYPE is installed (optional)], + freetype_exec_prefix="$withval", freetype_exec_prefix="") + ++if test "x$ft_found" != "xyes" ; then + if test x$freetype_exec_prefix != x ; then + freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" + if test x${FREETYPE_CONFIG+set} != xset ; then +@@ -123,6 +136,7 @@ + CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" + LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" + fi ++fi + + dnl Check for SDL + SDL_VERSION=1.2.4

1 0