From f0e7682ce682a5babbaefadb0a9d655bed718b47 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 9 Feb 2018 15:23:30 -0200 Subject: [PATCH 001/759] ilmbase: update to 2.2.1. --- common/shlibs | 10 +++++----- srcpkgs/ilmbase/template | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index cdecd2da52c..25af9724316 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1680,11 +1680,11 @@ libtcmalloc_minimal_debug.so.4 gperftools-2.1.90_1 libtcmalloc_debug.so.4 gperftools-2.1.90_1 libprofiler.so.0 gperftools-2.1.90_1 libtcmalloc_and_profiler.so.4 gperftools-2.1.90_1 -libHalf.so.12 ilmbase-2.2.0_1 -libIex-2_2.so.12 ilmbase-2.2.0_1 -libIexMath-2_2.so.12 ilmbase-2.2.0_1 -libImath-2_2.so.12 ilmbase-2.2.0_1 -libIlmThread-2_2.so.12 ilmbase-2.2.0_1 +libHalf.so.23 ilmbase-2.2.1_1 +libIex-2_2.so.23 ilmbase-2.2.1_1 +libIexMath-2_2.so.23 ilmbase-2.2.1_1 +libImath-2_2.so.23 ilmbase-2.2.1_1 +libIlmThread-2_2.so.23 ilmbase-2.2.1_1 libIlmImf-2_2.so.22 libopenexr-2.2.0_1 libIlmImfUtil-2_2.so.22 libopenexr-2.2.0_1 libGraphicsMagick.so.3 libgraphicsmagick-1.3.19_1 diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template index 1fbf5baeef9..f539fb2ae17 100644 --- a/srcpkgs/ilmbase/template +++ b/srcpkgs/ilmbase/template @@ -1,14 +1,14 @@ # Template file for 'ilmbase' pkgname=ilmbase -version=2.2.0 -revision=4 +version=2.2.1 +revision=1 build_style=gnu-configure short_desc="Base libraries from ILM for OpenEXR" maintainer="Juan RP " license="BSD" homepage="http://www.openexr.com" distfiles="${NONGNU_SITE}/openexr/$pkgname-$version.tar.gz" -checksum=ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7 +checksum=cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e LDFLAGS="-lpthread" From bdf15c364002f95997c1748f6f75af67e2023856 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:10 -0300 Subject: [PATCH 002/759] blender: rebuild against ilmbase-2.1.1. --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 8566a01fbf9..998f354fe07 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=1 +revision=2 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel From 23864a86d35dec628003da97f152f4483551be7b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:14 -0300 Subject: [PATCH 003/759] darktable: rebuild against ilmbase-2.1.1. --- srcpkgs/darktable/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 571510e4033..dd07a4d6a4a 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,7 +1,7 @@ # Template file for 'darktable' pkgname=darktable version=2.4.4 -revision=1 +revision=2 build_style=cmake # this makes sure to use -march=generic and -msse3 configure_args="-DBINARY_PACKAGE_BUILD=ON -DBUILD_NOISE_TOOLS=ON" From 9844e534f77bb955dbc63a659e887c4ff4c8b76e Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:18 -0300 Subject: [PATCH 004/759] hugin: rebuild against ilmbase-2.1.1. --- srcpkgs/hugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 1dd4176ba01..a4e454dcffa 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2018.0.0 -revision=1 +revision=2 wrksrc=${pkgname}-${version} build_style=cmake pycompile_module="hpi.py hsi.py" From a8d5ee9b0c79932d071d177b42dc8f6d4220bb84 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:20 -0300 Subject: [PATCH 005/759] kdelibs: rebuild against ilmbase-2.1.1. --- srcpkgs/kdelibs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index 7c36effb18e..796b8948ce2 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -1,7 +1,7 @@ # Template file for 'kdelibs' pkgname=kdelibs version=4.14.3 -revision=9 +revision=10 short_desc="KDE core libraries" maintainer="Juan RP " license="GPL-2.0, LGPL-2.1, FDL" From 2226ba25224f506df97e18bedee5c91cfe1a3563 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:23 -0300 Subject: [PATCH 006/759] kimageformats: rebuild against ilmbase-2.1.1. --- srcpkgs/kimageformats/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 5c67c3011ed..6cc1c0456fd 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,7 +1,7 @@ # Template file for 'kimageformats' pkgname=kimageformats version=5.43.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" From c43eecbaa9d9eb73df115cda8cf39b01812dee60 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:25 -0300 Subject: [PATCH 007/759] krita: rebuild against ilmbase-2.1.1. --- srcpkgs/krita/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 60de41e5bdb..0aeec52d56d 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=4.0.3 -revision=1 +revision=2 nocross=yes build_style=cmake replaces="calligra-krita>=0" From f442c88f2de4e95c340f217de6165d2c339ddb5f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:27 -0300 Subject: [PATCH 008/759] luxmark: rebuild against ilmbase-2.1.1. --- srcpkgs/luxmark/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 2c38486b89f..591857a3322 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -1,7 +1,7 @@ # Template file for 'luxmark' pkgname=luxmark version=3.1 -revision=4 +revision=5 build_style=cmake makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel From cbe79f40ac87137807eaf50c1e61fc5d2fe8e1e3 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:29 -0300 Subject: [PATCH 009/759] luxrays: rebuild against ilmbase-2.1.1. --- srcpkgs/luxrays/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 5be3b53f60e..50e0fc3d530 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,7 +1,7 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=8 +revision=9 build_style=cmake configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" hostmakedepends="flex bison boost-python" From 917fc99a54cdcc030629fe0a7b80b405b2ab7de4 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:30 -0300 Subject: [PATCH 010/759] opencv: rebuild against ilmbase-2.1.1. --- srcpkgs/opencv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index a6c8cf853a6..832078aa3f9 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv version=3.4.1 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON" From f54cce4e0fc7725f49b0295fcbbaaa34a29fbad4 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:31 -0300 Subject: [PATCH 011/759] openexr: rebuild against ilmbase-2.1.1. --- srcpkgs/openexr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template index 1571c36ba4c..a2c5b940cba 100644 --- a/srcpkgs/openexr/template +++ b/srcpkgs/openexr/template @@ -1,7 +1,7 @@ # Template file for 'openexr' pkgname=openexr version=2.2.0 -revision=5 +revision=6 build_style=gnu-configure maintainer="Juan RP " homepage="http://www.openexr.com/" From bca6baf98c42adf3a9c93208699b29c98a83622a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:33 -0300 Subject: [PATCH 012/759] openimageio: rebuild against ilmbase-2.1.1. --- srcpkgs/openimageio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 62e521aa5ae..38a3f0d267f 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=1.7.18 -revision=1 +revision=2 wrksrc=oiio-Release-${version} build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 From 131c6e44731ff1e4a416c2ae3fdf3c55d72149d1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:34 -0300 Subject: [PATCH 013/759] osg: rebuild against ilmbase-2.1.1. --- srcpkgs/osg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 388e4a922dc..d99e7ebab1c 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -2,7 +2,7 @@ pkgname=osg reverts=3.6.0_1 version=3.4.1 -revision=2 +revision=3 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake # don't use /usr/lib64 on 64bit platforms From 52a18d11fc7c6a0291b22a67959c8bbd65a826c2 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:36 -0300 Subject: [PATCH 014/759] synfig: rebuild against ilmbase-2.1.1. --- srcpkgs/synfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template index fdea92af49b..aa2a831f80c 100644 --- a/srcpkgs/synfig/template +++ b/srcpkgs/synfig/template @@ -1,7 +1,7 @@ # Template file for 'synfig' pkgname=synfig version=1.2.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="boost-build ImageMagick pkg-config intltool" From bff13729bf65231ede50306f112d81ce5ca26cec Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:38 -0300 Subject: [PATCH 015/759] synfigstudio: rebuild against ilmbase-2.1.1. --- srcpkgs/synfigstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index 6dd4f0b6ab5..3f653d74c6f 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -1,7 +1,7 @@ # Template file for 'synfigstudio' pkgname=synfigstudio version=1.2.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool gettext" makedepends="ETL synfig-devel gtkmm-devel libltdl-devel boost-devel" From bf0cfb93ef8737c223b0a267462fcc565903ee25 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 May 2018 13:50:40 -0300 Subject: [PATCH 016/759] vigra: rebuild against ilmbase-2.1.1. [ci skip] --- srcpkgs/vigra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template index 589cb4db3b0..52dfd5491c3 100644 --- a/srcpkgs/vigra/template +++ b/srcpkgs/vigra/template @@ -1,7 +1,7 @@ # Template file for 'vigra' pkgname=vigra version=1.11.1 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_OPENEXR=1" hostmakedepends="python" From de90af6c24eef0cfd0902a17609a401b88efd77a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 6 Jun 2018 23:59:56 -0300 Subject: [PATCH 017/759] protobuf: update to 3.6.0.1. --- common/shlibs | 6 +++--- srcpkgs/libprotobuf | 1 + srcpkgs/libprotoc | 1 + srcpkgs/protobuf/patches/musl-fix.patch | 24 ------------------------ srcpkgs/protobuf/template | 21 ++++++++++++++------- 5 files changed, 19 insertions(+), 34 deletions(-) create mode 120000 srcpkgs/libprotobuf create mode 120000 srcpkgs/libprotoc delete mode 100644 srcpkgs/protobuf/patches/musl-fix.patch diff --git a/common/shlibs b/common/shlibs index cdecd2da52c..6dec0fb9511 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2994,9 +2994,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1 libm17n-gui.so.0 m17n-lib-1.7.0_1 libm17n-core.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1 -libprotobuf-lite.so.15 protobuf-lite-3.5.0.1_1 -libprotoc.so.15 protobuf-3.5.0.1_1 -libprotobuf.so.15 protobuf-3.5.0.1_1 +libprotobuf-lite.so.16 protobuf-lite-3.6.0_1 +libprotoc.so.16 protobuf-3.6.0_1 +libprotobuf.so.16 protobuf-3.6.0_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1 diff --git a/srcpkgs/libprotobuf b/srcpkgs/libprotobuf new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotobuf @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/libprotoc b/srcpkgs/libprotoc new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotoc @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf/patches/musl-fix.patch b/srcpkgs/protobuf/patches/musl-fix.patch deleted file mode 100644 index 5c3b88b7c23..00000000000 --- a/srcpkgs/protobuf/patches/musl-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -seems like both musl libc and android has byteswap.h - -diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h -index 376be5f..21223f4 100644 ---- src/google/protobuf/stubs/port.h -+++ src/google/protobuf/stubs/port.h -@@ -87,7 +87,7 @@ - #include // NOLINT(build/include) - #elif defined(__APPLE__) - #include --#elif defined(__GLIBC__) || defined(__CYGWIN__) -+#elif defined(__linux__) || defined(__CYGWIN__) - #include // IWYU pragma: export - #endif - -@@ -299,7 +299,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) { - #define bswap_32(x) OSSwapInt32(x) - #define bswap_64(x) OSSwapInt64(x) - --#elif !defined(__GLIBC__) && !defined(__CYGWIN__) -+#elif !defined(__linux__) && !defined(__CYGWIN__) - - static inline uint16 bswap_16(uint16 x) { - return static_cast(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 3bbd35e6146..cd1087d954a 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,16 +1,17 @@ # Template file for 'protobuf' pkgname=protobuf -version=3.5.2 +version=3.6.0.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" short_desc="Google's data interchange format" maintainer="Michael Aldridge " -distfiles="https://github.com/google/protobuf/archive/v${version}.tar.gz" -homepage="https://developers.google.com/protocol-buffers/" license="BSD-3-Clause" -checksum=4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2 +homepage="https://developers.google.com/protocol-buffers/" +#changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" +distfiles="https://github.com/google/protobuf/archive/v${version}.tar.gz" +checksum=1144ef1fa9c50d3c04880f363b988df6ca6a66e337a945f1661cf4256ffba749 CXXFLAGS="-std=c++14" @@ -24,9 +25,14 @@ pre_configure() { autoreconf -fi } +post_install() { + vlicense LICENSE +} + protobuf-devel_package() { - depends="zlib-devel protobuf>=${version}_${revision} protobuf-lite>=${version}_${revision}" - short_desc="Google's data interchange format - development files" + depends="zlib-devel protobuf-${version}_${revision} + protobuf-lite-${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -34,8 +40,9 @@ protobuf-devel_package() { vmove "usr/lib/*.so" } } + protobuf-lite_package() { - short_desc="Google's data interchange format - Lite version" + short_desc+=" - Lite version" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" } From 446fc05df167fe08fdd752bea61f00dbfe0b2d79 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:48 -0300 Subject: [PATCH 018/759] bitcoin: rebuild against protobuf-3.6.0 --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index e695dd4a857..b277cec9c43 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.16.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config yasm" From 2333871b71df463191411d7c1b3f56ff2153390e Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:49 -0300 Subject: [PATCH 019/759] clementine: rebuild against protobuf-3.6.0 --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 2652758ca79..20955c9e9ec 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=13 +revision=14 patch_args="-Np1" build_style=cmake hostmakedepends="sparsehash pkg-config qt-host-tools qt-devel protobuf-c" From ce1d412dc12c584ea8945542b3673edf2d6a6c94 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:49 -0300 Subject: [PATCH 020/759] cura-engine: rebuild against protobuf-3.6.0 --- srcpkgs/cura-engine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 8ff820c5940..abcf24ba86a 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,7 +1,7 @@ # Template file for 'cura-engine' pkgname=cura-engine version=3.3.0 -revision=1 +revision=2 wrksrc="CuraEngine-${version}" build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" From 6625e05bcfca75cd51aa0e8f01b3406cbe688917 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:50 -0300 Subject: [PATCH 021/759] libArcus: rebuild against protobuf-3.6.0 --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 818eb276d7e..4dcd30e78bd 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus version=3.3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" From 1f6fd62706299bfc10c1feea734d0215fe345156 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:50 -0300 Subject: [PATCH 022/759] litecoin: rebuild against protobuf-3.6.0 --- srcpkgs/litecoin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index fe8bdd3bb2b..5dd49f27977 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.16.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" @@ -15,7 +15,7 @@ homepage="http://www.litecoin.org/" distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz" checksum=8364a69f05cec64e1fd492d41372552cdde86358d22bb0e074dbf917e65371a0 -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools protobuf" configure_args+=" --with-boost=${XBPS_CROSS_BASE}" fi From 9d326deab59e0b0b3705a5985e1614b9248a2fcd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:51 -0300 Subject: [PATCH 023/759] mixxx: rebuild against protobuf-3.6.0 --- srcpkgs/mixxx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 59bc2327041..0e15fe62789 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.1.0 -revision=1 +revision=2 wrksrc="mixxx-release-${version}" hostmakedepends="pkg-config scons" makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel @@ -18,7 +18,7 @@ distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" checksum=148b0ab222fa1c310e62b566d87c0a3d43fdee9435150d40d62055dbc228d396 _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio" +nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio do_build() { case "$XBPS_TARGET_MACHINE" in From 7aefa7878df7901d56f911c40c0082d0af36743a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:51 -0300 Subject: [PATCH 024/759] mosh: rebuild against protobuf-3.6.0 --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 6e57757ed48..f367f180125 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config protobuf-devel" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" From 2f15a4bd1c28b559137a1ff9b43e9b32776ae6ff Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:52 -0300 Subject: [PATCH 025/759] mozc: rebuild against protobuf-3.6.0 --- srcpkgs/mozc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 7d662fc788b..193fccaa19b 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -1,7 +1,7 @@ # Template file for 'mozc' pkgname=mozc version=2.23.2785.102 -revision=1 +revision=2 hostmakedepends="ninja pkg-config protobuf-devel python" makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel fcitx-devel" @@ -10,7 +10,7 @@ maintainer="Matthias von Faber " homepage="https://github.com/google/mozc" license="3-clause-BSD" short_desc="Japanese IME (Open Source version of Google Japanese Input)" -build_wrksrc="mozc/src" +build_wrksrc=mozc/src create_wrksrc=yes distfiles=" https://github.com/fcitx/mozc/archive/44820a08db487fb1abe996f3ac2876457b05465d.tar.gz @@ -23,7 +23,7 @@ checksum=" 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 " -if [ -n "$CROSS_BUILD" ]; then +if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" fi @@ -39,7 +39,7 @@ post_extract() { ln -sr $_src-* $_dst done - if [ -n "$CROSS_BUILD" ]; then + if [ "$CROSS_BUILD" ]; then # find fcitx4-config sed -i -e "s;fcitx4-config;${XBPS_CROSS_BASE}/usr/bin/fcitx4-config;" mozc/src/unix/fcitx/fcitx.gyp fi From 1340e56835fc71148228afd2d711c6ce3ccffc95 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:52 -0300 Subject: [PATCH 026/759] mumble: rebuild against protobuf-3.6.0 --- srcpkgs/mumble/template | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 3a8e3c3e1b4..743422b1828 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,21 +1,21 @@ # Template file for 'mumble' pkgname=mumble version=1.2.19 -revision=9 -hostmakedepends="pkg-config qt-host-tools qt-qmake protobuf Ice" -makedepends=" - libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel - speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel - avahi-compat-libs-devel MesaLib-devel opus-devel libogg-devel boost-devel - speech-dispatcher-devel" -depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme" +revision=10 +hostmakedepends="Ice pkg-config protobuf qt-host-tools qt-qmake" +makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel + libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel + pulseaudio-devel qt-devel speech-dispatcher-devel speex-devel" +depends="desktop-file-utils qt-plugin-sqlite" short_desc="Open source, low-latency, high quality voice chat for gaming" maintainer="Juan RP " +license="BSD-3-Clause" homepage="http://mumble.sourceforge.net/" -license="BSD" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 +CXXFLAGS="-std=c++11" + do_configure() { if [ "$CROSS_BUILD" ]; then for i in ${XBPS_CROSS_BASE}/usr/include/Qt*; do @@ -38,10 +38,12 @@ do_configure() { -e "s;^\(LFLAGS.*=.*\);& $LDFLAGS;" \ -e "s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;" } + do_build() { make ${makejobs} release \ CC="$CC" CXX="$CXX" LINK="$CXX" } + do_install() { vlicense LICENSE vmkdir usr/lib/mumble From 14003a7cebe4b51338b3535f97985a87899ecb46 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:53 -0300 Subject: [PATCH 027/759] nsjail: rebuild against protobuf-3.6.0 --- srcpkgs/nsjail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 71f9c659ed9..6845ee1e42c 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=2.6 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf-devel" makedepends="libnl3-devel protobuf-devel" From b2625404f7b9ba9bdd309811616da496c640b943 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:00:54 -0300 Subject: [PATCH 028/759] zbackup: rebuild against protobuf-3.6.0 --- srcpkgs/zbackup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index 1e1f6c07bdc..a8bf8a1013e 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=9 +revision=10 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" From a478bc2efa0ac25fbc0d5fed628bbb86b2f4da4a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Jun 2018 00:02:25 -0300 Subject: [PATCH 029/759] protobuf-c: rebuild against protobuf-3.6.0. --- srcpkgs/protobuf-c/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index c50b98236a9..d8530462f7a 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,16 +1,17 @@ # Template file for 'protobuf-c' pkgname=protobuf-c version=1.3.0 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="protobuf-devel" short_desc="C implementation of the Google Protocol Buffers" maintainer="Enno Boland " -license="BSD" +license="BSD-2-Clause" homepage="https://github.com/protobuf-c/protobuf-c" -distfiles="$homepage/releases/download/v$version/protobuf-c-$version.tar.gz" +distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz" checksum=5dc9ad7a9b889cf7c8ff6bf72215f1874a90260f60ad4f88acf21bb15d2752a1 + # buildprocess calls compiler while building, disable it on cross build build_options="protoc" if [ -z "$CROSS_BUILD" ]; then @@ -18,6 +19,10 @@ if [ -z "$CROSS_BUILD" ]; then fi configure_args="$(vopt_enable protoc)" +post_install() { + vlicense LICENSE +} + protobuf-c-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 002f7e63907065d906f8f0ec2f04678261fa7ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 10:42:42 +0200 Subject: [PATCH 030/759] leatherman: update to 1.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/leatherman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template index 696f07bb3a4..cb3f7e689ec 100644 --- a/srcpkgs/leatherman/template +++ b/srcpkgs/leatherman/template @@ -1,7 +1,7 @@ # Template file for 'leatherman' # Note: always revbump cpp-hocon when updating as it links against this static lib pkgname=leatherman -version=1.4.1 +version=1.4.2 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller " license="Apache-2.0" homepage="https://github.com/puppetlabs/leatherman" distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=a6acf99ef65d55231b0aca2bace717ecbb2e96c0078463b79a2def5c2e2dfd3b +checksum=32ccdb21db3ccc326bac255b35fc6c16b2ddbe39bbd5afdddcadc622e2814fc2 From e2bfecaf95820cae8c891a3f0af85cca26a75c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 10:43:07 +0200 Subject: [PATCH 031/759] cpp-hocon: update to 0.1.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/cpp-hocon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template index e6c04c02fe5..7d08a8921ea 100644 --- a/srcpkgs/cpp-hocon/template +++ b/srcpkgs/cpp-hocon/template @@ -1,7 +1,7 @@ # Template file for 'cpp-hocon' pkgname=cpp-hocon -version=0.1.6 -revision=3 +version=0.1.7 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="boost-devel leatherman libcurl-devel" @@ -10,4 +10,4 @@ maintainer="Jürgen Buchmüller " license="Apache-2.0" homepage="https://github.com/puppetlabs/cpp-hocon" distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=98beb111068e54c8f0ae49be95c1ebd35c4cbb25098a999a7a569d6f835deaea +checksum=1d771de9342e74115a27355c80a81a510c7851cb1269bac1dd2582c84425652c From 77431c4ce8867320faaccc66ebc7ea3854505064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 10:43:28 +0200 Subject: [PATCH 032/759] facter: revbump for cpp-hocon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/facter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 24c19f893b3..de08518884b 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.11.2 -revision=1 +revision=2 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="ruby-devel" From 0b5c97ab6a035b843945fe7bdd53611700e44e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 12:46:10 +0200 Subject: [PATCH 033/759] x265: fix cross build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/x265/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 932ced458ec..b27f429613b 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -14,9 +14,9 @@ homepage="http://x265.org/" distfiles="https://bitbucket.org/multicoreware/x265/downloads/x265_${version}.tar.gz" checksum=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${CROSS_BUILD%-musl}" -fi +case "$XBPS_TARGET_MACHINE" in + mips*) configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=mips32r2" ;; +esac pre_configure() { if [ "$CROSS_BUILD" ]; then From a3d54a926d4799f10680030928a828ae7001e699 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 22 Jun 2018 13:12:31 +0200 Subject: [PATCH 034/759] font-awesome5: update to 5.1.0. (#325) --- srcpkgs/font-awesome5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/font-awesome5/template b/srcpkgs/font-awesome5/template index 257d6aa4695..ce4b0d3d221 100644 --- a/srcpkgs/font-awesome5/template +++ b/srcpkgs/font-awesome5/template @@ -1,6 +1,6 @@ # Template file for 'font-awesome5' pkgname=font-awesome5 -version=5.0.13 +version=5.1.0 revision=1 noarch=yes wrksrc=Font-Awesome-${version} @@ -11,7 +11,7 @@ maintainer="cr6git " license="OFL-1.1" homepage="https://fontawesome.com" distfiles="https://github.com/FortAwesome/Font-Awesome/archive/${version}.tar.gz" -checksum=fae40b4aeb6505edb0b641631ff4a5d8c97e5972fb6643f3b2eb626c752e5a83 +checksum=0081ff1e590ef4d49b751840ea0551b3f577fc138436fe1f78101ce432faf2d4 conflicts="font-awesome>=0" do_install() { From 07081c3b2d211b2cfde79f846a9af584ae341fae Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 22 Jun 2018 13:15:27 +0200 Subject: [PATCH 035/759] guitarix2: update to 0.37.1, change build_options, fix license. (#285) --- srcpkgs/guitarix2/template | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index f4320a1eb11..a37b9d08f14 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -1,23 +1,29 @@ # Template file for 'guitarix2' pkgname=guitarix2 -version=0.36.1 +version=0.37.1 revision=1 wrksrc="guitarix-${version}" build_style=waf -configure_args="--no-faust --no-lv2" -hostmakedepends="python pkg-config intltool gperf" -makedepends="boost-devel gtkmm2-devel liblrdf-devel eigen - libbluetooth-devel zita-convolver-devel zita-resampler-devel jack-devel - libsndfile-devel fftw-devel ladspa-sdk lilv-devel sratom-devel avahi-glib-libs-devel" +configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust --no-lv2 + $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')" +make_build_args="--progress" +hostmakedepends="gperf intltool pkg-config" +makedepends="boost-devel eigen fftw-devel gtkmm2-devel jack-devel + ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel sratom-devel + zita-convolver-devel zita-resampler-devel + $(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)" depends="desktop-file-utils" -maintainer="cr6git " short_desc="Virtual guitar amplifier running on Jack Audio Connection Kit" +maintainer="cr6git " +license="GPL-3.0-or-later" homepage="http://guitarix.org" -license="GPL-2" distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz" -checksum=608d641bebed88691b2f2154606bc99d0785565b6c0e2d7b29c70ac86522a9bc +checksum=51a9375ef12e0e7242c7a346253fcf7f296d55fcd2a88f1c7fa93fdcbf049318 + +build_options="avahi bluez" +desc_option_avahi="Build with avahi support" +desc_option_bluez="Build with bluez support" -CFLAGS="-fpermissive" CXXFLAGS="-fpermissive" case "$XBPS_TARGET_MACHINE" in @@ -29,7 +35,7 @@ if [ -n "$CROSS_BUILD" ]; then CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/raptor2" post_extract() { # don’t test load the ladspa plugin when cross compiling - sed -i -e "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript + sed -i "s/\(features='cxx cshlib\) test_loadable/\1/" src/ladspa/wscript } fi From 941d727c09da0eb33cb3681ec728814c874f611f Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 22 Jun 2018 13:24:18 +0200 Subject: [PATCH 036/759] gede: update to 2.8.1. --- srcpkgs/gede/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template index 10a1730c08a..c5defd1c349 100644 --- a/srcpkgs/gede/template +++ b/srcpkgs/gede/template @@ -1,6 +1,6 @@ # Template file for 'gede' pkgname=gede -version=2.7.4 +version=2.8.1 revision=1 build_style=qmake build_wrksrc="src" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="BSD" homepage="http://acidron.com/gede" distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz" -checksum=9992e67f80c564a886823559d015308877920486c8e855bef2e7db2801a24ee1 +checksum=614e0ebdf2873427fe5dda17a0667b44305ea1879f1239318dbfccf40c88ab1d if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt-host-tools qt-devel" From 4d413fadb183e8f4bcb7e6695b65e1ad790471d7 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 22 Jun 2018 13:25:29 +0200 Subject: [PATCH 037/759] kubernetes: update to 1.10.5. --- srcpkgs/kubernetes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 8135d9d8d7f..511a4f5e4d6 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.10.4 +version=1.10.5 revision=1 build_style=go nocross=yes @@ -13,7 +13,7 @@ license="Apache-2.0" go_import_path="github.com/kubernetes/kubernetes" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=f352e9a6ea70c8e2c66e5e3351805c204364be729a65b85752963789cd61ef75 +checksum=efa27452ca77366f5e0c31e8db36df338593e3c24bd86be7e95b2e1a04672321 system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" From c990e88bb9c5133274f2994bff6e0b05825ee2fc Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 22 Jun 2018 13:34:34 +0200 Subject: [PATCH 038/759] python-regex: update to 2018.06.21. --- srcpkgs/python-regex/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template index 9d18ec3ecb5..b2d407553bd 100644 --- a/srcpkgs/python-regex/template +++ b/srcpkgs/python-regex/template @@ -1,6 +1,6 @@ # Template file for 'python-regex' pkgname=python-regex -version=2018.06.20 +version=2018.06.21 revision=1 wrksrc="regex-${version}" build_style=python2-module @@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni " license="PSF" homepage="https://pypi.org/project/regex/" distfiles="${PYPI_SITE}/r/regex/regex-$version.tar.gz" -checksum=68dd3b711e30af0ae437ebf3d36d7c6f5802cb768e205beaafc6734db7549869 +checksum=b172583f0c5f104e059a30dd6a1f9d20693031b156558590a745d6cc3192e283 From 7386b6f52c15a9061b673cddaf6f781e54ef20d9 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 22 Jun 2018 13:43:28 +0200 Subject: [PATCH 039/759] tekaim: update to 1.6.0. (#327) --- srcpkgs/tekaim/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/tekaim/template b/srcpkgs/tekaim/template index 19e59095f8b..e4c614bee52 100644 --- a/srcpkgs/tekaim/template +++ b/srcpkgs/tekaim/template @@ -1,18 +1,17 @@ # Template file for 'tekaim' pkgname=tekaim -version=1.5.0 +version=1.6.0 revision=1 noarch=yes build_style=python3-module hostmakedepends="python3" -depends="python3 curl maim xclip" +depends="curl maim python3 xclip" short_desc="Simple tool to take and upload screenshots to teknik.io" maintainer="cr6git " +license="GPL-3.0-or-later" homepage="https://github.com/IvanFon/tekaim" -license="GPL-3" distfiles="https://github.com/IvanFon/tekaim/releases/download/${version}/tekaim-${version}.tar.gz" -checksum=e5a2af6d1838860f301ced56b8d0c6ded94c75ae727ecd4d8fe742ea5bb80367 - +checksum=78f7fd651f96fb0711277ed097dcaf75e9b9d39a003a88600270c1d47b993fda post_install() { vmkdir usr/share/tekaim From 631d6b3463596a9b5f904c5a0220b117342a52c2 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 22 Jun 2018 13:44:09 +0200 Subject: [PATCH 040/759] New package: fontmatrix-0.6.0.20171228 (#174) --- srcpkgs/fontmatrix/patches/musl.patch | 11 +++++++++++ srcpkgs/fontmatrix/template | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 srcpkgs/fontmatrix/patches/musl.patch create mode 100644 srcpkgs/fontmatrix/template diff --git a/srcpkgs/fontmatrix/patches/musl.patch b/srcpkgs/fontmatrix/patches/musl.patch new file mode 100644 index 00000000000..8acdf581457 --- /dev/null +++ b/srcpkgs/fontmatrix/patches/musl.patch @@ -0,0 +1,11 @@ +--- src/fmutils.cpp.orig 2017-08-13 19:07:51.821535347 +0200 ++++ src/fmutils.cpp 2017-08-13 19:05:51.995947873 +0200 +@@ -12,7 +12,7 @@ + + #include "fmutils.h" + +-#if !defined(_WIN32) && !defined(Q_OS_MAC) ++#if !defined(_WIN32) && !defined(Q_OS_MAC) && defined(__GLIBC__) + #include + #include + #include diff --git a/srcpkgs/fontmatrix/template b/srcpkgs/fontmatrix/template new file mode 100644 index 00000000000..5784d8d85da --- /dev/null +++ b/srcpkgs/fontmatrix/template @@ -0,0 +1,19 @@ +# Template file for 'fontmatrix' +pkgname=fontmatrix +version=0.6.0.20171228 +revision=1 +_commit=8108e6ea8b5944a92d7f27c40509b8e890ddaff1 +wrksrc="${pkgname}-${_commit}" +build_style=cmake +hostmakedepends="pkg-config" +makedepends="fontconfig-devel MesaLib-devel qt-webkit-devel" +short_desc="Free font collections manager" +maintainer="newbluemoon " +license="GPL-2.0-or-later" +homepage="https://github.com/fontmatrix/fontmatrix" +distfiles="https://github.com/fontmatrix/fontmatrix/archive/${_commit}.tar.gz" +checksum=1fa442e5bafb08265e1078d522ca0e8a8b864ab8544fb5ce4fd77ebb2f7bfc1d + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt-devel" +fi From 1de1556c5a2f48cdc8eb24e43cac63787fcbf0b0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 17 Feb 2018 00:39:03 +0100 Subject: [PATCH 041/759] New package: deepin-draw-1.0.0 --- srcpkgs/deepin-draw/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/deepin-draw/template diff --git a/srcpkgs/deepin-draw/template b/srcpkgs/deepin-draw/template new file mode 100644 index 00000000000..912ffed8381 --- /dev/null +++ b/srcpkgs/deepin-draw/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-draw' +pkgname=deepin-draw +version=1.0.0 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="qt5-svg-devel dtkwidget-devel libexif-devel libraw-devel + freeimage-devel xcb-util-devel dtkwm-devel" +depends="deepin-picker qt5integration" +short_desc="Deepin Painting Tool" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-draw" +changelog="https://github.com/linuxdeepin/deepin-draw/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-draw/archive/${version}.tar.gz" +checksum=4a9430d9e52b3708da7e9e88a8106686333cd80ff3a3b127d1549d5ee111c6f4 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel" +fi From c5c0b70f173566d3c99e2f08ccf1d476671c9165 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 17 Feb 2018 00:14:39 +0100 Subject: [PATCH 042/759] New package: deepin-picker-1.6.2 --- srcpkgs/deepin-picker/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/deepin-picker/template diff --git a/srcpkgs/deepin-picker/template b/srcpkgs/deepin-picker/template new file mode 100644 index 00000000000..366052cf568 --- /dev/null +++ b/srcpkgs/deepin-picker/template @@ -0,0 +1,19 @@ +# Template file for 'deepin-picker' +pkgname=deepin-picker +version=1.6.2 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="dtkwidget-devel qt5-svg-devel qt5-x11extras-devel xcb-util-devel + libXtst-devel" +short_desc="Simple color picker" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-picker" +changelog="https://github.com/linuxdeepin/deepin-picker/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-picker/archive/${version}.tar.gz" +checksum=ef3cad26ff421f0d1f3f587e1dc824b1521c0467911f9d975c0ea6b268f984c8 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel" +fi From 12052ecb05a5362a9e730af911bd254fc82e3c6d Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 22 Jun 2018 07:36:32 +0200 Subject: [PATCH 043/759] perl-File-ShareDir: update to 1.114 --- srcpkgs/perl-File-ShareDir/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-File-ShareDir/template b/srcpkgs/perl-File-ShareDir/template index 7bac248e4d7..8cf12590e5e 100644 --- a/srcpkgs/perl-File-ShareDir/template +++ b/srcpkgs/perl-File-ShareDir/template @@ -1,6 +1,6 @@ # Template file for 'perl-File-ShareDir' pkgname=perl-File-ShareDir -version=1.112 +version=1.114 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -13,4 +13,4 @@ maintainer="newbluemoon " homepage="https://metacpan.org/release/File-ShareDir" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz" -checksum=f8305566a6e474178b0f55c3163db4d34e17c40004b5cbdacd5a5d435172dba4 +checksum=d7cff11873e29707e4be0b1332fce8366776ead3b9811dc80a9784a61486948a From b5a25f43a1988f3b29eb5971edafd31499ff9630 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 17 Feb 2018 00:08:08 +0100 Subject: [PATCH 044/759] New package: deepin-image-viewer-1.2.22 --- srcpkgs/deepin-image-viewer/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/deepin-image-viewer/template diff --git a/srcpkgs/deepin-image-viewer/template b/srcpkgs/deepin-image-viewer/template new file mode 100644 index 00000000000..9160d0ee689 --- /dev/null +++ b/srcpkgs/deepin-image-viewer/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-image-viewer' +pkgname=deepin-image-viewer +version=1.2.22 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="qt5-svg-devel qt5-x11extras-devel libraw-devel libexif-devel + freeimage-devel dtkwidget-devel" +depends="qt5-plugin-sqlite qt5integration" +short_desc="Deepin Image Viewer" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-image-viewer" +changelog="https://github.com/linuxdeepin/deepin-image-viewer/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-image-viewer/archive/${version}.tar.gz" +checksum=504afc7f907818be6a91a0338c877c542ea7ceb897e755058518909a02a0ed30 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel" +fi From 2ff2c954dd0df11b44ae8ec7eb1c9d8bb8e09644 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 22 Jun 2018 00:14:22 +0200 Subject: [PATCH 045/759] New package: qt5-fsarchiver-0.8.4 --- srcpkgs/qt5-fsarchiver/patches/cross.patch | 11 ++++++++ .../patches/fix-install-target.patch | 20 ++++++++++++++ srcpkgs/qt5-fsarchiver/patches/musl.patch | 20 ++++++++++++++ srcpkgs/qt5-fsarchiver/template | 26 +++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 srcpkgs/qt5-fsarchiver/patches/cross.patch create mode 100644 srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch create mode 100644 srcpkgs/qt5-fsarchiver/patches/musl.patch create mode 100644 srcpkgs/qt5-fsarchiver/template diff --git a/srcpkgs/qt5-fsarchiver/patches/cross.patch b/srcpkgs/qt5-fsarchiver/patches/cross.patch new file mode 100644 index 00000000000..074c4a6c940 --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/patches/cross.patch @@ -0,0 +1,11 @@ +--- qt5-fsarchiver.pro.orig 2018-06-22 00:01:06.101404975 +0200 ++++ qt5-fsarchiver.pro 2018-06-22 00:01:45.933869386 +0200 +@@ -9,7 +9,7 @@ + QT += widgets gui core + + DEFINES += HAVE_CONFIG_H _REENTRANT _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE _GNU_SOURCE HAVE_QT5 +-INCLUDEPATH += . src /usr/include/ext2fs /usr/include/et /usr/include/e2p /usr/include/blkid /usr/include/uuid ++INCLUDEPATH += . src $$(XBPS_CROSS_BASE)/usr/include/ext2fs $$(XBPS_CROSS_BASE)/usr/include/et $$(XBPS_CROSS_BASE)/usr/include/e2p $$(XBPS_CROSS_BASE)/usr/include/blkid $$(XBPS_CROSS_BASE)/usr/include/uuid + LIBS += -L/usr/lib -lQt5Gui -lQt5Core -lpthread -lrt -llzma -lext2fs -lcom_err -le2p -lblkid -luuid -lz -llz4 -lbz2 -llzo2 -lgcrypt -lgpg-error -lzstd + OBJECTS_DIR = build + MOC_DIR = build diff --git a/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch b/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch new file mode 100644 index 00000000000..64115795cbb --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch @@ -0,0 +1,20 @@ +--- qt5-fsarchiver.pro.orig 2018-06-21 23:15:21.665117797 +0200 ++++ qt5-fsarchiver.pro 2018-06-21 23:15:36.159276907 +0200 +@@ -147,7 +147,7 @@ + src/writebuf.c + RESOURCES += src/icon.qrc + # install +- target.path = /usr/sbin ++ target.path = /usr/bin + icon.files = src/images/harddrive1.png + icon.path = /usr/share/app-install/icons + autostart.files = starter/gnome-qt5-fsarchiver.desktop +@@ -158,7 +158,7 @@ + autostart2.path = /usr/share/applications + doc.files = doc + doc.path = /usr/share/doc/qt5-fsarchiver/doc +- smbfind.files = src/sbin ++ smbfind.files = src/bin + smbfind.path = /usr + TRANSLATIONS += translations/qt5-fsarchiver_ar.ts \ + translations/qt5-fsarchiver_ca.ts \ diff --git a/srcpkgs/qt5-fsarchiver/patches/musl.patch b/srcpkgs/qt5-fsarchiver/patches/musl.patch new file mode 100644 index 00000000000..19728cff1c7 --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/patches/musl.patch @@ -0,0 +1,20 @@ +--- src/common.c.orig 2018-06-21 23:29:12.238999543 +0200 ++++ src/common.c 2018-06-21 23:30:28.347795214 +0200 +@@ -34,7 +34,7 @@ + #include + #include + +-#ifdef HAVE_EXECINFO_H ++#if defined(HAVE_EXECINFO_H) && defined(__GLIBC__) + #include + #endif + +@@ -567,7 +567,7 @@ + + int format_stacktrace(char *buffer, int bufsize) + { +-#ifdef HAVE_EXECINFO_H ++#if defined(HAVE_EXECINFO_H) && defined(__GLIBC__) + const int stack_depth=20; + void *temp[stack_depth]; + char **strings; diff --git a/srcpkgs/qt5-fsarchiver/template b/srcpkgs/qt5-fsarchiver/template new file mode 100644 index 00000000000..d7e85f04200 --- /dev/null +++ b/srcpkgs/qt5-fsarchiver/template @@ -0,0 +1,26 @@ +# Template file for 'qt5-fsarchiver' +pkgname=qt5-fsarchiver +version=0.8.4 +revision=1 +_realversion=0.8.4-6 +wrksrc=${pkgname} +build_style=qmake +hostmakedepends="qt5-qmake qt5-host-tools" +makedepends="qt5-devel liblz4-devel liblzma-devel lzo-devel libzstd-devel + libgcrypt-devel e2fsprogs-devel attr-devel" +depends="fsarchiver" +short_desc="Program to save/restore partitions, folders and MBR/GPT" +maintainer="Helmut Pozimski " +license="GPL-2.0-only" +homepage="https://sourceforge.net/projects/qt4-fsarchiver" +distfiles="${SOURCEFORGE_SITE}/qt4-fsarchiver/${pkgname}-${_realversion}.tar.gz" +checksum=fea22f1847d730c0c28eb2f6c8aee6a17108a4af884546387faba7eea74d30c1 + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/qt5" + for i in ${XBPS_CROSS_BASE}/usr/include/qt5/*; do + CXXFLAGS+=" -I$i" + done + fi +} From 9452419fdccf3b112c47d2b60ff2b8fecf99d211 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 22 Jun 2018 14:04:03 +0200 Subject: [PATCH 046/759] atari800: update to 4.0.0. (#326) --- srcpkgs/atari800/template | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/atari800/template b/srcpkgs/atari800/template index 9cebec5b7da..49d19b3fb00 100644 --- a/srcpkgs/atari800/template +++ b/srcpkgs/atari800/template @@ -1,14 +1,9 @@ # Template file for 'atari800' pkgname=atari800 -version=3.1.0 -revision=4 -build_style=gnu-configure -short_desc="Emulator of Atari 800/800XL/130XE/5200 with various extensions" -maintainer="Jakub Skrzypnik " -makedepends="SDL_mixer-devel SDL_ttf-devel SDL_image-devel SDL_sound-devel SDL_net-devel readline-devel MesaLib-devel" -license="GPL-2" +version=4.0.0 +revision=1 build_wrksrc="src" -homepage="http://atari800.sourceforge.net" +build_style=gnu-configure configure_args=" --disable-sdltest --with-video=sdl --with-sound=sdl --with-x --with-readline @@ -21,8 +16,14 @@ configure_args=" --enable-monitortrace --enable-monitorprofile --enable-monitorhints --enable-monitorbreakpoints --enable-monitorbreak --enable-monitorasm --enable-bufferedlog --enable-newcycleexact" +makedepends="SDL_image-devel SDL_mixer-devel SDL_net-devel SDL_sound-devel + SDL_ttf-devel readline-devel" +short_desc="Emulator of Atari 800/800XL/130XE/5200 with various extensions" +maintainer="Jakub Skrzypnik " +license="GPL-2" +homepage="https://atari800.github.io" distfiles="${SOURCEFORGE_SITE}/atari800/atari800/${version}/atari800-${version}.tar.gz" -checksum="901b02cce92ddb0b614f8034e6211f24cbfc2f8fb1c6581ba0097b1e68f91e0c" +checksum=08e9b989ddb2785265d242ff92b416a2b53c285c7309f3fc3f5e94889cb69eb5 pre_configure() { # Do not strip bins. From 81025e09522abea313e23073bdb738358c314d5c Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 22 Jun 2018 14:15:34 +0200 Subject: [PATCH 047/759] rednotebook: update to 2.5. (#328) --- srcpkgs/rednotebook/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template index e67319e0e82..d683f64d941 100644 --- a/srcpkgs/rednotebook/template +++ b/srcpkgs/rednotebook/template @@ -1,6 +1,6 @@ # Template file for 'rednotebook' pkgname=rednotebook -version=2.4 +version=2.5 revision=1 noarch=yes build_style=python3-module @@ -8,9 +8,9 @@ pycompile_module="rednotebook" hostmakedepends="python3" depends="desktop-file-utils hicolor-icon-theme python3-enchant python3-gobject python3-yaml webkit2gtk" -maintainer="cr6git " short_desc="Cross-platform, modern desktop journal" +maintainer="cr6git " +license="GPL-2.0-or-later" homepage="https://rednotebook.sourceforge.io" -license="GPL-2" distfiles="https://github.com/jendrikseipp/rednotebook/archive/v${version}.tar.gz" -checksum=3211623d63832152bf51533034db4b482f418e05c3726788afdbfc1e1269bf06 +checksum=8d23951d3865cda53c2f65b03fa1e94a213c0ffeabad01ea48f357991713aede From 679dd6edb4b09f4db1f286a6f5b739b228a004ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 12:57:11 +0200 Subject: [PATCH 048/759] libreoffice: fonts, firebird, xtensions subpkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/libreoffice/template | 67 ++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 9b353d2f264..cf49832ad63 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -2,7 +2,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=6.0.4.2 -revision=1 +revision=2 build_style=meta make_build_args="build-nocheck" nocross=yes @@ -28,11 +28,14 @@ depends+=" libreoffice-common>=${version}_${revision}" depends+=" libreoffice-base>=${version}_${revision}" depends+=" libreoffice-calc>=${version}_${revision}" depends+=" libreoffice-draw>=${version}_${revision}" +depends+=" libreoffice-fonts>=${version}_${revision}" +depends+=" libreoffice-firebird>=${version}_${revision}" depends+=" libreoffice-gnome>=${version}_${revision}" depends+=" libreoffice-impress>=${version}_${revision}" depends+=" libreoffice-math>=${version}_${revision}" depends+=" libreoffice-postgresql>=${version}_${revision}" depends+=" libreoffice-writer>=${version}_${revision}" +depends+=" libreoffice-xtensions>=${version}_${revision}" # Add the previously installed default languages as well depends+=" libreoffice-i18n-en-US>=${version}_${revision}" depends+=" libreoffice-i18n-de>=${version}_${revision}" @@ -62,6 +65,8 @@ _baseurl="http://download.documentfoundation.org/${pkgname}/src/${version%.*}" _addurl="http://dev-www.libreoffice.org/src" _exturl="http://dev-www.libreoffice.org/extern" +# Additional distfiles and checksums can be found in +# the file 'download.lst' after configure was run. distfiles=" ${_baseurl}/${pkgname}-${version}.tar.xz ${_baseurl}/${pkgname}-dictionaries-${version}.tar.xz @@ -273,6 +278,8 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL" + # Move files listed in a _list.txt into $PKGDESTDIR _split() { local list file dir destdir @@ -286,6 +293,13 @@ _split() { mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/ done done + # Move appdata file, if any + file=usr/share/appdata/libreoffice-${1}.appdata.xml + if [ -f ${destdir}/${file} ]; then + dir="${file%/*}" + ! [ -d "${PKGDESTDIR}/${dir}" ] && vmkdir "${dir}" + mv ${destdir}/${file} ${PKGDESTDIR}/${dir}/ + fi } _languages="" @@ -503,11 +517,10 @@ do_configure() { opts+=" --with-tls=nss" # xmlsec1-nss is missing, thus don't use system-xmlsec opts+=" --without-system-xmlsec" + opts+=" --without-system-firebird" opts+=" --without-system-libzmf" opts+=" --without-system-libstaroffice" opts+=" --without-system-mysql-cppconn" - # without firebird-sdbc (as it is not packaged correctly) - opts+=" --disable-firebird-sdbc" opts+=" --without-system-libtommath" opts+=" --without-system-jfreereport" opts+=" --without-system-apache-commons" @@ -532,7 +545,7 @@ do_build() { } do_install() { - make DESTDIR="${DESTDIR}/all" PREFIXDIR="/usr" distro-pack-install + make DESTDIR="${DESTDIR}/all" PREFIXDIR=/usr distro-pack-install # Remove useless directory usr/lib32 rm -rf ${DESTDIR}/usr/lib32 @@ -573,6 +586,31 @@ libreoffice-draw_package() { } } +libreoffice-firebird_package() { + short_desc+=" - Connector for Firebird SDBC" + noverifyrdeps=yes + pkg_install() { + vmkdir usr/lib/libreoffice/program + for f in libEngine12.so libfbclient.so.2 libfirebird_sdbclo.so; do + mv ${DESTDIR}/all/usr/lib/libreoffice/program/${f} \ + ${PKGDESTDIR}/usr/lib/libreoffice/program/ + done + vmkdir usr/lib/libreoffice/share + mv ${DESTDIR}/all/usr/lib/libreoffice/share/firebird \ + ${PKGDESTDIR}/usr/lib/libreoffice/share/ + } +} + +libreoffice-fonts_package() { + short_desc+=" - Fonts" + noarch=yes + pkg_install() { + vmkdir usr/lib/libreoffice/share + mv ${DESTDIR}/all/usr/lib/libreoffice/share/fonts \ + ${PKGDESTDIR}/usr/lib/libreoffice/share/ + } +} + libreoffice-gnome_package() { short_desc+=" - GNOME integration" depends="libreoffice-common>=${version}_${revision}" @@ -623,7 +661,24 @@ libreoffice-writer_package() { noverifyrdeps=yes pkg_install() { _split writer - # Remove any remains from not packaged files - rm -rf ${DESTDIR}/all + } +} + +# Use a name which makes this catch-all subpackage the last one +libreoffice-xtensions_package() { + short_desc+=" - Extensions" + depends="libreoffice-common>=${version}_${revision}" + noverifyrdeps=yes + pkg_install() { + # Remove empty files + find ${DESTDIR}/all -size 0 -delete + # Remove useless files + for f in segments.gen segments_3 _0.cfs help.tree help.key_ help.db_; do + find ${DESTDIR}/all -name "${f}" -delete + done + # Move the remaining files to this subpackage + vmkdir usr + mv -v ${DESTDIR}/all/usr/* ${PKGDESTDIR}/usr/ + rm -rvf ${DESTDIR}/all } } From 7f45b7edac87b1efc7421d27a4ea66f0ef88831b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 22 Jun 2018 16:04:29 +0200 Subject: [PATCH 049/759] unbound: update to 1.7.3. --- srcpkgs/unbound/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index c933a7cc437..d24b9cd3d3b 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,6 +1,6 @@ # Template file for 'unbound' pkgname=unbound -version=1.7.2 +version=1.7.3 revision=1 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://unbound.net/" distfiles="https://unbound.net/downloads/${pkgname}-${version}.tar.gz" -checksum=a85fc7bb34711992cf128b2012638ebb8dc1fe15818baa381f6489240845eaa0 +checksum=c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d conf_files="/etc/unbound/unbound.conf" system_accounts="_unbound" From 5ff7c6d00b892a61818465239cabced4f53809df Mon Sep 17 00:00:00 2001 From: John Date: Sat, 17 Feb 2018 17:34:29 +0100 Subject: [PATCH 050/759] New package: deepin-screenshot-4.0.15 --- srcpkgs/deepin-screenshot/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/deepin-screenshot/template diff --git a/srcpkgs/deepin-screenshot/template b/srcpkgs/deepin-screenshot/template new file mode 100644 index 00000000000..417d6a901fb --- /dev/null +++ b/srcpkgs/deepin-screenshot/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-screenshot' +pkgname=deepin-screenshot +version=4.0.16 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake qt5-host-tools pkg-config" +makedepends="qt5-svg-devel xcb-util-devel dtkwidget-devel dtkwm-devel + qt5-x11extras-devel libXtst-devel" +depends="qt5integration" +short_desc="Deepin Screenshot App" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-screenshot" +changelog="https://github.com/linuxdeepin/deepin-screenshot/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-screenshot/archive/${version}.tar.gz" +checksum=f710a58c66594affe7ab3b01903eebd0ca82b38f24d8f95c6bb2b1f4de517104 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-x11extras-devel" +fi From 3d6a0ecd6476772171a96657ada96357988c2243 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 21 Jun 2018 08:22:48 -0500 Subject: [PATCH 051/759] New package: eid-mw-4.4.1 Closes https://github.com/void-linux/void-packages/issues/272 --- srcpkgs/eid-mw-devel | 1 + srcpkgs/eid-mw/patches/musl.patch | 10 ++++++++++ srcpkgs/eid-mw/template | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 120000 srcpkgs/eid-mw-devel create mode 100644 srcpkgs/eid-mw/patches/musl.patch create mode 100644 srcpkgs/eid-mw/template diff --git a/srcpkgs/eid-mw-devel b/srcpkgs/eid-mw-devel new file mode 120000 index 00000000000..68de8f472f3 --- /dev/null +++ b/srcpkgs/eid-mw-devel @@ -0,0 +1 @@ +eid-mw/ \ No newline at end of file diff --git a/srcpkgs/eid-mw/patches/musl.patch b/srcpkgs/eid-mw/patches/musl.patch new file mode 100644 index 00000000000..65e11cf6cb3 --- /dev/null +++ b/srcpkgs/eid-mw/patches/musl.patch @@ -0,0 +1,10 @@ +--- cardcomm/pkcs11/src/common/logbase.h.orig ++++ cardcomm/pkcs11/src/common/logbase.h +@@ -88,6 +88,7 @@ + + #ifndef WIN32 + #include ++#include + #endif + + #include diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template new file mode 100644 index 00000000000..54bef65d68e --- /dev/null +++ b/srcpkgs/eid-mw/template @@ -0,0 +1,30 @@ +# Template file for 'eid-mw' +pkgname=eid-mw +version=4.4.2 +revision=1 +wrksrc="${pkgname}-${version}-v${version}" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel" +depends="pcsc-acsccid pcsc-ccid pcsc-tools" +short_desc="Middleware for Belgian eID" +maintainer="Andrew Benson " +license="LGPL-3.0-or-later" +homepage="https://eid.belgium.be/en" +distfiles="https://dist.eid.belgium.be/continuous/sources/${pkgname}-${version}-v${version}.tar.gz" +checksum=b5bcfe8ec965ffb37fdcdb7763ed51497738262a5814260cd6b5e8411d1a501d + +pre_configure() { + sed -i "s%c_rehash%openssl rehash%g" plugins_tools/eid-viewer/Makefile.in +} + +eid-mw-devel_package() { + depends="eid-mw-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} From ebddc34791b952b8b18bcbcb6ce882ee879359b5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 18 Feb 2018 02:03:02 +0100 Subject: [PATCH 052/759] New package: deepin-system-monitor-1.4.4 --- srcpkgs/deepin-system-monitor/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/deepin-system-monitor/template diff --git a/srcpkgs/deepin-system-monitor/template b/srcpkgs/deepin-system-monitor/template new file mode 100644 index 00000000000..aa581d86fea --- /dev/null +++ b/srcpkgs/deepin-system-monitor/template @@ -0,0 +1,20 @@ +# Template file for 'deepin-system-monitor' +pkgname=deepin-system-monitor +version=1.4.4 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="dtkwm-devel dtkwidget-devel qt5-x11extras-devel libpcap-devel + procps-ng-devel libxcb-devel libXtst-devel xcb-util-devel" +depends="qt5integration" +short_desc="User-friendly system monitor for Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/manateelazycat/deepin-system-monitor" +changelog="https://github.com/linuxdeepin/deepin-system-monitor/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/manateelazycat/deepin-system-monitor/archive/${version}.tar.gz" +checksum=b78fe39ea19b9c7523036ef95e5bfc602ac953573597725ce956044aaabbe4c5 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-x11extras-devel" +fi From 673c116582c7dbbffd1e2e205ef4ec6f36492eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 18:23:18 +0200 Subject: [PATCH 053/759] libreoffice: add missing symlinks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/libreoffice-firebird | 1 + srcpkgs/libreoffice-fonts | 1 + srcpkgs/libreoffice-xtensions | 1 + 3 files changed, 3 insertions(+) create mode 120000 srcpkgs/libreoffice-firebird create mode 120000 srcpkgs/libreoffice-fonts create mode 120000 srcpkgs/libreoffice-xtensions diff --git a/srcpkgs/libreoffice-firebird b/srcpkgs/libreoffice-firebird new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-firebird @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice-fonts b/srcpkgs/libreoffice-fonts new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-fonts @@ -0,0 +1 @@ +libreoffice \ No newline at end of file diff --git a/srcpkgs/libreoffice-xtensions b/srcpkgs/libreoffice-xtensions new file mode 120000 index 00000000000..d5e3a56f350 --- /dev/null +++ b/srcpkgs/libreoffice-xtensions @@ -0,0 +1 @@ +libreoffice \ No newline at end of file From 9345ff22db5fd178e77287e7ad26e855f4384a69 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 16:41:06 +0200 Subject: [PATCH 054/759] dispcalGUI: update to 3.6.0.0. --- srcpkgs/dispcalGUI/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template index dcfbeeb55fb..0adbac5de18 100644 --- a/srcpkgs/dispcalGUI/template +++ b/srcpkgs/dispcalGUI/template @@ -1,6 +1,6 @@ # Template file for 'dispcalGUI' pkgname=dispcalGUI -version=3.5.3.0 +version=3.6.0.0 revision=1 _name="DisplayCAL" wrksrc="${_name}-${version}" @@ -14,7 +14,7 @@ maintainer="lemmi " license="GPL-3.0-or-later" homepage="https://displaycal.net/" distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" -checksum=a0a960fadb8cd1cf8e0c776a186a858ad71a0ce04ad97ae302227d207f93b358 +checksum=6ff81011f8d4f28ea25dc3d2d61dd216d4670e4637172f87e9e3c74c1a471a1c pre_configure() { sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop From cd57f6b253134d4cd61eb71ddb627ac07894be54 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 18:24:20 +0200 Subject: [PATCH 055/759] opencolorio: update to 1.1.0 --- .../opencolorio/patches/disable_werror.patch | 30 +++++++++++++++++++ srcpkgs/opencolorio/template | 8 ++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/opencolorio/patches/disable_werror.patch diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch new file mode 100644 index 00000000000..ca802c1e5af --- /dev/null +++ b/srcpkgs/opencolorio/patches/disable_werror.patch @@ -0,0 +1,30 @@ +diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt +index 1eb691b..cff9bd8 100644 +--- src/core/CMakeLists.txt ++++ src/core/CMakeLists.txt +@@ -23,8 +23,6 @@ if(WIN32) + if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") + endif() +-else() +- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror") + endif() + + # SHARED +diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt +index a90ca1c..b1f0361 100644 +--- src/pyglue/CMakeLists.txt ++++ src/pyglue/CMakeLists.txt +@@ -20,12 +20,6 @@ if(WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275") + endif() + +-# Process all warnings as errors +-# Unfortunately Windows still has a warning +-if(UNIX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +-endif() +- + find_package(PythonLibs) + if(NOT PYTHONLIBS_FOUND) + message(FATAL "Python libraries were not found, exiting.") diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template index f27d0a611eb..a4f959783dd 100644 --- a/srcpkgs/opencolorio/template +++ b/srcpkgs/opencolorio/template @@ -1,6 +1,6 @@ # Template file for 'opencolorio' pkgname=opencolorio -version=1.0.9 +version=1.1.0 revision=1 wrksrc=OpenColorIO-${version} build_style=cmake @@ -9,14 +9,15 @@ case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) ;; *) configure_args+=" -DOCIO_USE_SSE=OFF" ;; esac -hostmakedepends="pkg-config" +hostmakedepends="pkg-config git" makedepends="tinyxml-devel lcms2-devel" short_desc="A complete color management solution" maintainer="lemmi " license="openimageio" homepage="http://opencolorio.org" +changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog" distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz" -checksum=27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f +checksum=228589879e1f11e455a555304007748a8904057088319ebbf172d9384b93c079 post_install() { vlicense LICENSE @@ -29,6 +30,5 @@ opencolorio-devel_package() { vmove usr/lib/pkgconfig vmove usr/include vmove "usr/lib/*.so" - vmove "usr/lib/*.a" } } From a9434be38b8757b33af7cb05c5233b01604e5813 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 18:24:41 +0200 Subject: [PATCH 056/759] openimageio: update to 1.8.12. --- common/shlibs | 4 ++-- srcpkgs/openimageio/template | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5e3bc31b708..674a45c52d4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2087,8 +2087,8 @@ libgom-1.0.so.0 gom-0.3.0_1 libetpan.so.20 libetpan-1.7.2_1 libxmp.so.4 libxmp-4.3.7_1 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 -libOpenImageIO_Util.so.1.7 openimageio-1.7.7_1 -libOpenImageIO.so.1.7 openimageio-1.7.7_1 +libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1 +libOpenImageIO.so.1.8 openimageio-1.8.12_1 libOpenColorIO.so.1 opencolorio-1.0.8_1 libyaml-cpp.so.0.5 yaml-cpp-0.5.2_1 libpaper.so.1 libpaper-1.1.24_1 diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 62e521aa5ae..11e4eaf7269 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,6 +1,6 @@ # Template file for 'openimageio' pkgname=openimageio -version=1.7.18 +version=1.8.12 revision=1 wrksrc=oiio-Release-${version} build_style=cmake @@ -14,8 +14,9 @@ short_desc="Library for reading and writing images" maintainer="lemmi " license="BSD" homepage="https://sites.google.com/site/openimageio/home" +changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md" distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz" -checksum=8ef724ebd09720bdb16d7af2df4c0fed2385d5c56d4ec56d18bb248dc1f81c1e +checksum=93e807d7c77a5c4c12598cc7932aa08239bc4198e3e31dca0998a3e0ab163386 CXXFLAGS="-faligned-new" case "$XBPS_TARGET_MACHINE" in @@ -25,9 +26,7 @@ esac pre_build() { local f - # Replace -isystem with -I to avoid "#include_next " file not found - sed -i CMakeLists.txt -e "s;-isystem;-I;g" - find ${wrksrc} -type f -exec sed -i "{}" -e "s;;;g" \; + case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) # Add libatomic to the targets From d3ad55a94e63f1255a0cf0a20f15171ca811d1cb Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 18:28:14 +0200 Subject: [PATCH 057/759] blender: openimageio sobump --- srcpkgs/blender/patches/disable_werror.patch | 13 +++++++++++++ srcpkgs/blender/template | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/blender/patches/disable_werror.patch diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/disable_werror.patch new file mode 100644 index 00000000000..635956f2aa9 --- /dev/null +++ b/srcpkgs/blender/patches/disable_werror.patch @@ -0,0 +1,13 @@ +diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt +index f22688f..c32aad1 100644 +--- a/intern/cycles/CMakeLists.txt ++++ b/intern/cycles/CMakeLists.txt +@@ -227,8 +227,6 @@ endif() + + # Warnings + if(CMAKE_COMPILER_IS_GNUCXX) +- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") +- ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") + ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") + unset(_has_cxxflag_float_conversion) + unset(_has_cxxflag_double_promotion) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 8566a01fbf9..998f354fe07 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=1 +revision=2 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel From 3675170e07aabfe16f43cdabf3bfdf59050febca Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 18:28:35 +0200 Subject: [PATCH 058/759] luxrays: openimageio sobump --- srcpkgs/luxrays/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template index 5be3b53f60e..50e0fc3d530 100644 --- a/srcpkgs/luxrays/template +++ b/srcpkgs/luxrays/template @@ -1,7 +1,7 @@ # Template file for 'luxrays' pkgname=luxrays version=3.1 -revision=8 +revision=9 build_style=cmake configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON" hostmakedepends="flex bison boost-python" From e3a3b4911fb66ab2b12a905f50235976ce730a29 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 18:28:35 +0200 Subject: [PATCH 059/759] luxmark: openimageio sobump --- srcpkgs/luxmark/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 2c38486b89f..591857a3322 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -1,7 +1,7 @@ # Template file for 'luxmark' pkgname=luxmark version=3.1 -revision=4 +revision=5 build_style=cmake makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel From 34295c6a7b7f62445ef630d751b0dfa8743296ee Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 22 Jun 2018 19:44:37 +0200 Subject: [PATCH 060/759] openimageio: fix crossbuild --- srcpkgs/openimageio/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 11e4eaf7269..1abaaa40abb 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,11 +1,12 @@ # Template file for 'openimageio' pkgname=openimageio version=1.8.12 -revision=1 +revision=2 wrksrc=oiio-Release-${version} build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 - -DSTOP_ON_WARNING=0 -DCMAKE_SYSTEM_PROCESSOR=${XBPS_TARGET_MACHINE}" + -DSTOP_ON_WARNING=0 -DCMAKE_SYSTEM_PROCESSOR=${XBPS_TARGET_MACHINE} + -DUSE_STD_REGEX_EXITCODE=0" hostmakedepends="pkg-config" makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel From b7596fc228c2f2fa3a33360ca6ea7be80c759305 Mon Sep 17 00:00:00 2001 From: iaroki Date: Fri, 22 Jun 2018 22:00:11 +0300 Subject: [PATCH 061/759] prometheus: update to 2.3.1 (#197) --- srcpkgs/prometheus/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template index d0689166ad4..3ccbb223147 100644 --- a/srcpkgs/prometheus/template +++ b/srcpkgs/prometheus/template @@ -1,7 +1,7 @@ # Template file for 'prometheus' pkgname=prometheus -version=2.2.1 -revision=3 +version=2.3.1 +revision=1 build_style=go go_import_path="github.com/prometheus/prometheus" go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool" @@ -11,11 +11,11 @@ go_ldflags="-X ${go_import_path}/version.Version=${version} -X ${go_import_path}/version.BuildUser=VoidLinux" conf_files="/etc/prometheus/prometheus.yml" maintainer="Toyam Cox " +short_desc="Monitoring system and time series database" license="Apache-2.0" homepage="https://prometheus.io/" -short_desc="Monitoring system and time series database" distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz" -checksum=4f75427449bb72d1886f6cd46f752fe6300242da48b8bb870dbbd7ffc879ed92 +checksum=3aab85d3cb59540b6b43f5a80b14d13937fc0d51e8e82a29f0efebf6addd5f75 system_accounts="_prometheus" From 2159a85ea320e799920bc628a3f46befee0c9232 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 22 Jun 2018 21:02:50 +0200 Subject: [PATCH 062/759] skype: update to 8.25.76.1 (#337) --- srcpkgs/skype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 0e255159fa1..fc706119be1 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,7 +1,7 @@ # Template file for 'skype' # This just repackages the debian package. pkgname=skype -version=8.24.76.3 +version=8.25.76.1 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -12,7 +12,7 @@ maintainer="Lon Willett " license="skype" homepage="https://www.skype.com" distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=62e9ea65af9d1d4879664af3f72e135864edc50170816bb24ee78a4bcf8364a4 +checksum=e93bc67180ed4934bf8bfd23f23917e68e00668078b35fc25497ebc1374de2e1 do_extract() { ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr From 35d7ee4253a9c090acbc40c25eac5d233feaf9bf Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 2 May 2018 14:43:43 -0500 Subject: [PATCH 063/759] New package: transcode-1.1.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #13 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/transcode/patches/musl.patch | 20 + .../patches/transcode-configure_in.patch | 45 + .../transcode/patches/transcode-ffmpeg3.patch | 1241 +++++++++++++++++ srcpkgs/transcode/template | 22 + 4 files changed, 1328 insertions(+) create mode 100644 srcpkgs/transcode/patches/musl.patch create mode 100644 srcpkgs/transcode/patches/transcode-configure_in.patch create mode 100644 srcpkgs/transcode/patches/transcode-ffmpeg3.patch create mode 100644 srcpkgs/transcode/template diff --git a/srcpkgs/transcode/patches/musl.patch b/srcpkgs/transcode/patches/musl.patch new file mode 100644 index 00000000000..f731fda93d3 --- /dev/null +++ b/srcpkgs/transcode/patches/musl.patch @@ -0,0 +1,20 @@ +--- avilib/avidump.c.orig ++++ avilib/avidump.c +@@ -320,7 +320,7 @@ + { + uint32_t i,j,val32; + uint16_t val16; +- loff_t val64; ++ uint64_t val64; + char val8; + + for (i = 0; names[i].type != EoLST; i++) { +@@ -605,7 +605,7 @@ + + case indxtag: { + uint32_t chunks=*chunksize-sizeof(names_indx)/sizeof(char*); +- loff_t offset; ++ uint64_t offset; + uint32_t size, duration; + uint32_t u=0; + off_t indxend = datapos + chunks; diff --git a/srcpkgs/transcode/patches/transcode-configure_in.patch b/srcpkgs/transcode/patches/transcode-configure_in.patch new file mode 100644 index 00000000000..ee76928fb73 --- /dev/null +++ b/srcpkgs/transcode/patches/transcode-configure_in.patch @@ -0,0 +1,45 @@ +--- configure.in.orig 2018-06-22 20:57:08.925033685 +0200 ++++ configure.in 2018-06-22 20:58:19.544037328 +0200 +@@ -776,42 +776,6 @@ + LAME_CFLAGS="$lame_ii" + fi + CPPFLAGS="$save_CPPFLAGS" +- +- AC_MSG_CHECKING([lame version]) +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $LAME_CFLAGS" +- LIBS="$LIBS $LAME_LIBS" +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#include +- +-#ifdef HAVE_LAME_INC +-#include +-#else +-#include +-#endif +- +-int main () { +- lame_version_t lv; +- get_lame_version_numerical(&lv); +- if(lv.alpha || lv.beta) lv.minor--; +- printf("%d%d\n", lv.major, lv.minor); +- return 0; +-} +-]])], +- [lame_version="`./conftest$ac_exeext`"], +- [AC_MSG_RESULT([failed]) +- TC_PKG_ERROR(lame, lame.h, yes, lame, [http://www.mp3dev.org/], +- [cannot compile and run a test program])],, +- [AC_MSG_RESULT([cross compiling; assumed OK...])]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- +- if test 393 -ge "$lame_version" ; then +- have_lame="no" +- TC_PKG_ERROR(lame, lame.h, yes, lame, [http://www.mp3dev.org/], +- [lame version < 3.93]) +- fi + fi + TC_PKG_HAVE(lame, LAME) + diff --git a/srcpkgs/transcode/patches/transcode-ffmpeg3.patch b/srcpkgs/transcode/patches/transcode-ffmpeg3.patch new file mode 100644 index 00000000000..570038d5d76 --- /dev/null +++ b/srcpkgs/transcode/patches/transcode-ffmpeg3.patch @@ -0,0 +1,1241 @@ +Submitted By: Armion K. +Date: 2016-05-06 +Initial Package Version: 1.1.7 +Upstream Status: Unknown +Origin: Gentoo and Debian +Description: Fixes building against FFmpeg version >= 3.0.0 + +--- encode/encode_lavc.c 2011-11-19 17:50:27.000000000 +0100 ++++ encode/encode_lavc.c 2016-02-15 16:08:37.914488116 +0100 +@@ -74,6 +74,9 @@ + int lmin; + int lmax; + int me_method; ++ int luma_elim_threshold; ++ int chroma_elim_threshold; ++ int quantizer_noise_shaping; + + /* same as above for flags */ + struct { +@@ -114,6 +117,7 @@ + + AVFrame ff_venc_frame; + AVCodecContext ff_vcontext; ++ AVDictionary * ff_opts; + + AVCodec *ff_vcodec; + +@@ -164,6 +168,7 @@ + TC_CODEC_ERROR + }; + ++#if LIBAVCODEC_VERSION_MAJOR < 55 + static const enum CodecID tc_lavc_internal_codecs[] = { + CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, + CODEC_ID_H263I, CODEC_ID_H263P, +@@ -176,6 +181,20 @@ + CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, + CODEC_ID_NONE + }; ++#else ++static const enum AVCodecID tc_lavc_internal_codecs[] = { ++ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, ++ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, ++ AV_CODEC_ID_H264, ++ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, ++ AV_CODEC_ID_RV10, ++ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, ++ AV_CODEC_ID_DVVIDEO, ++ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, ++ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, ++ AV_CODEC_ID_NONE ++}; ++#endif + + static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; + +@@ -214,7 +233,7 @@ + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + } + +@@ -228,7 +247,7 @@ + IMG_YUV_DEFAULT, + pd->ff_vcontext.width, pd->ff_vcontext.height); + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV422P, ++ AV_PIX_FMT_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(src, IMG_YUV_DEFAULT, + pd->ff_venc_frame.data, IMG_YUV422P, +@@ -244,7 +263,7 @@ + IMG_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(src, IMG_YUV422P, + pd->ff_venc_frame.data, IMG_YUV420P, +@@ -256,7 +275,7 @@ + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, +- PIX_FMT_YUV422P, ++ AV_PIX_FMT_YUV422P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + + } +@@ -266,7 +285,7 @@ + vframe_list_t *vframe) + { + avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, +- PIX_FMT_YUV420P, ++ AV_PIX_FMT_YUV420P, + pd->ff_vcontext.width, pd->ff_vcontext.height); + ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, + pd->ff_venc_frame.data, IMG_YUV420P, +@@ -591,21 +610,21 @@ + case CODEC_YUV: + if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { + pd->tc_pix_fmt = TC_CODEC_YUV422P; +- pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P; ++ pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P; + pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv; + } else { + pd->tc_pix_fmt = TC_CODEC_YUV420P; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ420P +- : PIX_FMT_YUV420P; ++ ? AV_PIX_FMT_YUVJ420P ++ : AV_PIX_FMT_YUV420P; + pd->pre_encode_video = pre_encode_video_yuv420p; + } + break; + case CODEC_YUV422: + pd->tc_pix_fmt = TC_CODEC_YUV422P; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ422P +- : PIX_FMT_YUV422P; ++ ? AV_PIX_FMT_YUVJ422P ++ : AV_PIX_FMT_YUV422P; + if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { + pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; + } else { +@@ -615,10 +634,10 @@ + case CODEC_RGB: + pd->tc_pix_fmt = TC_CODEC_RGB; + pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) +- ? PIX_FMT_YUV422P ++ ? AV_PIX_FMT_YUV422P + : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) +- ? PIX_FMT_YUVJ420P +- : PIX_FMT_YUV420P; ++ ? AV_PIX_FMT_YUVJ420P ++ : AV_PIX_FMT_YUV420P; + pd->pre_encode_video = pre_encode_video_rgb24; + break; + default: +@@ -937,7 +956,11 @@ + static void tc_lavc_config_defaults(TCLavcPrivateData *pd) + { + /* first of all reinitialize lavc data */ ++#if LIBAVCODEC_VERSION_MAJOR < 55 + avcodec_get_context_defaults(&pd->ff_vcontext); ++#else ++ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); ++#endif + + pd->confdata.thread_count = 1; + +@@ -955,8 +978,6 @@ + /* + * context *transcode* (not libavcodec) defaults + */ +- pd->ff_vcontext.mb_qmin = 2; +- pd->ff_vcontext.mb_qmax = 31; + pd->ff_vcontext.max_qdiff = 3; + pd->ff_vcontext.max_b_frames = 0; + pd->ff_vcontext.me_range = 0; +@@ -977,8 +998,8 @@ + pd->ff_vcontext.mpeg_quant = 0; + pd->ff_vcontext.rc_initial_cplx = 0.0; + pd->ff_vcontext.rc_qsquish = 1.0; +- pd->ff_vcontext.luma_elim_threshold = 0; +- pd->ff_vcontext.chroma_elim_threshold = 0; ++ pd->confdata.luma_elim_threshold = 0; ++ pd->confdata.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; + pd->ff_vcontext.dct_algo = FF_DCT_AUTO; + pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; +@@ -1002,7 +1023,7 @@ + pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.noise_reduction = 0; +- pd->ff_vcontext.quantizer_noise_shaping = 0; ++ pd->confdata.quantizer_noise_shaping = 0; + pd->ff_vcontext.flags = 0; + } + +@@ -1033,17 +1054,10 @@ + pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method; + + pd->ff_vcontext.flags = 0; +- SET_FLAG(pd, mv0); +- SET_FLAG(pd, cbp); + SET_FLAG(pd, qpel); +- SET_FLAG(pd, alt); +- SET_FLAG(pd, vdpart); +- SET_FLAG(pd, naq); + SET_FLAG(pd, ilme); + SET_FLAG(pd, ildct); + SET_FLAG(pd, aic); +- SET_FLAG(pd, aiv); +- SET_FLAG(pd, umv); + SET_FLAG(pd, psnr); + SET_FLAG(pd, trell); + SET_FLAG(pd, gray); +@@ -1064,6 +1078,36 @@ + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; + } ++ if (pd->confdata.flags.alt) { ++ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); ++ } ++ if (pd->confdata.flags.vdpart) { ++ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); ++ } ++ if (pd->confdata.flags.umv) { ++ av_dict_set(&(pd->ff_opts), "umv", "1", 0); ++ } ++ if (pd->confdata.flags.aiv) { ++ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); ++ } ++ if (pd->confdata.flags.cbp) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); ++ } ++ if (pd->confdata.flags.mv0) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0); ++ } ++ if (pd->confdata.flags.naq) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0); ++ } ++ ++ char buf[1024]; ++#define set_dict_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ ++ av_dict_set(&(pd->ff_opts), opt, buf, 0) ++ ++ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); ++ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); ++ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); + } + + #undef SET_FLAG +@@ -1116,12 +1160,10 @@ + // handled by transcode core + // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + // handled by transcode core +- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, +- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES }, ++ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX }, + { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, }, + { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 }, + { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, +@@ -1150,8 +1192,8 @@ + { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported + { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, +- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, ++ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, ++ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, + { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1177,25 +1219,25 @@ + { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, ++ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, + { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + +- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, +- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, ++ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, +- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, ++ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, + { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, +- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, +- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, ++ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, + #else + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, + #endif +- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, +- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, ++ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, +@@ -1345,12 +1387,14 @@ + + pd = self->userdata; + ++ pd->ff_opts = NULL; ++ + pd->flush_flag = vob->encoder_flush; + + /* FIXME: move into core? */ + TC_INIT_LIBAVCODEC; + +- avcodec_get_frame_defaults(&pd->ff_venc_frame); ++ av_frame_unref(&pd->ff_venc_frame); + /* + * auxiliary config data needs to be blanked too + * before any other operation +@@ -1387,7 +1431,7 @@ + pd->confdata.thread_count, + (pd->confdata.thread_count > 1) ?"s" :""); + } +- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); ++ pd->ff_vcontext.thread_count = pd->confdata.thread_count; + + pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); + if (pd->ff_vcodec == NULL) { +@@ -1397,11 +1441,11 @@ + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); ++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); + TC_UNLOCK_LIBAVCODEC; + + if (ret < 0) { +- tc_log_error(MOD_NAME, "avcodec_open() failed"); ++ tc_log_error(MOD_NAME, "avcodec_open2() failed"); + goto failed; + } + /* finally, pass up the extradata, if any */ +@@ -1483,6 +1527,8 @@ + vframe_list_t *outframe) + { + TCLavcPrivateData *pd = NULL; ++ AVPacket pkt; ++ int ret, got_packet = 0; + + TC_MODULE_SELF_CHECK(self, "encode_video"); + +@@ -1497,12 +1543,15 @@ + + pd->pre_encode_video(pd, inframe); + ++ av_init_packet(&pkt); ++ pkt.data = outframe->video_buf; ++ pkt.size = inframe->video_size; ++ + TC_LOCK_LIBAVCODEC; +- outframe->video_len = avcodec_encode_video(&pd->ff_vcontext, +- outframe->video_buf, +- inframe->video_size, +- &pd->ff_venc_frame); ++ ret = avcodec_encode_video2(&pd->ff_vcontext, &pkt, ++ &pd->ff_venc_frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ outframe->video_len = ret ? ret : pkt.size; + + if (outframe->video_len < 0) { + tc_log_warn(MOD_NAME, "encoder error: size (%i)", +--- export/aud_aux.c 2011-11-19 17:50:27.000000000 +0100 ++++ export/aud_aux.c 2016-02-15 16:08:37.914488116 +0100 +@@ -326,10 +326,10 @@ + + switch (o_codec) { + case 0x50: +- codeid = CODEC_ID_MP2; ++ codeid = AV_CODEC_ID_MP2; + break; + case 0x2000: +- codeid = CODEC_ID_AC3; ++ codeid = AV_CODEC_ID_AC3; + break; + default: + tc_warn("cannot init ffmpeg with %x", o_codec); +@@ -346,7 +346,7 @@ + + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- +- avcodec_get_context_defaults(&mpa_ctx); ++ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); + #if LIBAVCODEC_VERSION_MAJOR < 53 + mpa_ctx.codec_type = CODEC_TYPE_AUDIO; + #else +@@ -359,11 +359,11 @@ + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&mpa_ctx, mpa_codec); ++ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", +- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); ++ (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3"); + return(TC_EXPORT_ERROR); + } + +@@ -846,6 +846,9 @@ + #ifdef HAVE_FFMPEG + int in_size, out_size; + char *in_buf; ++ int got_packet; ++ AVPacket avpkt = { 0 }; ++ AVFrame *frame = av_frame_alloc(); + + //-- input buffer and amount of bytes -- + in_size = aud_size; +@@ -866,10 +869,14 @@ + + ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed); + ++ frame->nb_samples = mpa_ctx.frame_size; ++ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)mpa_buf, mpa_bytes_pf, 1); ++ avpkt.data = output; ++ avpkt.size = OUTPUT_SIZE; + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, +- OUTPUT_SIZE, (short *)mpa_buf); ++ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ out_size = avpkt.size; + tc_audio_write(output, out_size, avifile); + + in_size -= bytes_needed; +@@ -884,6 +891,7 @@ + + ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail); + mpa_buf_ptr += bytes_avail; ++ av_frame_free(&frame); + return (0); + } + } //bytes availabe from last call? +@@ -893,10 +901,15 @@ + //---------------------------------------------------- + + while (in_size >= mpa_bytes_pf) { ++ av_frame_unref(frame); ++ frame->nb_samples = mpa_ctx.frame_size; ++ avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)in_buf, mpa_bytes_pf, 1); ++ avpkt.data = output; ++ avpkt.size = OUTPUT_SIZE; + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output, +- OUTPUT_SIZE, (short *)in_buf); ++ out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; ++ out_size = avpkt.size; + + tc_audio_write(output, out_size, avifile); + +@@ -904,6 +917,8 @@ + in_buf += mpa_bytes_pf; + } + ++ av_frame_free(&frame); ++ + //-- hold rest of bytes in mpa-buffer -- + //-------------------------------------- + if (in_size > 0) { +--- export/export_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ export/export_ffmpeg.c 2016-02-15 16:08:37.915488139 +0100 +@@ -122,6 +122,7 @@ + static AVFrame *lavc_convert_frame = NULL; + + static AVCodec *lavc_venc_codec = NULL; ++static AVDictionary *lavc_venc_opts = NULL; + static AVFrame *lavc_venc_frame = NULL; + static AVCodecContext *lavc_venc_context; + static avi_t *avifile = NULL; +@@ -180,7 +181,7 @@ + + + /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ +-#include ++#include + #include + #include + +@@ -249,9 +250,9 @@ + for(type=0; type= 0; type++){ + /* GLUE: +if */ + if (type == AVMEDIA_TYPE_VIDEO) { +- const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); +- if(o2) +- ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); ++ o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); ++ if(o) ++ ret = av_opt_set(avcodec_opts[type], opt, arg, 0); + /* GLUE: +if */ + } + } +@@ -266,7 +267,10 @@ + if(opt[0] == 'a') + ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o); + else */ if(opt[0] == 'v') +- ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o); ++ { ++ o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0); ++ ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0); ++ } + /* GLUE: disabling + else if(opt[0] == 's') + ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o); +@@ -470,7 +474,6 @@ + } + + TC_LOCK_LIBAVCODEC; +- avcodec_init(); + avcodec_register_all(); + TC_UNLOCK_LIBAVCODEC; + +@@ -486,11 +489,11 @@ + codec->name, codec->fourCC, codec->comments); + } + +- lavc_venc_context = avcodec_alloc_context(); +- lavc_venc_frame = avcodec_alloc_frame(); ++ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); ++ lavc_venc_frame = av_frame_alloc(); + +- lavc_convert_frame= avcodec_alloc_frame(); +- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); ++ lavc_convert_frame= av_frame_alloc(); ++ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); + enc_buffer = tc_malloc(size); + + if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { +@@ -634,7 +637,7 @@ + lavc_param_rc_max_rate = 2516; + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -674,7 +677,7 @@ + + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -838,8 +841,13 @@ + lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; +- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; +- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; ++ ++ char buf[1024]; ++#define set_dict_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%i", val); \ ++ av_dict_set(&lavc_venc_opts, opt, buf, 0) ++ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); ++ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -870,7 +878,7 @@ + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; + lavc_venc_context->noise_reduction = lavc_param_noise_reduction; +- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; ++ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); + lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; + lavc_venc_context->skip_top = lavc_param_skip_top; + lavc_venc_context->skip_bottom = lavc_param_skip_bottom; +@@ -887,7 +895,7 @@ + lavc_venc_context->thread_count); + } + +- avcodec_thread_init(lavc_venc_context, lavc_param_threads); ++ lavc_venc_context->thread_count = lavc_param_threads; + + if (lavc_param_intra_matrix) { + char *tmp; +@@ -1061,19 +1069,18 @@ + lavc_venc_context->ildct_cmp = lavc_param_ildct_cmp; + lavc_venc_context->dia_size = lavc_param_dia_size; + lavc_venc_context->flags |= lavc_param_qpel; +- lavc_venc_context->flags |= lavc_param_gmc; ++ if(lavc_param_gmc) ++ av_dict_set(&lavc_venc_opts, "gmc", "1", 0); + lavc_venc_context->flags |= lavc_param_closedgop; + lavc_venc_context->flags |= lavc_param_trunc; + lavc_venc_context->flags |= lavc_param_aic; +- lavc_venc_context->flags |= lavc_param_umv; + lavc_venc_context->flags |= lavc_param_v4mv; +- lavc_venc_context->flags |= lavc_param_data_partitioning; +- lavc_venc_context->flags |= lavc_param_cbp; +- lavc_venc_context->flags |= lavc_param_mv0; +- lavc_venc_context->flags |= lavc_param_qp_rd; +- lavc_venc_context->flags |= lavc_param_scan_offset; +- lavc_venc_context->flags |= lavc_param_ss; +- lavc_venc_context->flags |= lavc_param_alt; ++ if(lavc_param_cbp) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); ++ if(lavc_param_mv0) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0); ++ if(lavc_param_qp_rd) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); + lavc_venc_context->flags |= lavc_param_ilme; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_venc_context->flags |= lavc_param_trell; +@@ -1084,7 +1091,7 @@ + if (lavc_param_gray) + lavc_venc_context->flags |= CODEC_FLAG_GRAY; + if (lavc_param_normalize_aqp) +- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP; ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0); + + switch(vob->encode_fields) { + case TC_ENCODE_FIELDS_TOP_FIRST: +@@ -1112,7 +1119,7 @@ + lavc_venc_context->prediction_method = lavc_param_prediction_method; + + if(is_huffyuv) +- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; + else + { + switch(pix_fmt) +@@ -1121,18 +1128,18 @@ + case CODEC_RGB: + { + if(is_mjpeg) +- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; + else +- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; + break; + } + + case CODEC_YUV422: + { + if(is_mjpeg) +- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; + else +- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; ++ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; + break; + } + +@@ -1203,9 +1210,8 @@ + + lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; + +- + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ +- if (lavc_param_video_preset) { ++ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { + avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; + video_codec_name = ffmpeg_codec_name(codec->name); + +@@ -1241,20 +1247,39 @@ + } + } + ++ if (lavc_param_scan_offset) { ++ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); ++ } ++ ++ if (lavc_param_ss) { ++ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); ++ } ++ ++ if (lavc_param_alt) { ++ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); ++ } ++ ++ if (lavc_param_umv) { ++ av_dict_set(&lavc_venc_opts, "umv", "1", 0); ++ } ++ ++ if (lavc_param_data_partitioning) { ++ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); ++ } + + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); ++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " +- "(lavc_venc_context->codec->encode == NULL)"); ++ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); + return TC_EXPORT_ERROR; + } + +@@ -1574,6 +1599,8 @@ + + int out_size; + const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; ++ AVPacket pkt; ++ int ret, got_packet = 0; + + if (param->flag == TC_VIDEO) { + +@@ -1598,7 +1625,7 @@ + YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, + lavc_venc_context->width, lavc_venc_context->height); + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV422P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV422P, lavc_venc_context->width, + lavc_venc_context->height); + /* FIXME: can't use tcv_convert (see decode_lavc.c) */ + ac_imgconvert(src, IMG_YUV_DEFAULT, +@@ -1628,7 +1655,7 @@ + lavc_venc_context->width, + lavc_venc_context->height); + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV420P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV420P, lavc_venc_context->width, + lavc_venc_context->height); + ac_imgconvert(src, IMG_YUV422P, + lavc_venc_frame->data, IMG_YUV420P, +@@ -1639,7 +1666,7 @@ + + case CODEC_RGB: + avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, +- PIX_FMT_YUV420P, lavc_venc_context->width, ++ AV_PIX_FMT_YUV420P, lavc_venc_context->width, + lavc_venc_context->height); + ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, + lavc_venc_frame->data, IMG_YUV420P, +@@ -1652,13 +1679,17 @@ + return TC_EXPORT_ERROR; + } + ++ av_init_packet(&pkt); ++ pkt.data = enc_buffer; ++ pkt.size = size; + + TC_LOCK_LIBAVCODEC; +- out_size = avcodec_encode_video(lavc_venc_context, +- enc_buffer, size, +- lavc_venc_frame); ++ ret = avcodec_encode_video2(lavc_venc_context, &pkt, ++ lavc_venc_frame, &got_packet); + TC_UNLOCK_LIBAVCODEC; + ++ out_size = ret ? ret : pkt.size; ++ + if (out_size < 0) { + tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); + return TC_EXPORT_ERROR; +--- export/ffmpeg_cfg.c 2011-11-19 17:50:27.000000000 +0100 ++++ export/ffmpeg_cfg.c 2016-02-15 16:08:37.916488161 +0100 +@@ -34,8 +34,6 @@ + //int lavc_param_vqscale = 0; + //int lavc_param_vqmin = 2; + //int lavc_param_vqmax = 31; +-int lavc_param_mb_qmin = 2; +-int lavc_param_mb_qmax = 31; + int lavc_param_lmin = 2; + int lavc_param_lmax = 31; + int lavc_param_vqdiff = 3; +@@ -126,7 +124,7 @@ + //int lavc_param_atag = 0; + //int lavc_param_abitrate = 224; + +-char *lavc_param_video_preset = "medium"; ++char *lavc_param_video_preset = "none"; + char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; + + TCConfigEntry lavcopts_conf[]={ +@@ -143,15 +141,13 @@ + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, + {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0}, + {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, +- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES}, ++ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX}, + // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -160,9 +156,9 @@ + {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -211,26 +207,26 @@ + #else + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, + #endif +- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, ++ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, +- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, +- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, ++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, ++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, +- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, +- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, +- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, ++ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, + {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, +- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, ++ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, + {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, + {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, +--- export/ffmpeg_cfg.h 2011-11-19 17:50:27.000000000 +0100 ++++ export/ffmpeg_cfg.h 2016-02-15 16:08:37.916488161 +0100 +@@ -13,8 +13,6 @@ + //extern int lavc_param_vqscale; + //extern int lavc_param_vqmin; + //extern int lavc_param_vqmax; +-extern int lavc_param_mb_qmin; +-extern int lavc_param_mb_qmax; + extern int lavc_param_lmin; + extern int lavc_param_lmax; + extern int lavc_param_vqdiff; +--- filter/filter_pp.c 2011-11-19 17:50:27.000000000 +0100 ++++ filter/filter_pp.c 2016-02-15 16:08:37.916488161 +0100 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + +--- import/decode_lavc.c 2011-11-19 17:50:27.000000000 +0100 ++++ import/decode_lavc.c 2016-02-15 16:09:00.252988897 +0100 +@@ -58,37 +58,37 @@ + + // fourCC to ID mapping taken from MPlayer's codecs.conf + static struct ffmpeg_codec ffmpeg_codecs[] = { +- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", ++ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", + {"MP41", "DIV1", ""}}, +- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", ++ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", + {"MP42", "DIV2", ""}}, +- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", ++ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", + {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, +- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", ++ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", + {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, +- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", ++ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", + {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, +- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", ++ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", + {"MPG1", ""}}, +- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", ++ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", + {"DVSD", ""}}, +- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", ++ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", + {"WMV1", ""}}, +- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", ++ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", + {"WMV2", ""}}, +- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", ++ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", + {"HFYU", ""}}, +- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", ++ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", + {"I263", ""}}, +- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", ++ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", + {"H263", "U263", "VIV1", ""}}, +- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", ++ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", + {"RV10", "RV13", ""}}, +- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", ++ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", + {"SVQ1", ""}}, +- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", ++ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", + {"SVQ3", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", + {"MPG2", ""}}, + {0, TC_CODEC_UNKNOWN, NULL, {""}}}; + +@@ -170,7 +170,7 @@ + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(NULL); + if (lavc_dec_context == NULL) { + tc_log_error(__FILE__, "Could not allocate enough memory."); + goto decoder_error; +@@ -181,12 +181,12 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; + +- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { ++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { + tc_log_error(__FILE__, "Could not initialize the '%s' codec.", + codec->name); + goto decoder_error; +@@ -290,8 +290,8 @@ + + // Convert avcodec image to the requested YUV or RGB format + switch (lavc_dec_context->pix_fmt) { +- case PIX_FMT_YUVJ420P: +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUV420P: + // Remove "dead space" at right edge of planes, if any + if (picture.linesize[0] != lavc_dec_context->width) { + int y; +@@ -315,7 +315,7 @@ + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUV411P: ++ case AV_PIX_FMT_YUV411P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +@@ -334,8 +334,8 @@ + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUVJ422P: +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUV422P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +@@ -354,8 +354,8 @@ + pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, + lavc_dec_context->width, lavc_dec_context->height); + break; +- case PIX_FMT_YUVJ444P: +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUV444P: + if (picture.linesize[0] != lavc_dec_context->width) { + int y; + for (y = 0; y < lavc_dec_context->height; y++) { +--- import/import_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ import/import_ffmpeg.c 2016-02-15 16:08:48.269720627 +0100 +@@ -59,51 +59,51 @@ + + // fourCC to ID mapping taken from MPlayer's codecs.conf + static struct ffmpeg_codec ffmpeg_codecs[] = { +- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", ++ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", + {"MP41", "DIV1", ""}}, +- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", ++ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", + {"MP42", "DIV2", ""}}, +- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", ++ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", + {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, +- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", ++ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", + {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, +- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", ++ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", + {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, +- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", ++ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", + {"MPG1", ""}}, +- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", ++ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", + {"DVSD", ""}}, +- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", ++ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", + {"WMV1", ""}}, +- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", ++ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", + {"WMV2", ""}}, +- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", ++ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", + {"HFYU", ""}}, +- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", ++ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", + {"I263", ""}}, +- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", ++ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", + {"H263", "U263", "VIV1", ""}}, +- {CODEC_ID_H264, TC_CODEC_H264, "h264", ++ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", + {"H264", "h264", "X264", "x264", "avc1", ""}}, +- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", ++ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", + {"RV10", "RV13", ""}}, +- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", ++ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", + {"SVQ1", ""}}, +- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", ++ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", + {"SVQ3", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", + {"MPG2", ""}}, +- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", ++ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", + {"MPG2", ""}}, +- {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", ++ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", + {"ASV1", ""}}, +- {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", ++ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", + {"ASV2", ""}}, +- {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", ++ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", + {"FFV1", ""}}, +- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", ++ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", + {"I420", "IYUV", ""}}, +- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", ++ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", + {"Y42B", ""}}, + {0, TC_CODEC_UNKNOWN, NULL, {""}}}; + +@@ -302,7 +302,7 @@ + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); + if (lavc_dec_context == NULL) { + tc_log_error(MOD_NAME, "Could not allocate enough memory."); + return TC_IMPORT_ERROR; +@@ -314,7 +314,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +@@ -324,13 +324,13 @@ + // XXX: some codecs need extra data + switch (codec->id) + { +- case CODEC_ID_MJPEG: extra_data_size = 28; break; +- case CODEC_ID_LJPEG: extra_data_size = 28; break; +- case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; +- case CODEC_ID_ASV1: extra_data_size = 8; break; +- case CODEC_ID_ASV2: extra_data_size = 8; break; +- case CODEC_ID_WMV1: extra_data_size = 4; break; +- case CODEC_ID_WMV2: extra_data_size = 4; break; ++ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; ++ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; ++ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; ++ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; ++ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; ++ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; ++ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; + default: extra_data_size = 0; break; + } + +@@ -344,7 +344,7 @@ + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); ++ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", +@@ -360,7 +360,7 @@ + frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); + + // we adapt the color space +- if(codec->id == CODEC_ID_MJPEG) { ++ if(codec->id == AV_CODEC_ID_MJPEG) { + enable_levels_filter(); + } + break; +@@ -434,7 +434,7 @@ + } + + // we adapt the color space +- if(codec->id == CODEC_ID_MJPEG) { ++ if(codec->id == AV_CODEC_ID_MJPEG) { + enable_levels_filter(); + } + +@@ -504,13 +504,13 @@ + int bkey = 0; + + // check for keyframes +- if (codec->id == CODEC_ID_MSMPEG4V3) { ++ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { + if (divx3_is_key(buffer)) bkey = 1; + } +- else if (codec->id == CODEC_ID_MPEG4) { ++ else if (codec->id == AV_CODEC_ID_MPEG4) { + if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; + } +- else if (codec->id == CODEC_ID_MJPEG) { ++ else if (codec->id == AV_CODEC_ID_MJPEG) { + bkey = 1; + } + +@@ -580,8 +580,8 @@ + + // Convert avcodec image to our internal YUV or RGB format + switch (lavc_dec_context->pix_fmt) { +- case PIX_FMT_YUVJ420P: +- case PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: ++ case AV_PIX_FMT_YUV420P: + src_fmt = IMG_YUV420P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -612,7 +612,7 @@ + } + break; + +- case PIX_FMT_YUV411P: ++ case AV_PIX_FMT_YUV411P: + src_fmt = IMG_YUV411P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -640,8 +640,8 @@ + } + break; + +- case PIX_FMT_YUVJ422P: +- case PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ case AV_PIX_FMT_YUV422P: + src_fmt = IMG_YUV422P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +@@ -669,8 +669,8 @@ + } + break; + +- case PIX_FMT_YUVJ444P: +- case PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ case AV_PIX_FMT_YUV444P: + src_fmt = IMG_YUV444P; + YUV_INIT_PLANES(src_planes, frame, src_fmt, + lavc_dec_context->width, lavc_dec_context->height); +--- import/probe_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ import/probe_ffmpeg.c 2016-02-15 16:08:37.917488184 +0100 +@@ -99,8 +99,8 @@ + + TC_INIT_LIBAVCODEC; + +- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, +- NULL, 0, NULL); ++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, ++ NULL, NULL); + if (ret != 0) { + tc_log_error(__FILE__, "unable to open '%s'" + " (libavformat failure)", +@@ -109,7 +109,7 @@ + return; + } + +- ret = av_find_stream_info(lavf_dmx_context); ++ ret = avformat_find_stream_info(lavf_dmx_context, NULL); + if (ret < 0) { + tc_log_error(__FILE__, "unable to fetch informations from '%s'" + " (libavformat failure)", +@@ -120,7 +120,11 @@ + + translate_info(lavf_dmx_context, ipipe->probe_info); + ++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0) ++ avformat_close_input(&lavf_dmx_context); ++#else + av_close_input_file(lavf_dmx_context); ++#endif + return; + } + +--- libtc/tcavcodec.h 2011-11-19 17:50:27.000000000 +0100 ++++ libtc/tcavcodec.h 2016-02-15 16:08:37.917488184 +0100 +@@ -53,7 +53,6 @@ + + #define TC_INIT_LIBAVCODEC do { \ + TC_LOCK_LIBAVCODEC; \ +- avcodec_init(); \ + avcodec_register_all(); \ + TC_UNLOCK_LIBAVCODEC; \ + } while (0) diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template new file mode 100644 index 00000000000..de336f91113 --- /dev/null +++ b/srcpkgs/transcode/template @@ -0,0 +1,22 @@ +# Template file for 'transcode' +pkgname=transcode +version=1.1.7 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkg-config" +makedepends="faac-devel ffmpeg-devel freetype-devel lame-devel + libdvdread-devel libjpeg-turbo-devel libmpeg2-devel libtheora-devel + libXaw-devel libxml2-devel libXv-devel lzo-devel SDL2-devel + xvidcore-devel" +short_desc="Modular utility for video stream processing" +maintainer="Andrew Benson " +license="GPL-3.0-or-later" +homepage="https://bitbucket.org/france/transcode-tcforge" +distfiles="https://bitbucket.org/france/transcode-tcforge/downloads/transcode-${version}.tar.bz2" +checksum=1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 + +pre_configure() { + mkdir -p m4 + mv configure.{in,ac} + autoreconf -fi +} From a8948a4cf08d5e0d9acecd2374b90649a81b9f3f Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Fri, 22 Jun 2018 16:07:09 -0300 Subject: [PATCH 064/759] dhcpcd: update to 7.0.6. (#93) --- srcpkgs/dhcpcd/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 3618b039b1c..4665e1b8ec4 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,19 +1,19 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=7.0.2 +version=7.0.6 revision=1 -lib32disabled=yes build_style=configure configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" hostmakedepends="ntp pkg-config" makedepends="eudev-libudev-devel" -conf_files="/etc/dhcpcd.conf" short_desc="RFC2131 compliant DHCP client" maintainer="Juan RP " license="BSD-2-Clause" -homepage="http://roy.marples.name/projects/dhcpcd" -distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=c52bfae93d327004081a33e867dec50ea580e0d399bbfd662978bfd73c84f405 +homepage="https://roy.marples.name/projects/dhcpcd" +distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" +checksum=727aa7ca972ab45ccad9238ae102604cca94ada87989305d04d81196d78ac341 +lib32disabled=yes +conf_files=/etc/dhcpcd.conf pre_install() { # make wpa_supplicant log to syslog rather than stdout From 6d009f933ab5a0d25ec77ad99904651ca4c840b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 22 Jun 2018 21:26:38 +0200 Subject: [PATCH 065/759] openimageio: fix armv[56]* build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/openimageio/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 1abaaa40abb..b859de4ebc0 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -27,6 +27,8 @@ esac pre_build() { local f + # Replace -isystem with -I to avoid "#include_next " file not found + sed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g" case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) From 95dc494c652707b634f336443af42d00b74eeeda Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 22 Jun 2018 21:30:24 +0200 Subject: [PATCH 066/759] Signal-Desktop: update to 1.12.1 (#101) --- .../patches/build-from-tarball.patch | 10 ++++++++++ srcpkgs/Signal-Desktop/template | 17 +++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/Signal-Desktop/patches/build-from-tarball.patch diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch new file mode 100644 index 00000000000..11f75722a5a --- /dev/null +++ b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch @@ -0,0 +1,10 @@ +Kludge to work around https://github.com/signalapp/Signal-Desktop/issues/2376. +--- Gruntfile.js.orig 2018-05-15 01:57:11.000000000 +0200 ++++ Gruntfile.js 2018-05-20 19:15:45.054357251 +0200 +@@ -511,6 +511,5 @@ + 'concat', + 'copy:deps', + 'sass', +- 'date', + ]); + }; diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 34730a31020..c85209067a7 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,27 +1,24 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop -version=1.7.1 +version=1.12.1 revision=1 hostmakedepends="git python nodejs-lts" depends="libnotify libappindicator" short_desc="Signal Private Messenger for Linux" maintainer="Julio Galvan " -license="GPL-3" +license="GPL-3.0-only" homepage="https://github.com/signalapp/Signal-Desktop" distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz" -checksum=188fe8c17ccf49609467ab59ea6321beb7ee71e00da7b419249d205ebf80d13d +checksum=82ca68e0b912db19b4bc4d1bfb8b2d2f76e1d4393c4c1fa8ff950502883b18ac # Due to electron only_for_archs="x86_64 i686" nostrip_files="signal-desktop" -post_extract() { - sed -i "s/'sass', 'date'/'sass'/g" Gruntfile.js -} - do_build() { npm install -g yarn yarn install --ignore-engines - yarn pack-prod + yarn generate + yarn build-release --dir } do_install() { @@ -32,7 +29,7 @@ do_install() { x86_64*) _ARCH="-";; *) _ARCH="-${XBPS_TARGET_MACHINE%-musl}-";; esac - vcopy dist/linux${_ARCH}unpacked/* usr/share/signal-desktop + vcopy release/linux${_ARCH}unpacked/* usr/share/signal-desktop vmkdir usr/bin ln -s /usr/share/signal-desktop/signal-desktop ${DESTDIR}/usr/bin/ @@ -41,7 +38,7 @@ do_install() { vcopy ${FILESDIR}/signal.desktop usr/share/applications/ vmkdir usr/share/icons/hicolor - for size in 16 24 32 48 64 128 256 512; do + for size in 16 24 32 48 64 128 256 512 1024; do vinstall build/icons/png/${size}x${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ signal.png done npm remove -g yarn From 0e9cc92c7420426f3971b644ce9f437fb7658c22 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Fri, 22 Jun 2018 21:35:27 +0200 Subject: [PATCH 067/759] common/shlibs: remove double or invalid entries (#308) --- common/shlibs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/common/shlibs b/common/shlibs index 674a45c52d4..d5fcbbca1fa 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2784,12 +2784,6 @@ libKDb3.so.4 kdb-3.1.0_1 libKPropertyWidgets3.so.4 kproperty-3.1.0_1 libKPropertyCore3.so.4 kproperty-3.1.0_1 libKReport3.so.4 kreport-3.1.0_1 -libKPropertyWidgets3.so.4 kproperty-3.1.0_1 -libKPropertyCore3.so.4 kproperty-3.1.0_1 -libKReport3.so.4 kreport-3.1.0_1 -libKPropertyWidgets3.so.4 kproperty-3.1.0_1 -libKPropertyCore3.so.4 kproperty-3.1.0_1 -libKReport3.so.4 kreport-3.1.0_1 libbotan-2.so.5 botan-2.6.0_1 libswipl.so.7.6 swi-prolog-7.6.0_1 libpcre2-16.so.0 libpcre2-10.22_1 @@ -2923,7 +2917,6 @@ libbacfind-9.0.4.so bacula-common-9.0.4_1 libbacsql-9.0.4.so bacula-common-9.0.4_1 libbaccats-9.0.4.so bacula-common-9.0.4_1 libbacsd-9.0.4.so bacula-common-9.0.4_1 -libbaccats-mysql-9.0.4.so bacula-common-9.0.4_1 libbaccats-sqlite3-9.0.4.so bacula-common-9.0.4_1 libbaccats-postgresql-9.0.4.so bacula-common-postgresql-9.0.4_1 libbaccats-mysql-9.0.4.so bacula-common-mariadb-9.0.4_1 @@ -3075,10 +3068,6 @@ libtecla_r.so.1 libtecla-1.6.3_1 libzim.so.4 libzim-4.0.0_1 libkiwix.so.2 kiwix-lib-2.0.0_1 libctpp2.so.2 ctpp2-2.8.3_1 -librpm.so.8 rpm-4.14.1_1 -librpmsign.so.8 rpm-4.14.1_1 -librpmbuild.so.8 rpm-4.14.1_1 -librpmio.so.8 rpm-4.14.1_1 libaria2.so.0 libaria2-1.33.1_3 librpm.so.8 librpm-4.14.1_1 librpmsign.so.8 librpmsign-4.14.1_1 @@ -3297,7 +3286,6 @@ libwayland-egl++.so.0.2 libwaylandpp-2.2.0_1 libwayland-client++.so.0.2 libwaylandpp-2.2.0_1 libwayland-cursor++.so.0.2 libwaylandpp-2.2.0_1 libwayland-client-extra++.so.0.2 libwaylandpp-2.2.0_1 -libfwup.so.1 fwupdate-10_1 libfwupd.so.2 libfwupd-1.0.8_1 libfwup.so.1 libfwup-11_1 libTKBin.so.7 occt-7.2.0p1_1 @@ -3384,12 +3372,10 @@ libkid3-core.so.3.6.0 kid3-3.6.0_1 libkid3-gui.so.3.6.0 kid3-3.6.0_1 libcfitsio.so.3 cfitsio-3.450_1 libapparmor.so.1 libapparmor-2.12.0_1 -libcue.so.2 libcue-2.2.0_1 libgsettings-qt.so.1 gsettings-qt-0.1+17.10.20170824_1 libplacebo.so.5 libplacebo-0.5.0_1 libw2xc.so waifu2x-converter-cpp-5.2_1 libnova-0.15.so.0 libnova-0.15.0_1 -libgsettings-qt.so.1 gsettings-qt-0.1.20160329_1 libdtkcore.so.2 dtkcore-2.0.6_1 libdtksettings.so.1 dtksettings-0.1.7_1 libdtksettingsview.so.1 dtksettings-0.1.7_1 @@ -3397,9 +3383,6 @@ libdframeworkdbus.so.2 dde-qt-dbus-factory-1.0.1_1 libdtkwidget.so.2 dtkwidget-2.0.6.1_1 libcue.so.2 libcue-2.2.0_1 libdtkwm.so.2 dtkwm-2.0.6_1 -libdtkwidget.so.2 dtkwidget-2.0.6.1_1 -libcue.so.2 libcue-2.2.0_1 -libdtkwm.so.2 dtkwm-2.0.6_1 libticonv.so.8 libticonv-1.1.5_1 libtifiles2.so.10 libtifiles2-1.1.7_1 libticables2.so.7 libticables2-1.3.5_1 From c984fcfc86547368107d6d3cd5caa3d40f221372 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Fri, 22 Jun 2018 18:54:22 -0300 Subject: [PATCH 068/759] cdm: add POSIX SH compat patch (#246) --- srcpkgs/cdm/patches/fix-bashisms.patch | 18 ++++++++++++++++++ srcpkgs/cdm/template | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cdm/patches/fix-bashisms.patch diff --git a/srcpkgs/cdm/patches/fix-bashisms.patch b/srcpkgs/cdm/patches/fix-bashisms.patch new file mode 100644 index 00000000000..a81f665c948 --- /dev/null +++ b/srcpkgs/cdm/patches/fix-bashisms.patch @@ -0,0 +1,18 @@ +Source: maxice8 +Upstream: to be upstreamed +Reason: fixes running it with POSIX shells + +--- src/profile.sh ++++ src/profile.sh +@@ -1,8 +1,8 @@ + # To avoid potential situation where cdm(1) crashes on every TTY, here we + # default to execute cdm(1) on tty1 only, and leave other TTYs untouched. +-if [[ "$(tty)" == '/dev/tty1' ]]; then +- [[ -n "$CDM_SPAWN" ]] && return ++if [ "$(tty)" = '/dev/tty1' ]; then ++ [ -n "$CDM_SPAWN" ] && return + # Avoid executing cdm(1) when X11 has already been started. +- [[ -z "$DISPLAY$SSH_TTY$(pgrep xinit)" ]] && exec cdm ++ [ -z "$DISPLAY$SSH_TTY$(pgrep xinit)" ] && exec cdm + fi + diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template index 6caa024c47b..5d409f36376 100644 --- a/srcpkgs/cdm/template +++ b/srcpkgs/cdm/template @@ -1,7 +1,7 @@ # Template file for 'cdm' pkgname=cdm version=0.7 -revision=1 +revision=2 short_desc="Console Display Manager" maintainer="Andrea Brancaleoni " depends="dialog xinit kbd xdpyinfo" From 4f6a93fa2245ebba3e9cc110ef614ec1f71daf91 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 23 Jun 2018 02:15:51 +0200 Subject: [PATCH 069/759] runit-void: update to 20180623. Closes #339. --- srcpkgs/runit-void/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index 9c0d6717436..cd3b794349d 100644 --- a/srcpkgs/runit-void/template +++ b/srcpkgs/runit-void/template @@ -1,6 +1,6 @@ # Template file for 'runit-void' pkgname=runit-void -version=20180620 +version=20180623 revision=1 wrksrc="void-runit-${version}" build_style=gnu-makefile @@ -9,7 +9,7 @@ short_desc="Void Linux runit scripts" maintainer="Juan RP " license="Public Domain" distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz" -checksum=ab2ea64137e0af520e12b2a1c5cb1e3c818ea8502626e908ecde60a2ec8d13ec +checksum=f71a070ac5e5af39fdaa0ffbd7404b607e503c2226cb49e98ac19e042283ff2c depends="virtual?awk procps-ng runit" conf_files=" From d9576f500e4704a3eb4935e20e717080a3c6ddb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 23 Jun 2018 06:33:07 +0200 Subject: [PATCH 070/759] Signal-Desktop: broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/Signal-Desktop/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index c85209067a7..8f50cec20e9 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -13,6 +13,7 @@ checksum=82ca68e0b912db19b4bc4d1bfb8b2d2f76e1d4393c4c1fa8ff950502883b18ac # Due to electron only_for_archs="x86_64 i686" nostrip_files="signal-desktop" +broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/9800/steps/shell_3/logs/stdio" do_build() { npm install -g yarn From e0a10a12d60373b70dc4ee8268f429dbf0705f13 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Sat, 23 Jun 2018 12:00:35 +0200 Subject: [PATCH 071/759] font-symbola: set restricted (#344) License doesn't allow redistribution anymore --- srcpkgs/font-symbola/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/font-symbola/template b/srcpkgs/font-symbola/template index 6101b381f9f..c352e91a0fa 100644 --- a/srcpkgs/font-symbola/template +++ b/srcpkgs/font-symbola/template @@ -1,18 +1,19 @@ # Template file for 'font-symbola' pkgname=font-symbola version=11.00 -revision=1 +revision=2 noarch=yes create_wrksrc=yes hostmakedepends="unzip" depends="font-util xbps-triggers" font_dirs="/usr/share/fonts/TTF" short_desc="Font with many Symbol/Emoji blocks of The Unicode Standard" -maintainer="Christian Neukirchen " -license="Free for any use" +maintainer="Leah Neukirchen " +license="Free for personal, non commercial use" homepage="http://users.teilar.gr/~g1951d/" distfiles="http://users.teilar.gr/~g1951d/Symbola.zip>Symbola-${version}.zip" -checksum=9388978165fdd781097656ad6f1111c2641ae5281613e9aebf0203c1dcd638a0 +checksum=d594ce9d51832f614776fed400b79e8ffffb8f8effeced73f9034907e512527d +restricted=yes do_install() { vinstall Symbola.ttf 0644 usr/share/fonts/TTF From b95ea0c64bbc4fda22ab1a2c4bb85eccd949afde Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 19 Jun 2018 08:31:14 -0300 Subject: [PATCH 072/759] acl: update to 2.2.53. --- srcpkgs/acl/template | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template index 4ea13408959..16efe535899 100644 --- a/srcpkgs/acl/template +++ b/srcpkgs/acl/template @@ -1,17 +1,17 @@ # Template file for 'acl' pkgname=acl -version=2.2.52 -revision=4 +version=2.2.53 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" makedepends="attr-devel" short_desc="Access Control List filesystem support" maintainer="Juan RP " -homepage="http://savannah.nongnu.org/projects/acl" -license="LGPL-2.1" -distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz" -checksum=179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 +license="LGPL-2.1-or-later" +homepage="https://savannah.nongnu.org/projects/acl" +distfiles="${NONGNU_SITE}/acl/acl-${version}.tar.gz" +checksum=06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 if [ -z "$CHROOT_READY" ]; then CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include" @@ -21,11 +21,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32" fi -do_install() { - make DIST_ROOT=${DESTDIR} install install-lib install-dev - rm -rf ${DESTDIR}/usr/share/doc -} - acl-devel_package() { depends="attr-devel acl>=${version}_${revision}" short_desc+=" - development files" @@ -34,6 +29,8 @@ acl-devel_package() { vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove "usr/share/man/man[235]" + vmove usr/lib/pkgconfig + vmove usr/share/doc } } From 7d3cd4499bd66d6a1dbc09c0aeb211bab653274d Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 19 Jun 2018 03:32:54 -0300 Subject: [PATCH 073/759] blackbox: update to 1.20180618. --- srcpkgs/blackbox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/blackbox/template b/srcpkgs/blackbox/template index c5e0f65e6cc..06bec29e92e 100644 --- a/srcpkgs/blackbox/template +++ b/srcpkgs/blackbox/template @@ -1,6 +1,6 @@ # Template file for 'blackbox' pkgname=blackbox -version=1.20180615 +version=1.20180618 revision=1 noarch=yes depends="bash" @@ -9,7 +9,7 @@ maintainer="Daniel A. Maierhofer " license="MIT" homepage="https://github.com/StackExchange/blackbox" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=ff79e896cb4d5a31472899c9ed48ac3b234fc87486a90978f64e03be2c63ac06 +checksum=dae06417d2aeaba41cf0f0f7bd8c07c7f65914c926b61f6047b389847e53794e do_install() { vbin bin/_blackbox_common.sh From 6fcb6a0c4c6236a9443cb1742dcfcc89f210e769 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 14 Jun 2018 08:02:41 -0300 Subject: [PATCH 074/759] pkgconf: update to 1.5.1. --- srcpkgs/pkgconf-devel | 1 + srcpkgs/pkgconf/template | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/pkgconf-devel diff --git a/srcpkgs/pkgconf-devel b/srcpkgs/pkgconf-devel new file mode 120000 index 00000000000..243cd47f2e6 --- /dev/null +++ b/srcpkgs/pkgconf-devel @@ -0,0 +1 @@ +pkgconf \ No newline at end of file diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index 6e23ab71459..9e25051fa2b 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,6 +1,6 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.4.2 +version=1.5.1 revision=1 conflicts="pkg-config" build_style=gnu-configure @@ -9,10 +9,24 @@ checkdepends="kyua" short_desc="Provides compiler and linker configuration" maintainer="Enno Boland " license="MIT" -homepage="https://github.com/pkgconf/pkgconf" -distfiles="https://distfiles.dereferenced.org/pkgconf/$pkgname-$version.tar.xz" -checksum=bab39371d4ab972be1d539a8b10b6cc21f8eafc97f617102e667e82bd32eb234 +homepage="https://git.dereferenced.org/pkgconf/pkgconf" +changelog="https://git.dereferenced.org/pkgconf/pkgconf/raw/branch/master/NEWS" +distfiles="https://distfiles.dereferenced.org/pkgconf/${pkgname}-${version}.tar.xz" +checksum=d6877d721f84b59f137da48b237f16e68b598f5afc4f2a04d0a5c9e7e2bf5462 post_install() { vlicense COPYING } + +pkgconf-devel_package() { + depends="pkgconf-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + vmove usr/share/man/man7 + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + } +} From 92cd54428f2f9b6643c917cd82d80320783d1681 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 20 Jun 2018 06:08:28 -0300 Subject: [PATCH 075/759] rspamd: update to 1.7.6. --- srcpkgs/rspamd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index d2aa8431bc8..eef6d7a6dee 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,6 +1,6 @@ # Template file for 'rspamd' pkgname=rspamd -version=1.7.5 +version=1.7.6 revision=1 build_style=cmake configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd @@ -11,11 +11,11 @@ makedepends="LuaJIT-devel fann-devel file-devel gd-devel gmime-devel short_desc="Fast, free and open-source spam filtering system" maintainer="Enno Boland " license="Apache-2.0" -homepage="http://rspamd.com/" +homepage="https://rspamd.com/" distfiles="https://github.com/vstakhov/rspamd/archive/${version}.tar.gz" -checksum=5aa2ff72cc74ea1fd220cd3a941745268666465be712c4d014a9fc937b7b1f5f +checksum=297fb8564de212b27e1da683a839cd833c26fc802de66bc676ddf1b92df6d88e system_accounts="rspamd" -rspamd_homedir="/var/lib/rspamd" +rspamd_homedir=/var/lib/rspamd conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" case "$XBPS_TARGET_MACHINE" in From e66d5a0de3f94b2cfcf4633b5f4a119c898ce939 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 21 Jun 2018 10:42:16 -0300 Subject: [PATCH 076/759] New package: python-httmock-1.2.6. --- srcpkgs/python-httmock/template | 31 +++++++++++++++++++++++++++++++ srcpkgs/python3-httmock | 1 + 2 files changed, 32 insertions(+) create mode 100644 srcpkgs/python-httmock/template create mode 120000 srcpkgs/python3-httmock diff --git a/srcpkgs/python-httmock/template b/srcpkgs/python-httmock/template new file mode 100644 index 00000000000..d1eaec60d50 --- /dev/null +++ b/srcpkgs/python-httmock/template @@ -0,0 +1,31 @@ +# Template file for 'python-httmock' +pkgname=python-httmock +version=1.2.6 +revision=1 +noarch=yes +wrksrc="httmock-${version}" +build_style=python-module +pycompile_module="httmock.py" +hostmakedepends="python3-setuptools python-setuptools" +depends="python-requests" +checkdepends="python3-requests" +short_desc="Mocking library for requests (Python2)" +maintainer="maxice8 " +license="Apache-2.0" +homepage="https://github.com/patrys/httmock" +distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz" +checksum=0a5646eff603c58f3cf2d619f5ec1c760cafe5c6049e28f8b8189ba23da4b31f + +do_check() { + python3 setup.py test +} + +python3-httmock_package() { + noarch=yes + pycompile_module="httmock.py" + depends="python3-requests" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python3-httmock b/srcpkgs/python3-httmock new file mode 120000 index 00000000000..cb20ded1289 --- /dev/null +++ b/srcpkgs/python3-httmock @@ -0,0 +1 @@ +python-httmock \ No newline at end of file From a56bd351923cb9c07326e0efe5d48cff589d25f6 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 21 Jun 2018 10:42:21 -0300 Subject: [PATCH 077/759] python-gitlab: update to 1.4.0. --- srcpkgs/python-gitlab/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template index fe3c1887bc6..707555efcf8 100644 --- a/srcpkgs/python-gitlab/template +++ b/srcpkgs/python-gitlab/template @@ -1,20 +1,26 @@ # Template file for 'python-gitlab' pkgname=python-gitlab -version=1.3.0 +version=1.4.0 revision=1 noarch=yes build_style=python-module pycompile_module="gitlab" hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools python-requests python-six" +checkdepends="${depends} python-httmock python-mock" short_desc="Wrapper for GitLab's API (Python2)" maintainer="Joseph LaFreniere " -homepage="https://github.com/gpocentek/python-gitlab" license="LGPL-3.0-or-later" +homepage="https://github.com/gpocentek/python-gitlab" +changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst" distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz" -checksum=74ef4e98383043403d786d1719579b9a638666809b47d93a9fa8f0bd9f12ab84 +checksum=34a5eb1704e68a23bafb9b122c456ff72b3e1a2d3bdcd44346bbde6a5d7af511 alternatives="python-gitlab:gitlab:/usr/bin/gitlab2" +do_check() { + python setup.py test +} + python3-gitlab_package() { noarch=yes depends="python3-setuptools python3-requests python3-six" From 6ede35f8434afc0e1053d91e8ab14ad8b7e2d2f5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 22 Jun 2018 13:27:43 -0300 Subject: [PATCH 078/759] ansi: update to 1.1.0. --- srcpkgs/ansi/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ansi/template b/srcpkgs/ansi/template index 5bd014e7ddf..844147a75e3 100644 --- a/srcpkgs/ansi/template +++ b/srcpkgs/ansi/template @@ -1,15 +1,16 @@ # Template file for 'ansi' pkgname=ansi -version=1.0.0 +version=1.1.0 revision=1 +noarch=yes depends="bash" short_desc="ANSI escape codes in pure Bash" maintainer="maxice8 " license="MIT" homepage="https://github.com/fidian/ansi" +changelog="https://raw.githubusercontent.com/fidian/ansi/master/CHANGELOG.md" distfiles="https://github.com/fidian/ansi/archive/${version}.tar.gz" -checksum=753c982458b43381eb918b3eeb55689874797b3aaba48cf66b347a67f665d210 -noarch=yes +checksum=0930acff725a505e430c68784e12731e8329998d60efcd759a7ff52e6baac959 do_install() { vbin ansi From 3d44ec786c3798d884dd31bc1fb019c3e6a39fb9 Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Sat, 23 Jun 2018 12:13:54 +0200 Subject: [PATCH 079/759] rclone: update to 1.42. (#331) --- srcpkgs/rclone/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template index bae660d84d2..e7a66554edd 100644 --- a/srcpkgs/rclone/template +++ b/srcpkgs/rclone/template @@ -1,7 +1,7 @@ # Template file for 'rclone' pkgname=rclone -version=1.41 -revision=2 +version=1.42 +revision=1 build_style=go go_import_path="github.com/ncw/rclone" short_desc="A rsync for cloud storage" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://rclone.org/downloads/" distfiles="https://github.com/ncw/rclone/archive/v${version}.tar.gz" -checksum=4f4cadb4db3a7daff7fa6539eb45273fad5203a0cc9c3a2bd8c2bdb8b349d872 +checksum=fa84044fd387b7366de1234fba073dacd0fd7015b36751f3ec18514b704a2fd6 post_install() { vlicense COPYING From d7b682d967a72a6dc3826e83a8b70ba49313bad1 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 18 Feb 2018 01:54:02 +0100 Subject: [PATCH 080/759] New package: deepin-calculator-1.0.4 --- srcpkgs/deepin-calculator/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/deepin-calculator/template diff --git a/srcpkgs/deepin-calculator/template b/srcpkgs/deepin-calculator/template new file mode 100644 index 00000000000..40d96abfdb7 --- /dev/null +++ b/srcpkgs/deepin-calculator/template @@ -0,0 +1,19 @@ +# Template file for 'deepin-calculator' +pkgname=deepin-calculator +version=1.0.4 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config qt5-host-tools" +makedepends="dtkwidget-devel qt5-svg-devel" +depends="qt5integration" +short_desc="Easy to use Calculator for Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-calculator" +changelog="https://github.com/linuxdeepin/deepin-calculator/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-calculator/archive/${version}.tar.gz" +checksum=732dc5daa6b35a09d13be05649b6a21e44e42d864869da168f1ca98ce166c9bd + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel" +fi From 3869edbde8ae03f8f556fe29fcb15a684fa0d6af Mon Sep 17 00:00:00 2001 From: John Date: Wed, 21 Feb 2018 15:18:08 +0100 Subject: [PATCH 081/759] New package: deepin-terminal-3.0.0. --- srcpkgs/deepin-terminal/patches/glib.patch | 11 ++++ srcpkgs/deepin-terminal/patches/musl.patch | 10 ++++ .../patches/remove-vendor.patch | 52 +++++++++++++++++++ srcpkgs/deepin-terminal/template | 18 +++++++ 4 files changed, 91 insertions(+) create mode 100644 srcpkgs/deepin-terminal/patches/glib.patch create mode 100644 srcpkgs/deepin-terminal/patches/musl.patch create mode 100644 srcpkgs/deepin-terminal/patches/remove-vendor.patch create mode 100644 srcpkgs/deepin-terminal/template diff --git a/srcpkgs/deepin-terminal/patches/glib.patch b/srcpkgs/deepin-terminal/patches/glib.patch new file mode 100644 index 00000000000..142ff0b0992 --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/glib.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt 2018-05-24 16:03:56.376621081 +0200 ++++ - 2018-05-24 16:07:49.217575585 +0200 +@@ -10,7 +10,7 @@ + find_package(Vala) + ensure_vala_version("0.22.0" MINIMUM) + find_package(PkgConfig) +-find_package(GLib "2.48" REQUIRED) ++find_package(GLib REQUIRED) + find_package(JsonGlib) + find_package(Libsecret) + find_package(FontConfig) diff --git a/srcpkgs/deepin-terminal/patches/musl.patch b/srcpkgs/deepin-terminal/patches/musl.patch new file mode 100644 index 00000000000..4576a2ad6b9 --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/musl.patch @@ -0,0 +1,10 @@ +--- 3rdparty/zssh-1.5c/openpty.c 2018-05-14 05:47:46.000000000 +0200 ++++ - 2018-05-24 15:26:26.729972575 +0200 +@@ -9,6 +9,7 @@ + */ + + #include "zssh.h" ++#include + + #define GL_SLAVENAMELEN 50 + static char gl_slavename[GL_SLAVENAMELEN + 1] = {0}; diff --git a/srcpkgs/deepin-terminal/patches/remove-vendor.patch b/srcpkgs/deepin-terminal/patches/remove-vendor.patch new file mode 100644 index 00000000000..8aa78a3eb5b --- /dev/null +++ b/srcpkgs/deepin-terminal/patches/remove-vendor.patch @@ -0,0 +1,52 @@ +--- masterdir/builddir/deepin-terminal-3.0.0/CMakeLists.txt 2018-05-14 05:47:46.000000000 +0200 ++++ CMakeLists.txt 2018-05-24 15:11:43.457568178 +0200 +@@ -24,6 +24,7 @@ + pkg_check_modules(WNCK REQUIRED libwnck-3.0) + pkg_check_modules(FONTCONFIG REQUIRED fontconfig) + pkg_check_modules(GLIB REQUIRED glib-2.0) ++pkg_check_modules(VTE REQUIRED vte-2.91) + + OPTION(TEST_BUILD "Build with native testing" ON) + +@@ -44,14 +45,6 @@ + ) + endif() + +-ExternalProject_Add(Vte-0.29 +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1 +- CONFIGURE_COMMAND ./configure --enable-static +- BUILD_COMMAND make +- INSTALL_COMMAND "" +- BUILD_IN_SOURCE 1 +- ) +- + ExternalProject_Add(zssh-1.5c + SOURCE_DIR ${CMAKE_SOURCE_DIR}/3rdparty/zssh-1.5c + CONFIGURE_COMMAND ./configure +@@ -79,7 +72,7 @@ + ${RSVG_INCLUDE_DIRS} + ${JsonGlib_INCLUDE_DIRS} + ${LIBSECRET_INCLUDE_DIRS} +- ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src ++ ${VTE_INCLUDE_DIRS} + ) + find_library(VTE_LIB NAMES libvte-2.91.a tcmalloc_minimal) + include_directories(${INCLUDE_PATHS}) +@@ -96,6 +89,7 @@ + ${XTST_LIBRARIES} + ${FONTCONFIG_LIBRARY} + ${M_LIBRARIES} ++ ${VTE_LIBRARIES} + stdc++ + m + z +@@ -137,8 +131,7 @@ + librsvg-2.0 + ) + add_executable(${target} ${VALA_C} ${CMAKE_SOURCE_DIR}/project_path.c ${CMAKE_SOURCE_DIR}/lib/font.c) +-target_link_libraries(${target} ${LIBS} ${CMAKE_SOURCE_DIR}/3rdparty/vte-0.50.1/src/.libs/libvte-2.91.a) +-add_dependencies(${target} Vte-0.29) ++target_link_libraries(${target} ${LIBS}) + + FILE(GLOB children LIST_DIRECTORIES true po/*) + SET(dirlist "") diff --git a/srcpkgs/deepin-terminal/template b/srcpkgs/deepin-terminal/template new file mode 100644 index 00000000000..c9e7ba73601 --- /dev/null +++ b/srcpkgs/deepin-terminal/template @@ -0,0 +1,18 @@ +# Template file for 'deepin-terminal' +pkgname=deepin-terminal +version=3.0.0 +revision=1 +build_style=cmake +configure_args="-DTEST_BUILD=OFF" +hostmakedepends="glib-devel gobject-introspection gperf intltool pkg-config + vala" +makedepends="json-glib-devel libgee08-devel librsvg-devel libsecret-devel + libwnck-devel vala-devel vte3-devel glib-devel gdk-pixbuf-devel" +depends="deepin-menu expect" +short_desc="Deepin Terminal" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-terminal" +distfiles="https://github.com/linuxdeepin/deepin-terminal/archive/${version}.tar.gz" +checksum=a01b2a8679523916586eff30ea4768ee6f1e2094826513971d2ef00db0471460 +nocross=yes From 757415a2ab8fd9bc9524164782f0463dfec646ef Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 Jun 2018 15:31:39 +0000 Subject: [PATCH 082/759] librsvg: enable vala bindings --- srcpkgs/librsvg/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index a765f67177a..dff5fb1b476 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,11 +1,11 @@ # Template build file for 'librsvg'. pkgname=librsvg version=2.40.20 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--disable-static $(vopt_enable gir introspection)" +configure_args="--disable-static $(vopt_enable gir introspection) $(vopt_enable vala)" hostmakedepends="automake libtool pkg-config intltool python glib-devel - gdk-pixbuf-devel gobject-introspection" + gdk-pixbuf-devel gobject-introspection $(vopt_if vala vala-devel)" makedepends="libcroco-devel pango-devel gdk-pixbuf-devel" triggers="gtk-pixbuf-loaders" short_desc="SVG library for GNOME" @@ -16,11 +16,11 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b # Package build options -build_options="gir" +build_options="gir vala" # Disable gir for cross builds. if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" + build_options_default="vala gir" fi pre_configure() { @@ -43,6 +43,9 @@ librsvg-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi + if [ "$build_options_vala" ]; then + vmove usr/share/vala + fi } } librsvg-utils_package() { From 7707c6c50754268d3b8449ddfdced8c56e01a465 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 18 Feb 2018 02:07:14 +0100 Subject: [PATCH 083/759] New package: deepin-editor-0.0.5 --- srcpkgs/deepin-editor/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/deepin-editor/template diff --git a/srcpkgs/deepin-editor/template b/srcpkgs/deepin-editor/template new file mode 100644 index 00000000000..6fa65d8f728 --- /dev/null +++ b/srcpkgs/deepin-editor/template @@ -0,0 +1,22 @@ +# Template file for 'deepin-editor' +pkgname=deepin-editor +version=0.0.5 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="dtkwidget-devel dtkwm-devel libxcb-devel kcodecs-devel + xcb-util-devel qt5-svg-devel qt5-x11extras-devel libXtst-devel + syntax-highlighting-devel polkit-qt5-devel" +depends="qt5integration" +short_desc="Simple editor for Deepin" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-editor" +changelog="https://github.com/linuxdeepin/deepin-editor/blob/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-editor/archive/${version}.tar.gz" +checksum=3518e669b7203073fdc65e70cd68a8f0662a962d3bca5f72d42317961f6f45ec + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel qt5-x11extras-devel kcodecs-devel + syntax-highlighting-devel" +fi From 129bc4f98c79e0ae3130fc0bf6fa664bee96db56 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 Jun 2018 15:48:51 +0000 Subject: [PATCH 084/759] dtkwidget: add patches for deepin-editor --- srcpkgs/dtkwidget/patches/01.patch | 323 +++++++++++++++++++++++++++++ srcpkgs/dtkwidget/patches/02.patch | 35 ++++ srcpkgs/dtkwidget/patches/03.patch | 13 ++ srcpkgs/dtkwidget/template | 2 +- 4 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dtkwidget/patches/01.patch create mode 100644 srcpkgs/dtkwidget/patches/02.patch create mode 100644 srcpkgs/dtkwidget/patches/03.patch diff --git a/srcpkgs/dtkwidget/patches/01.patch b/srcpkgs/dtkwidget/patches/01.patch new file mode 100644 index 00000000000..d8d0398367f --- /dev/null +++ b/srcpkgs/dtkwidget/patches/01.patch @@ -0,0 +1,323 @@ +diff --git a/debian/libdtkwidget2.symbols debian/libdtkwidget2.symbols +index b801671..fbd6bca 100644 +--- a/debian/libdtkwidget2.symbols ++++ debian/libdtkwidget2.symbols +@@ -1373,12 +1373,10 @@ libdtkwidget.so.2 libdtkwidget2 #MINVER# + _ZN3Dtk6Widget14DTabBarPrivate11makeVisibleEi@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate11qt_metacastEPKc@Base 2.0.7.2 +- _ZN3Dtk6Widget14DTabBarPrivate11resizeEventEP12QResizeEvent@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate11tabInsertedEi@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate13dragMoveEventEP14QDragMoveEvent@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate13layoutWidgetsEi@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate13startTabFlashEv@Base 2.0.7.2 +- _ZN3Dtk6Widget14DTabBarPrivate13updateTabSizeEv@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate14autoScrollTabsERK6QPoint@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate14dragEnterEventEP15QDragEnterEvent@Base 2.0.7.2 + _ZN3Dtk6Widget14DTabBarPrivate14dragLeaveEventEP15QDragLeaveEvent@Base 2.0.7.2 +@@ -3721,7 +3719,6 @@ libdtkwidget.so.2 libdtkwidget2 #MINVER# + _ZNK3Dtk6Widget14DTabBarPrivate11tabSizeHintEi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DTabBarPrivate15initStyleOptionEP15QStyleOptionTabi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DTabBarPrivate15minimumSizeHintEv@Base 2.0.7.2 +- _ZNK3Dtk6Widget14DTabBarPrivate18maximumTabSizeHintEi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DTabBarPrivate18minimumTabSizeHintEi@Base 2.0.7.2 + _ZNK3Dtk6Widget14DWaterProgress10metaObjectEv@Base 2.0.7.2 + _ZNK3Dtk6Widget14DWaterProgress5valueEv@Base 2.0.7.2 +diff --git a/src/widgets/dtabbar.cpp src/widgets/dtabbar.cpp +index 28ff328..7d1173b 100644 +--- a/src/widgets/dtabbar.cpp ++++ src/widgets/dtabbar.cpp +@@ -24,7 +24,6 @@ + #include "dthememanager.h" + + #include +-#include + #include + #include + #include +@@ -44,6 +43,8 @@ + #undef private + #undef protected + ++#include "dapplication.h" ++ + DWIDGET_BEGIN_NAMESPACE + + inline static bool verticalTabs(QTabBar::Shape shape) +@@ -230,11 +231,9 @@ class DTabBarPrivate : public QTabBar, public DObjectPrivate + void dragMoveEvent(QDragMoveEvent *e) override; + void dropEvent(QDropEvent *e) override; + void showEvent(QShowEvent *e) override; +- void resizeEvent(QResizeEvent *e) override; + + QSize tabSizeHint(int index) const override; + QSize minimumTabSizeHint(int index) const override; +- virtual QSize maximumTabSizeHint(int index) const; + + void tabInserted(int index) override; + void tabRemoved(int index) override; +@@ -258,7 +257,6 @@ class DTabBarPrivate : public QTabBar, public DObjectPrivate + void stopAutoScrollTabs(); + void ensureScrollTabsAnimation(); + +- void updateTabSize(); + void startTabFlash(); + + void setDragingFromOther(bool v); +@@ -737,28 +735,6 @@ void DTabBarPrivate::ensureScrollTabsAnimation() + }); + } + +-void DTabBarPrivate::updateTabSize() +-{ +- QTabBarPrivate *d = reinterpret_cast(qGetPtrHelper(d_ptr)); +- +- bool is_vertical = verticalTabs(d->shape); +- +- for (int i = 0; i < d->tabList.count(); ++i) { +- QTabBarPrivate::Tab &tab = d->tabList[i]; +- const QSize &size_hint = tabSizeHint(i); +- const QSize old_size = tab.rect.size(); +- +- if (is_vertical) { +- tab.rect.setWidth(qMax(size_hint.width(), width())); +- } else { +- tab.rect.setHeight(qMax(size_hint.height(), height())); +- } +- +- if (tab.rect.size() != old_size) +- layoutTab(i); +- } +-} +- + void DTabBarPrivate::startTabFlash() + { + QVariantAnimation *animation = new QVariantAnimation(this); +@@ -1202,27 +1178,27 @@ void DTabBarPrivate::showEvent(QShowEvent *e) + QTabBar::showEvent(e); + } + +-void DTabBarPrivate::resizeEvent(QResizeEvent *e) ++QSize DTabBarPrivate::tabSizeHint(int index) const + { +- updateTabSize(); ++ D_QC(DTabBar); ++ ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ return q->tabSizeHint(index); + +- QTabBar::resizeEvent(e); ++ return q->DTabBar::tabSizeHint(index); + } + +-QSize DTabBarPrivate::tabSizeHint(int index) const ++QSize DTabBarPrivate::minimumTabSizeHint(int index) const + { + D_QC(DTabBar); + +- QSize size = QTabBar::tabSizeHint(index); +- +- if (index >= tabMaximumSize.count()) +- return size; ++ const QSize &min = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? q->minimumTabSizeHint(index) : q->DTabBar::minimumTabSizeHint(index); + +- const QSize &min = tabMinimumSize.at(index); +- const QSize &max = tabMaximumSize.at(index); ++ if (min.isValid()) ++ return min; + +- size.setWidth(qMax(size.width(), min.width())); +- size.setHeight(qMax(size.height(), min.height())); ++ QSize size = QTabBar::tabSizeHint(index); ++ const QSize &max = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? q->maximumTabSizeHint(index) : q->DTabBar::maximumTabSizeHint(index); + + if (max.isValid()) { + size.setWidth(qMin(size.width(), max.width())); +@@ -1232,47 +1208,34 @@ QSize DTabBarPrivate::tabSizeHint(int index) const + return size; + } + +-QSize DTabBarPrivate::minimumTabSizeHint(int index) const +-{ +- const QSize &min = tabMinimumSize.value(index); +- +- if (min.isValid()) +- return min; +- +- return QTabBar::minimumTabSizeHint(index); +-} +- +-QSize DTabBarPrivate::maximumTabSizeHint(int index) const +-{ +- const QSize &max = tabMaximumSize.value(index); +- +- if (max.isValid()) +- return max; +- +- return QTabBar::tabSizeHint(index); +-} +- + void DTabBarPrivate::tabInserted(int index) + { +- tabMaximumSize.insert(index, QSize()); +- tabMinimumSize.insert(index, QSize()); ++ D_Q(DTabBar); + +- QTabBar::tabInserted(index); ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ q->tabInserted(index); ++ else ++ q->DTabBar::tabInserted(index); + } + + void DTabBarPrivate::tabRemoved(int index) + { +- tabMaximumSize.removeAt(index); +- tabMinimumSize.removeAt(index); ++ D_Q(DTabBar); + +- QTabBar::tabInserted(index); ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ q->tabRemoved(index); ++ else ++ q->DTabBar::tabRemoved(index); + } + + void DTabBarPrivate::tabLayoutChange() + { +- updateTabSize(); ++ D_Q(DTabBar); + +- QTabBar::tabLayoutChange(); ++ if (qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1)) ++ q->tabLayoutChange(); ++ else ++ q->DTabBar::tabLayoutChange(); + } + + void DTabBarPrivate::initStyleOption(QStyleOptionTab *option, int tabIndex) const +@@ -1296,14 +1259,28 @@ void DTabBar::setTabMinimumSize(int index, const QSize &size) + { + D_D(DTabBar); + ++ if (d->tabMinimumSize.at(index) == size) ++ return; ++ + d->tabMinimumSize[index] = size; ++ ++ QTabBarPrivate *dd = reinterpret_cast(qGetPtrHelper(d->d_ptr)); ++ ++ dd->layoutDirty = true; + } + + void DTabBar::setTabMaximumSize(int index, const QSize &size) + { + D_D(DTabBar); + ++ if (d->tabMaximumSize.at(index) == size) ++ return; ++ + d->tabMaximumSize[index] = size; ++ ++ QTabBarPrivate *dd = reinterpret_cast(qGetPtrHelper(d->d_ptr)); ++ ++ dd->layoutDirty = true; + } + + bool DTabBar::visibleAddButton() const +@@ -1865,6 +1842,76 @@ void DTabBar::insertFromMimeDataOnDragEnter(int index, const QMimeData *source) + startTabFlash(insertTab(index, source->text())); + } + ++void DTabBar::tabInserted(int index) ++{ ++ D_D(DTabBar); ++ ++ d->tabMaximumSize.insert(index, QSize()); ++ d->tabMinimumSize.insert(index, QSize()); ++ ++ d->QTabBar::tabInserted(index); ++} ++ ++void DTabBar::tabLayoutChange() ++{ ++ D_D(DTabBar); ++ ++ d->QTabBar::tabLayoutChange(); ++} ++ ++void DTabBar::tabRemoved(int index) ++{ ++ D_D(DTabBar); ++ ++ d->tabMaximumSize.removeAt(index); ++ d->tabMinimumSize.removeAt(index); ++ ++ d->QTabBar::tabRemoved(index); ++} ++ ++QSize DTabBar::tabSizeHint(int index) const ++{ ++ D_DC(DTabBar); ++ ++ QSize size = d->QTabBar::tabSizeHint(index); ++ ++ QTabBarPrivate *dd = reinterpret_cast(qGetPtrHelper(d->d_ptr)); ++ bool is_vertical = verticalTabs(dd->shape); ++ ++ if (is_vertical) { ++ size.setWidth(qMax(size.width(), d->width())); ++ } else { ++ size.setHeight(qMax(size.height(), d->height())); ++ } ++ ++ const QSize &min = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? minimumTabSizeHint(index) : DTabBar::minimumTabSizeHint(index); ++ const QSize &max = qApp->buildDtkVersion() > DTK_VERSION_CHECK(2, 0, 8, 1) ? maximumTabSizeHint(index) : DTabBar::maximumTabSizeHint(index); ++ ++ size.setWidth(qMax(size.width(), min.width())); ++ size.setHeight(qMax(size.height(), min.height())); ++ ++ if (max.isValid()) { ++ size.setWidth(qMin(size.width(), max.width())); ++ size.setHeight(qMin(size.height(), max.height())); ++ } ++ ++ return size; ++} ++ ++QSize DTabBar::minimumTabSizeHint(int index) const ++{ ++ D_DC(DTabBar); ++ ++ return d->tabMinimumSize.value(index); ++} ++ ++QSize DTabBar::maximumTabSizeHint(int index) const ++{ ++ D_DC(DTabBar); ++ ++ return d->tabMaximumSize.value(index); ++} ++ + DTabBarPrivate *DTabBar::d_func() + { + return dynamic_cast(d_d_ptr.data()); +diff --git a/src/widgets/dtabbar.h src/widgets/dtabbar.h +index 16b71f1..aca8eb8 100644 +--- a/src/widgets/dtabbar.h ++++ src/widgets/dtabbar.h +@@ -195,6 +195,14 @@ public Q_SLOTS: + virtual void insertFromMimeData(int index, const QMimeData *source); + virtual void insertFromMimeDataOnDragEnter(int index, const QMimeData *source); + ++ virtual void tabInserted(int index); ++ virtual void tabLayoutChange(); ++ virtual void tabRemoved(int index); ++ ++ virtual QSize tabSizeHint(int index) const; ++ virtual QSize minimumTabSizeHint(int index) const; ++ virtual QSize maximumTabSizeHint(int index) const; ++ + private: + DTabBarPrivate* d_func(); + const DTabBarPrivate* d_func() const; diff --git a/srcpkgs/dtkwidget/patches/02.patch b/srcpkgs/dtkwidget/patches/02.patch new file mode 100644 index 00000000000..f43993e0545 --- /dev/null +++ b/srcpkgs/dtkwidget/patches/02.patch @@ -0,0 +1,35 @@ +diff --git a/src/widgets/dtabbar.cpp src/widgets/dtabbar.cpp +index 7d1173b..d034c69 100644 +--- a/src/widgets/dtabbar.cpp ++++ src/widgets/dtabbar.cpp +@@ -1850,6 +1850,8 @@ void DTabBar::tabInserted(int index) + d->tabMinimumSize.insert(index, QSize()); + + d->QTabBar::tabInserted(index); ++ ++ Q_EMIT tabIsInserted(index); + } + + void DTabBar::tabLayoutChange() +@@ -1867,6 +1869,8 @@ void DTabBar::tabRemoved(int index) + d->tabMinimumSize.removeAt(index); + + d->QTabBar::tabRemoved(index); ++ ++ Q_EMIT tabIsRemoved(index); + } + + QSize DTabBar::tabSizeHint(int index) const +diff --git a/src/widgets/dtabbar.h src/widgets/dtabbar.h +index aca8eb8..f560ede 100644 +--- a/src/widgets/dtabbar.h ++++ src/widgets/dtabbar.h +@@ -158,6 +158,8 @@ class DTabBar : public QWidget, public DObject + void currentChanged(int index); + void tabCloseRequested(int index); + void tabMoved(int from, int to); ++ void tabIsInserted(int index); ++ void tabIsRemoved(int index); + void tabBarClicked(int index); + void tabBarDoubleClicked(int index); + void tabAddRequested(); diff --git a/srcpkgs/dtkwidget/patches/03.patch b/srcpkgs/dtkwidget/patches/03.patch new file mode 100644 index 00000000000..c7efcfaef58 --- /dev/null +++ b/srcpkgs/dtkwidget/patches/03.patch @@ -0,0 +1,13 @@ +diff --git a/src/widgets/dtabbar.cpp src/widgets/dtabbar.cpp +index d034c69..479bb39 100644 +--- a/src/widgets/dtabbar.cpp ++++ src/widgets/dtabbar.cpp +@@ -1757,6 +1757,8 @@ void DTabBar::dropEvent(QDropEvent *e) + Q_UNUSED(blocker) + d->removeTab(d->ghostTabIndex); + } ++ Q_EMIT tabIsRemoved(d->ghostTabIndex); ++ + insertFromMimeData(d->ghostTabIndex, e->mimeData()); + d->ghostTabIndex = -1; + } else { diff --git a/srcpkgs/dtkwidget/template b/srcpkgs/dtkwidget/template index 653dfe59469..483efbf4719 100644 --- a/srcpkgs/dtkwidget/template +++ b/srcpkgs/dtkwidget/template @@ -1,7 +1,7 @@ # Template file for 'dtkwidget' pkgname=dtkwidget version=2.0.8.1 -revision=1 +revision=2 build_style=qmake configure_args="DBUS_VERSION_0_4_2=YES LIB_INSTALL_DIR=/usr/lib" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" From 899da388313dfa61ef9b907366b5ce03f04278a1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 07:37:02 -0300 Subject: [PATCH 085/759] iperf3: update to 3.6. --- srcpkgs/iperf3/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template index a8605323c71..6d73e2cbbfb 100644 --- a/srcpkgs/iperf3/template +++ b/srcpkgs/iperf3/template @@ -1,17 +1,18 @@ # Template file for 'iperf3' pkgname=iperf3 -version=3.5 +version=3.6 revision=1 wrksrc="iperf-${version}" build_style=gnu-configure -CFLAGS="-D_GNU_SOURCE" make_build_args="iperf3_profile_LDFLAGS= iperf3_profile_CFLAGS=" short_desc="Active measurements of the maximum achievable bandwidth on IP networks" -maintainer="Leah Neukirchen " -license="3-clause-BSD" +maintainer="maxice8 " +license="BSD-3-Clause" homepage="http://software.es.net/iperf/" distfiles="http://downloads.es.net/pub/iperf/iperf-${version}.tar.gz" -checksum=539bd9ecdca1b8c1157ff85b70ed09b3c75242e69886fc16b54883b399f72cd5 +checksum=de5d51e46dc460cc590fb4d44f95e7cad54b74fea1eba7d6ebd6f8887d75946e + +CFLAGS="-D_GNU_SOURCE" post_extract() { sed -i '1i#include ' src/timer.h From 87779af6c89d19750817d67ffe56718e82d52b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 23 Jun 2018 16:28:04 +0200 Subject: [PATCH 086/759] purge-distfiles: grep instead of sourcing template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To catch all SHA256 hashes from a template, even the ones which are used only under certain preconditions, use grep [0-9a-f]{64} to find all hashes in a template. The may be some false positives which does not hurt the intended purpose to purge obsolete distfiles. Signed-off-by: Jürgen Buchmüller --- common/xbps-src/shutils/purge_distfiles.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/xbps-src/shutils/purge_distfiles.sh b/common/xbps-src/shutils/purge_distfiles.sh index 73df13932bc..1cfaf5bdc0b 100644 --- a/common/xbps-src/shutils/purge_distfiles.sh +++ b/common/xbps-src/shutils/purge_distfiles.sh @@ -4,10 +4,7 @@ purge_distfiles() { - # Ignore msg_error calls when sourcing templates - msg_error() { - : - } + readonly HASHLEN=64 if [ -z "$XBPS_SRCDISTDIR" ]; then msg_error "The variable \$XBPS_SRCDISTDIR is not set." exit 1 @@ -28,8 +25,7 @@ purge_distfiles() { pkg=${template#*/} pkg=${pkg%/*} if [ ! -L "srcpkgs/$pkg" ]; then - unset checksum - source $template 2>/dev/null + checksum="$(grep -Ehrow [0-9a-f]{$HASHLEN} ${template}|sort|uniq)" read -a _my_hashes <<< ${checksum} i=0 while [ -n "${_my_hashes[$i]}" ]; do @@ -77,7 +73,6 @@ purge_distfiles() { echo hashes=($XBPS_SRCDISTDIR/by_sha256/*) - readonly HASHLEN=64 for file in ${hashes[@]}; do hash_distfile=${file##*/} hash=${hash_distfile:0:$HASHLEN} From 29fa461fa4fc6ea753fa7908c3b6e305f946f14c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 23 Jun 2018 16:53:29 +0200 Subject: [PATCH 087/759] firefox: update to 60.0.2. --- srcpkgs/firefox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 1d9d6474a2d..d2c39126d26 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,14 +3,14 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=60.0.1 +version=60.0.2 revision=1 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=c8e621c7dfccbef14cce41a6847b83bee15b5276cd0c35771c3874e464e6a662 +checksum=764566a06b71164e7fd20b2b0e6b08a71b4ccd4d6fd61867eb08011a551f6725 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes From 94019c4cd50210a127a4e66957240035c1d9add4 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sat, 23 Jun 2018 12:55:49 +0200 Subject: [PATCH 088/759] pantheon-screenshot: update to 0.1.5. --- srcpkgs/pantheon-screenshot/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template index 65af66e2d4f..5af1c576784 100644 --- a/srcpkgs/pantheon-screenshot/template +++ b/srcpkgs/pantheon-screenshot/template @@ -1,15 +1,15 @@ # Template file for 'pantheon-screenshot' pkgname=pantheon-screenshot -version=0.1.4 -revision=2 -build_style=cmake -hostmakedepends="intltool pkg-config vala" -makedepends="granite-devel gtk+3-devel libcanberra-devel" -depends="desktop-file-utils hicolor-icon-theme" -maintainer="cr6git " -short_desc="Screenshot tool" -homepage="https://github.com/elementary/screenshot-tool" -license="LGPL-3" -distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz" -checksum=b01ef495818cc026a3eaf5446aac7b7e507a7625ea855c012c8ae4ee5c38a572 +version=0.1.5 +revision=1 wrksrc="screenshot-tool-${version}" +build_style=meson +hostmakedepends="desktop-file-utils intltool pkg-config vala" +makedepends="granite-devel libcanberra-devel" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Screenshot tool" +maintainer="cr6git " +license="LGPL-3.0-only" +homepage="https://github.com/elementary/screenshot-tool" +distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz" +checksum=7b214d7f7ae75902a8dac0ddc692930b1231753ed1e66e26cee0e8b30f8046be From f245dce5069a545e51eb096b7e23e1e5d072dfb0 Mon Sep 17 00:00:00 2001 From: mcz Date: Sat, 23 Jun 2018 14:15:50 +0200 Subject: [PATCH 089/759] geomyidae: update to 0.32. --- srcpkgs/geomyidae/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geomyidae/template b/srcpkgs/geomyidae/template index de423114279..70758a064b3 100644 --- a/srcpkgs/geomyidae/template +++ b/srcpkgs/geomyidae/template @@ -1,6 +1,6 @@ # Template file for 'geomyidae' pkgname=geomyidae -version=0.31.1 +version=0.32 revision=1 build_style=gnu-makefile short_desc="A small C-based gopherd" @@ -8,7 +8,7 @@ maintainer="m-cz " license="MIT" homepage="http://git.r-36.net/geomyidae/" distfiles="http://git.r-36.net/${pkgname}/snapshot/${pkgname}-${version}.tar.gz" -checksum=a3fdb9fcf57066373824924c888ec7b82c3d0a349e6c8db8064ee81698158ecb +checksum=15608abaa8a63655dd6db5cf347a6240c1b49b9e792ef0742b17fd7b963e25e6 pre_build() { sed -i 's| -O0||g' Makefile From 57ce1749ecea2813235b3942dbfccd339cd89809 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 May 2018 01:04:41 +0200 Subject: [PATCH 090/759] New package: deepin-icon-theme-15.12.58 --- srcpkgs/deepin-icon-theme/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/deepin-icon-theme/template diff --git a/srcpkgs/deepin-icon-theme/template b/srcpkgs/deepin-icon-theme/template new file mode 100644 index 00000000000..eb2279f8c87 --- /dev/null +++ b/srcpkgs/deepin-icon-theme/template @@ -0,0 +1,18 @@ +# Template file for 'deepin-icon-theme' +pkgname=deepin-icon-theme +version=15.12.58 +revision=1 +noarch=yes +build_style=gnu-makefile +depends="papirus-icon-theme" +short_desc="Deepin Icon Theme" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-icon-theme" +changelog="https://github.com/linuxdeepin/deepin-icon-theme/blob/master/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-icon-theme/archive/${version}.tar.gz" +checksum=302a1664f059b1cd199c89940dfa2baddae8de8bb5dbdc4111b95710e871e7e6 + +do_build() { + : +} From 3ab277636c1b36f4130aef78c6646eb0942ce0e9 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 07:43:17 -0300 Subject: [PATCH 091/759] python-lxml: update to 4.2.2. --- srcpkgs/python-lxml/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template index c64c98b9d2e..15e713b57ba 100644 --- a/srcpkgs/python-lxml/template +++ b/srcpkgs/python-lxml/template @@ -1,19 +1,19 @@ # Template file for 'python-lxml' pkgname=python-lxml -version=4.2.1 +version=4.2.2 revision=1 wrksrc="lxml-lxml-${version}" build_style=python-module +pycompile_module="lxml" hostmakedepends="libxslt-devel python-Cython python-setuptools python3-Cython python3-setuptools" makedepends="libxslt-devel python-devel python3-devel" checkdepends="python3" -pycompile_module="lxml" short_desc="Python2 binding for the libxml2 and libxslt libraries" maintainer="Juan RP " homepage="http://lxml.de/" license="BSD-3-Clause, ElementTree, GPL-2.0-or-later, ZPL-2.0" # ElementTree isn't SPDX distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=e09b4ae8bdc55bd1983dbacc467ef2da62591faec42e6c8a8864f12c1844028d +checksum=e77a760b5efcc81ddf9dad8b572dcde6d8fbad7307a6d4b8e616fda2293aec6f do_check() { python3 test.py From 8451870afd58340d630a6e8f378771192c0a0527 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 22 Jun 2018 16:00:55 -0300 Subject: [PATCH 092/759] ack: update to 2.24. --- srcpkgs/ack/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/ack/template b/srcpkgs/ack/template index d377254a04c..2140c3677bd 100644 --- a/srcpkgs/ack/template +++ b/srcpkgs/ack/template @@ -1,15 +1,15 @@ # Template file for 'ack' pkgname=ack -version=2.22 +version=2.24 revision=1 noarch=yes build_style=perl-module hostmakedepends="perl-File-Next" -makedepends="${hostmakedepends}" -depends="${makedepends}" +makedepends="$hostmakedepends" +depends="$makedepends" short_desc="Tool like grep, optimized for programmers" maintainer="Jan S. " -homepage="https://beyondgrep.com/" license="Artistic-2.0" +homepage="https://beyondgrep.com/" distfiles="${CPAN_SITE}/App/ack-${version}.tar.gz" -checksum=02c441dbbc86bf69c792ae92dc92419a0448c31f69d9703dd1530425c36e0f6c +checksum=72934009ad8fe712deeb2c41960f2746d0a25e3a226ad7c54232c00105e54f00 From 8ac10e98a5463330948a1f2b3eba32474c6ba9a5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 13:15:50 -0300 Subject: [PATCH 093/759] qpdf: update to 8.1.0. --- srcpkgs/qpdf/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index 51c980e904c..924d52e9e2c 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -1,6 +1,6 @@ # Template file for 'qpdf' pkgname=qpdf -version=8.0.2 +version=8.1.0 revision=1 build_style=gnu-configure hostmakedepends="perl" @@ -9,22 +9,24 @@ short_desc="A Content-Preserving PDF Transformation System" maintainer="Juan RP " license="Apache-2.0" homepage="http://qpdf.sourceforge.net" +changelog="https://raw.githubusercontent.com/qpdf/qpdf/master/ChangeLog" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b09e1730b515956903866619b466da359cc051ae8c9d8690d8e7a2aca493c8c1 +checksum=7d1f4827a3801a4b7d63f66fa50bbe237e74911801f3d31ee9f22f73e36370d4 libqpdf_package() { short_desc+=" - shared library" pkg_install() { - vmove usr/lib/*.so.* + vmove "usr/lib/*.so.*" } } + libqpdf-devel_package() { depends="libqpdf>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } From 1f995902ac79b31e3d7ef9371405f7d10f522d1f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 13:24:08 -0300 Subject: [PATCH 094/759] qutebrowser: update to 1.3.3. --- srcpkgs/qutebrowser/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 265fbb7d618..e18290e307c 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,6 +1,6 @@ # Template file for 'qutebrowser' pkgname=qutebrowser -version=1.3.2 +version=1.3.3 revision=1 noarch=yes build_style=python3-module @@ -13,9 +13,9 @@ short_desc="Keyboard-focused browser with a minimal GUI" maintainer="Eivind Uggedal " license="GPL-3.0-or-later" homepage="https://qutebrowser.org/" -#changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" +changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc" distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=ff4bf5f74e6ba4f76e5bee8ab5c370c0fb8bbd99123592262c09605c5065c27f +checksum=68cab76dbd23ef77c29865a80e3eb508a3b5392e9f190c497f8a93dada5c9906 pre_build() { a2x -f manpage doc/${pkgname}.1.asciidoc From e5495cc44677ac59fa570fe578dbb5e1d7d7d306 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 12:49:17 -0300 Subject: [PATCH 095/759] perl-Test-Warn: update to 0.36. --- srcpkgs/perl-Test-Warn/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Test-Warn/template b/srcpkgs/perl-Test-Warn/template index ef537b542e1..d3e342124b9 100644 --- a/srcpkgs/perl-Test-Warn/template +++ b/srcpkgs/perl-Test-Warn/template @@ -1,6 +1,6 @@ # Template file for 'perl-Test-Warn' pkgname=perl-Test-Warn -version=0.35 +version=0.36 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -9,8 +9,9 @@ hostmakedepends="perl" makedepends="${hostmakedepends} perl-Sub-Uplevel" depends="$makedepends" short_desc="Test::Warn - Perl extension to test methods for warnings" -maintainer="Leah Neukirchen " +maintainer="maxice8 " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-Warn" +changelog="https://fastapi.metacpan.org/source/BIGJ/Test-Warn-${version}/Changes" distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-${version}.tar.gz" -checksum=24e410963cc8a3bf76851f475e322e1d232ea93d73d700f6b9e7888201b354c5 +checksum=ecbca346d379cef8d3c0e4ac0c8eb3b2613d737ffaaeae52271c38d7bf3c6cda From d85d87bee0e20a9f209d65405d293b65b834bfe3 Mon Sep 17 00:00:00 2001 From: travankor Date: Thu, 21 Jun 2018 16:28:53 -0700 Subject: [PATCH 096/759] New package: skanlite-2.1.0.1 --- srcpkgs/skanlite/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/skanlite/template diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template new file mode 100644 index 00000000000..1b8111e21e2 --- /dev/null +++ b/srcpkgs/skanlite/template @@ -0,0 +1,18 @@ +# Template file for 'skanlite' +pkgname=skanlite +version=2.1.0.1 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTING=OFF" +hostmakedepends="extra-cmake-modules" +makedepends="kio-devel libksane-devel" +short_desc="Image Scanning Application" +maintainer="travankor " +license="GPL-2.0-or-later" +homepage="https://www.kde.org/applications/graphics/skanlite" +distfiles="${KDE_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=b4733e55b706eaf749522aa81ec47bfd65a95c2fec994c1c47e0c4b628e70442 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake" +fi \ No newline at end of file From ba3a8d57c5d257d4a605876e580d3fa45ae424c5 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 Jun 2018 23:19:08 +0000 Subject: [PATCH 097/759] common/slibs: remove kde-workspace entries --- common/shlibs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index d5fcbbca1fa..7e5734ef8aa 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1361,12 +1361,6 @@ libakonadiprotocolinternals.so.1 akonadi-1.9.2_1 libqimageblitz.so.4 qimageblitz-0.0.6_1 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1 libkexiv2.so.11 libkexiv2-4.10.4_1 -libkscreensaver.so.5 kde-workspace-4.10.4_1 -libkdecorations.so.4 kde-workspace-4.10.4_1 -libplasmaclock.so.4 kde-workspace-4.10.4_1 -libtaskmanager.so.4 kde-workspace-4.10.4_1 -libkworkspace.so.4 kde-workspace-4.10.4_1 -libprocessui.so.4 kde-workspace-4.10.4_1 libKPimGAPIContacts.so.5 libkgapi-17.12.3_1 libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1 libKPimGAPILatitude.so.5 libkgapi-17.12.3_1 From 104fe76193cc7fb44efd96e72229d556235bbc2e Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Jun 2018 08:03:14 +0200 Subject: [PATCH 098/759] smplayer: update to 18.6.0. --- srcpkgs/smplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index 20460b62386..6b69e315b13 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,6 +1,6 @@ # Template file for 'smplayer' pkgname=smplayer -version=18.5.0 +version=18.6.0 revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel" @@ -11,7 +11,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://www.smplayer.info" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=36a3aeda0f1fcbffdf05039185dd76160551a2905056ef933fd3b772eb47ad3b +checksum=1d5bf4b30f501e38825dccc4b12f5f1379bcdef7d982549da9cc9713a830685d pre_build() { export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ From 2d84e62484a85c1e6a8684906e6fb9e24dd530ee Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 23 Jun 2018 08:31:31 +0200 Subject: [PATCH 099/759] okular: update to 18.04.2. --- srcpkgs/okular/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index 9c02ba1a31f..d00a724250f 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -1,6 +1,6 @@ # Template file for 'okular' pkgname=okular -version=18.04.1 +version=18.04.2 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-only" homepage="http://kde.org/applications/graphics/okular/" distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=0fa82f9a31de184966303395148dd03f627c64be2d5a2eb070bf13c5a95c0e3a +checksum=bf9e4e9ce6cc6f7fae3dfe021ea7954403c7bab77a33434974eb3efe999999c9 libokular_package() { short_desc+=" - runtime library" From d5a8af3766f6b2f455c31d8d34710cee0b181501 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 15:46:51 -0300 Subject: [PATCH 100/759] dialog: update to 1.3.20180621. --- srcpkgs/dialog/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index 7cb81f3703b..2e81206cee6 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -1,19 +1,19 @@ # Template file for 'dialog' pkgname=dialog _distver=1.3 -_date=20171209 -version=${_distver}.${_date} +_date=20180621 +version="${_distver}.${_date}" revision=1 -wrksrc=${pkgname}-${_distver}-${_date} +wrksrc="${pkgname}-${_distver}-${_date}" build_style=gnu-configure configure_args="--with-ncursesw --disable-nls" makedepends="ncurses-devel" short_desc="A tool to display dialog boxes from shell scripts" -maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://invisible-island.net/dialog/" -distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" -checksum=20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6 +maintainer="maxice8 " +license="LGPL-2.1-only" +homepage="https://invisible-island.net/dialog/" +distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" +checksum=4a4859e2b22d24e46c1a529b5a5605b95503aa04da4432f7bbd713e3e867587a post_install() { rm -r ${DESTDIR}/usr/lib From 92702d5bf09aeaf63d4f36ca00ad9f9098f8d276 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 21 Jun 2018 22:46:21 +0000 Subject: [PATCH 101/759] wesnoth: update to 1.14.3. [ci skip] --- srcpkgs/wesnoth/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 95b98b4aad7..2524b1c50b7 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,18 +1,20 @@ # Template file for 'wesnoth' pkgname=wesnoth -version=1.12.6 -revision=4 +version=1.14.3 +revision=1 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config" -makedepends="dbus-devel libgomp-devel fribidi-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_mixer-devel pango-devel libvorbis-devel zlib-devel bzip2-devel boost-devel" +makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel + SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel + zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel" depends="wesnoth-data desktop-file-utils" short_desc="Turn-based fantasy strategy game" maintainer="Philipp Hirsch " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://wesnoth.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=a50f384cead15f68f31cfa1a311e76a12098428702cb674d3521eb169eb92e4e +checksum=e9f17f0245a2b7f63b28d77a1cc8854355768665f5ca93ffd3e7641b0840c418 post_install() { # runit service From 64c5734fcba86e392e2b3834c74ce3a6ac281e14 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 20:13:55 -0300 Subject: [PATCH 102/759] vala: update to 0.40.7. --- srcpkgs/vala/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index e77a90219de..bd6ef73b12a 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,6 +1,6 @@ # Template file for 'vala' pkgname=vala -version=0.40.6 +version=0.40.7 revision=1 build_style=gnu-configure hostmakedepends="flex libxslt pkg-config automake libtool" @@ -10,8 +10,9 @@ short_desc="Compiler for the GObject type system" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://live.gnome.org/Vala" +changelog="https://raw.githubusercontent.com/GNOME/vala/0.40/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=6da450f1a73e0f1e17506e68cce5b9e8996349e576d3f8cb6b0b73ee22e44be2 +checksum=bee662f60ab3a0d5266c1dd66f508cd9ed3254d74622d23c2d6bd94c91990aec pre_configure() { autoreconf -fi From ab7bbf1c8414f0405bc0f1f428ba2692eb4f9fcc Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 20:08:22 -0300 Subject: [PATCH 103/759] toybox: update to 0.7.7. --- srcpkgs/toybox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template index 652015b0e2f..990760f6213 100644 --- a/srcpkgs/toybox/template +++ b/srcpkgs/toybox/template @@ -1,6 +1,6 @@ # Template file for 'toybox' pkgname=toybox -version=0.7.6 +version=0.7.7 revision=1 create_wrksrc=yes short_desc="BSD-licensed alternative to busybox" @@ -8,7 +8,7 @@ maintainer="Steve Prybylski " license="0BSD" homepage="http://www.landley.net/toybox" distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz" -checksum=e2c9643ebc2bcdec4d8f8db25d0b428dbe0928f7b730052dbbd25db47fb9db95 +checksum=ee218ab21c80044c04112ada7f59320062c35909a6e5f850b1318b17988ffba0 post_extract() { mv toybox-${version} toybox From 62242e04ce5cfdc6187134901140b34a8c8052d2 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 01:18:48 -0300 Subject: [PATCH 104/759] bfs: update to 1.2.2. --- srcpkgs/bfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template index 5455c120ae1..3ca7c382d59 100644 --- a/srcpkgs/bfs/template +++ b/srcpkgs/bfs/template @@ -1,6 +1,6 @@ # Template file for 'bfs' pkgname=bfs -version=1.2.1 +version=1.2.2 revision=1 build_style=gnu-makefile short_desc="Breadth-first version of the UNIX find command" @@ -8,7 +8,7 @@ maintainer="maxice8 " license="0BSD" homepage="https://github.com/tavianator/bfs" distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz" -checksum=e3e7fb7d8d7508b0b9e789b32c492d962b5726f9b6b7951cf3359c97d47b2f82 +checksum=60eba3829242317ddb9ffc722ee2af518175c5cc3cfc4bf8a4c8c85c8184c090 post_install() { vlicense COPYING From 028b65a724c07930cafcfcbb2140c710591c2648 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 01:52:53 -0300 Subject: [PATCH 105/759] rakudo: update to 2018.06. --- srcpkgs/rakudo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template index 2425e427f34..06ba38a4f5c 100644 --- a/srcpkgs/rakudo/template +++ b/srcpkgs/rakudo/template @@ -1,6 +1,6 @@ # Template file for 'rakudo' pkgname=rakudo -version=2018.05 +version=2018.06 revision=1 build_style=configure configure_script="perl Configure.pl" @@ -14,6 +14,6 @@ license="Artistic-2.0" homepage="https://rakudo.org" changelog="https://raw.githubusercontent.com/rakudo/rakudo/master/docs/ChangeLog" distfiles="https://github.com/rakudo/rakudo/archive/${version}.tar.gz" -checksum=0adcc61b1117184b23d3f1ec4fd922a6ea1eac922b06c8b7193bfa02a8836f46 +checksum=b93588f38836edabf3ded0842f81e9ab950e4792c7e0b230e800f1bb6ccde8eb nocross=yes make_check_target=test From 578ee8d50beb6cef7486bda3aeece053a13c8427 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 01:53:21 -0300 Subject: [PATCH 106/759] nqp: update to 2018.06. --- srcpkgs/nqp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template index bd236bd0951..308aa6d1898 100644 --- a/srcpkgs/nqp/template +++ b/srcpkgs/nqp/template @@ -1,6 +1,6 @@ # Template file for 'nqp' pkgname=nqp -version=2018.05 +version=2018.06 revision=1 build_style=configure configure_script="perl Configure.pl" @@ -13,6 +13,6 @@ maintainer="Ruslan " license="Artistic-2.0" homepage="https://github.com/perl6/nqp" distfiles="https://github.com/perl6/nqp/archive/${version}.tar.gz" -checksum=f04ba2d21a66fbdee06809966de6f2596be9dd49164425cfc5ccfcb8993dc50c +checksum=f2c50bef725eddd232f6080c3bb78c6c60751b22300eb6fbfe71a15876f8c4f5 nocross=yes make_check_target=test From a0c4ec33e46b94623f9f8bf8d495f3a61475ae0a Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 24 Jun 2018 08:48:12 +0200 Subject: [PATCH 107/759] cbatticon-gtk3: update to 1.6.8. (#353) --- srcpkgs/cbatticon-gtk3/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cbatticon-gtk3/template b/srcpkgs/cbatticon-gtk3/template index 0fe0bb2f9fc..5aaa5480818 100644 --- a/srcpkgs/cbatticon-gtk3/template +++ b/srcpkgs/cbatticon-gtk3/template @@ -1,17 +1,17 @@ # Template file for 'cbatticon-gtk3' pkgname=cbatticon-gtk3 -version=1.6.7 +version=1.6.8 revision=1 +wrksrc="cbatticon-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" -makedepends="gtk+-devel gtk+3-devel libnotify-devel" -maintainer="cr6git " +makedepends="gtk+-devel libnotify-devel" short_desc="Lightweight and fast battery icon that sits in your systray - GTK3" +maintainer="cr6git " +license="GPL-2.0-only" homepage="https://github.com/valr/cbatticon" -license="GPL-2" distfiles="https://github.com/valr/cbatticon/archive/${version}.tar.gz" -checksum=d0c33320a8e4421ade0f3cfaf3548a6f620ebc275339019cb5ff1ed87c2256e8 -wrksrc="cbatticon-${version}" +checksum=369f3fb20bd97e4aec5acf5915d8a5c9651033fc71b793913fd86f19d5feb4a0 provides="cbatticon-${version}_${revision}" replaces="cbatticon-gtk2>=0" From dc928e77b5784eade6b8d9231ef2a88381f9ee43 Mon Sep 17 00:00:00 2001 From: travankor <38744110+travankor@users.noreply.github.com> Date: Sat, 23 Jun 2018 23:49:44 -0700 Subject: [PATCH 108/759] New package: fonts-droid-ttf-20150613 (#168) --- srcpkgs/fonts-droid-ttf/template | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/fonts-droid-ttf/template diff --git a/srcpkgs/fonts-droid-ttf/template b/srcpkgs/fonts-droid-ttf/template new file mode 100644 index 00000000000..fc477ef68ea --- /dev/null +++ b/srcpkgs/fonts-droid-ttf/template @@ -0,0 +1,24 @@ +# Template file for 'fonts-droid-ttf' +pkgname=fonts-droid-ttf +version=20150613 +revision=1 +noarch=yes +_githash=f5de525ee3547b8a69a21aec1e1a3175bc06f442 +create_wrksrc=yes +depends="font-util" +font_dirs="/usr/share/fonts/TTF" +conflicts="google-fonts-ttf" +short_desc="General-purpose Android fonts (CJK support)" +maintainer="travankor " +license="Apache-2.0" +homepage="http://www.droidfonts.com/droidfonts/" +changelog="https://android.googlesource.com/platform/frameworks/base/+log/master/data/fonts" +distfiles="https://android.googlesource.com/platform/frameworks/base/+archive/${_githash}/data/fonts.tar.gz" +checksum=@722c954d839cc131c17161956c5117624ceeea3f90e01d4d8ad3d38f374000cc + +do_install() { + vmkdir usr/share/fonts/TTF + vinstall DroidSansFallback.ttf 644 usr/share/fonts/TTF + vinstall DroidSansFallbackFull.ttf 644 usr/share/fonts/TTF + vinstall DroidSansMono.ttf 644 usr/share/fonts/TTF +} From 577d70da6c6ba22805f0d545b6b14228c47629fa Mon Sep 17 00:00:00 2001 From: Olga U Date: Sun, 17 Jun 2018 13:18:45 +0700 Subject: [PATCH 109/759] New package: wordwarvi-1.0.2 --- srcpkgs/wordwarvi/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/wordwarvi/template diff --git a/srcpkgs/wordwarvi/template b/srcpkgs/wordwarvi/template new file mode 100644 index 00000000000..440ba61bfe7 --- /dev/null +++ b/srcpkgs/wordwarvi/template @@ -0,0 +1,20 @@ +# Template file for 'wordwarvi' +pkgname=wordwarvi +version=1.0.2 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="portaudio-devel gtk+-devel libvorbis-devel alsa-lib-devel" +short_desc="Word War vi is a side-scrolling shoot 'em up '80s style arcade game" +maintainer="Olga Ustuzhanina " +license="GPL-2.0-or-later" +homepage="https://smcameron.github.io/wordwarvi/" +distfiles="https://github.com/smcameron/wordwarvi/archive/v${version}.tar.gz" +checksum=361d15af6edbe6db032db24de54e8f489a05b230572a8793b9889e2b8308a7ad + +do_install() { + vbin wordwarvi + vmkdir usr/share/wordwarvi/sounds + vcopy sounds/*.ogg usr/share/wordwarvi/sounds + vman wordwarvi.6 +} From 0121723585ca50cd61f092d89b8f8f6d97a8f15b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 20 Jun 2018 01:27:49 -0300 Subject: [PATCH 110/759] ldc: update to 1.10.0. --- common/shlibs | 10 +++++----- srcpkgs/ldc/template | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7e5734ef8aa..d739269f7f5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2019,11 +2019,11 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 liblastfm.so.1 liblastfm-1.0.9_1 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1 -libdruntime-ldc-debug-shared.so.79 ldc-runtime-1.9.0_1 -libdruntime-ldc-shared.so.79 ldc-runtime-1.9.0_1 -libphobos2-ldc-shared.so.79 ldc-runtime-1.9.0_1 -libphobos2-ldc-debug-shared.so.79 ldc-runtime-1.9.0_1 -libldc-jit.so.79 ldc-runtime-1.9.0_1 +libdruntime-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1 +libdruntime-ldc-shared.so.80 ldc-runtime-1.10.0_1 +libphobos2-ldc-shared.so.80 ldc-runtime-1.10.0_1 +libphobos2-ldc-debug-shared.so.80 ldc-runtime-1.10.0_1 +libldc-jit.so.80 ldc-runtime-1.10.0_1 libmarblewidget.so.19 marble-4.14.3_2 libastro.so.1 marble-4.14.3_2 libmarblewidget-qt5.so.28 marble5-17.12.2_1 diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 5fd75c1776d..45a7d1ee852 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,6 +1,6 @@ # Template file for 'ldc' pkgname=ldc -version=1.9.0 +version=1.10.0 revision=1 wrksrc="ldc-${version}-src" build_style=cmake @@ -12,14 +12,15 @@ short_desc="Portable D programming language compiler based on LLVM" maintainer="Juan RP " license="BSD-3-Clause, BSL-1.0" homepage="http://wiki.dlang.org/LDC" +changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=e3f32a4dfcaae12f434e0e23638684faa83765827e7f2deb2df059dccc3169b9 +checksum=99b6e2b8dcaf28a2947318fb25e43fa0b96dd3a6377995146f987c4d17dd8371 conf_files="/etc/ldc2.conf" nopie=yes nocross=yes case "${XBPS_TARGET_MACHINE}" in -*-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9741/steps/shell_3/logs/stdio" ;; + *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9741/steps/shell_3/logs/stdio" ;; esac post_install() { From 15bc25b4562ea60448922c458f8e2c6a59da8bc1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 20 Jun 2018 01:28:06 -0300 Subject: [PATCH 111/759] gtkd: rebuild against ldc-1.10.0 --- srcpkgs/gtkd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template index 5d27d11c7fe..e3145fd5f1a 100644 --- a/srcpkgs/gtkd/template +++ b/srcpkgs/gtkd/template @@ -1,7 +1,7 @@ # Template file for 'gtkd' pkgname=gtkd version=3.8.3 -revision=1 +revision=2 wrksrc="GtkD-${version}" build_style=gnu-makefile hostmakedepends="ldc pkg-config" From 5b3cca8bd04b9cdf0a93b0a1968e6d10dbc0d7bc Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 24 Jun 2018 08:58:21 +0200 Subject: [PATCH 112/759] arpack-ng: update to 3.6.1. (#373) --- srcpkgs/arpack-ng/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template index bea2d38332f..433d9ff474d 100644 --- a/srcpkgs/arpack-ng/template +++ b/srcpkgs/arpack-ng/template @@ -1,6 +1,6 @@ # Template file for 'arpack-ng' pkgname=arpack-ng -version=3.5.0 +version=3.6.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool gcc-fortran" @@ -10,14 +10,13 @@ maintainer="Diogo Leal " license="3-clause-BSD" homepage="https://github.com/opencollab/arpack-ng" distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz" -checksum=50f7a3e3aec2e08e732a487919262238f8504c3ef927246ec3495617dde81239 +checksum=c753f929d3f1092d84bb0883a8ffe2551a8cb94d5ab891e63f596a876e44c351 pre_configure() { - export FFLAGS="-fPIC" ./bootstrap } post_install() { - vlicense COPYING LICENSE + vlicense COPYING } arpack-ng-devel_package() { From 2b5ca8b0aa5ce72264820ecc95c1ff43d2800e48 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 24 Jun 2018 09:32:13 +0200 Subject: [PATCH 113/759] flare-game / flare-engine: update to 1.06. (#374) --- srcpkgs/flare-engine/template | 6 +++--- srcpkgs/flare-game/template | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/flare-engine/template b/srcpkgs/flare-engine/template index c729690d704..e0794d05a99 100644 --- a/srcpkgs/flare-engine/template +++ b/srcpkgs/flare-engine/template @@ -1,6 +1,6 @@ # Template file for 'flare-engine' pkgname=flare-engine -version=1.04 +version=1.06 revision=1 build_style=cmake configure_args="-DBINDIR=/usr/bin -DDATADIR=share/flare" @@ -8,10 +8,10 @@ makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel" depends="flare-engine-data>=${version}_${revision} desktop-file-utils hicolor-icon-theme" short_desc="Free/libre action roleplaying engine (engine only)" maintainer="Diogo Leal " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://flarerpg.org/" distfiles="https://github.com/clintbellanger/flare-engine/archive/v${version}.tar.gz" -checksum=a62384433df872b85315febafdf876faac0fb415c94ed0e919eee04baa811001 +checksum=8cf6f110ca70f911f372120ed3785665213ec9842b8c0291f822ffd57b79bc05 flare-engine-data_package() { short_desc+=" - data" diff --git a/srcpkgs/flare-game/template b/srcpkgs/flare-game/template index 235d125afad..79556e0091e 100644 --- a/srcpkgs/flare-game/template +++ b/srcpkgs/flare-game/template @@ -1,6 +1,6 @@ # Template file for 'flare-game' pkgname=flare-game -version=1.04 +version=1.06 revision=1 noarch=yes build_style=cmake @@ -8,7 +8,11 @@ configure_args="-DDATADIR=share/flare" depends="flare-engine>=${version}" short_desc="Single-player 2D action RPG using the FLARE engine" maintainer="Diogo Leal " -license="GPL-3" +license="GPL-3.0-or-later, CC-BY-SA-3.0" homepage="http://flarerpg.org/" distfiles="https://github.com/clintbellanger/flare-game/archive/v${version}.tar.gz" -checksum=4a4c52d5d6c8c3a1e21e1481ec23f50ec3079c39cff26ea467086baeaf0dd44b +checksum=5eb3d187bde7cd3a16a95ffd311dc05a6d8ff68d3ddbadf2d2fb8243b0145a53 + +post_install() { + vlicense LICENSE.txt +} From f7820b719e3652be5648e291ad62294ad37d3892 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 24 Jun 2018 10:14:44 +0200 Subject: [PATCH 114/759] opera: update to 53.0.2907.99. (#375) --- srcpkgs/opera/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index 257651a22a2..3d10f248a2e 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=53.0.2907.68 +version=53.0.2907.99 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="Proprietary" homepage="https://www.opera.com/computer" distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb" -checksum=f38a9f835e55c088a66f15c1b62a99d235133e905809724df77d502080efea65 +checksum=9dd7d6fe1d0f89616b15275c3fc135b1f380a2cc4d64b66a2e47ec7e0828303a do_extract() { ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-stable_${version}_amd64.deb From 20bea5c3b2d8dbf280e38686ebceeb0ceb5252e8 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 24 Jun 2018 10:17:01 +0200 Subject: [PATCH 115/759] urbanterror: update to 4.3.4. --- srcpkgs/urbanterror/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template index 7857139835a..947a12cf2d8 100644 --- a/srcpkgs/urbanterror/template +++ b/srcpkgs/urbanterror/template @@ -1,6 +1,6 @@ # Template file for 'urbanterror' pkgname=urbanterror -version=4.3.3 +version=4.3.4 revision=1 wrksrc="ioq3-for-UrbanTerror-4-release-${version}" makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/Barbatos/ioq3-for-UrbanTerror-4" distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz" -checksum=b90bca7ea92c0b27d4ce3bc0ae44e53c4bb58da26c8075d23946317923c46b60 +checksum=ce9d09a8ad149f8a1d36a85a586e1dd8ec9b8dcb3e5e9e82ec2a33017655bf43 nocross=yes do_build() { From 8e61c1e08298a1e3e5f2fa47f861d0a547bcd784 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 24 Jun 2018 10:20:56 +0200 Subject: [PATCH 116/759] urbanterror-data: update to 4.3.4. --- srcpkgs/urbanterror-data/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/urbanterror-data/template b/srcpkgs/urbanterror-data/template index af04e1c04af..7b8fef942dc 100644 --- a/srcpkgs/urbanterror-data/template +++ b/srcpkgs/urbanterror-data/template @@ -1,7 +1,7 @@ # Template file for 'urbanterror-data' pkgname=urbanterror-data -version=4.3.3 -revision=2 +version=4.3.4 +revision=1 noarch=yes wrksrc="UrbanTerror43" hostmakedepends="unzip" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="Freeware" homepage="http://www.urbanterror.info" distfiles="http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror${version//./}_full.zip" -checksum=c35827192724afcaaa07d7bdb74f17e06e4b865346672eda2b00717b3d023067 +checksum=716669cc6c525663b791852e51ff9c94d96f382be39279dab6084dddacb5a4e7 do_install() { vmkdir usr/share/urbanterror From 4d6e1506178379ddc6fbb92ea6e93323c688ce94 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 24 Jun 2018 12:00:48 +0200 Subject: [PATCH 117/759] stella: update to 5.1.3. (#376) --- srcpkgs/stella/template | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/srcpkgs/stella/template b/srcpkgs/stella/template index 78c803a3649..6fab0ff9886 100644 --- a/srcpkgs/stella/template +++ b/srcpkgs/stella/template @@ -1,15 +1,18 @@ # Template file for 'stella' pkgname=stella -version=5.1.2 +version=5.1.3 revision=1 -build_style=gnu-configure +build_style=configure +configure_args="--prefix=/usr" +hostmakedepends="pkg-config" makedepends="SDL2-devel glu-devel libpng-devel zlib-devel" -short_desc="A multi-platform Atari 2600 VCS Emulator" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Multi-platform Atari 2600 VCS Emulator" maintainer="Diogo Leal " -license="GPL-2" +license="GPL-2.0-or-later, BSD-3-Clause" homepage="https://stella-emu.github.io/" distfiles="https://github.com/stella-emu/stella/releases/download/${version}/stella-${version}-src.tar.xz" -checksum=77b210d51af7e4be88c14014d507e48367bcdff6b8ba513793f035f3e30a21bd +checksum=e074317c25e5d4cabec4558909d301c3a7654ad620863f05d342244fe6bdfe0a post_extract() { case "$XBPS_TARGET_MACHINE" in @@ -21,11 +24,6 @@ post_extract() { esac } -do_configure() { - ./configure --prefix=/usr -} - -do_install() { - make DESTDIR=$DESTDIR install - vbin stella +post_install() { + vlicense Copyright.txt } From 759904fa1033de1fe7ae9c4a0b94280a7d30234b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 07:12:22 -0300 Subject: [PATCH 118/759] mutt: update to 1.10.0. --- srcpkgs/mutt/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 7f5d1b616d8..a79c38ff576 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,7 +1,7 @@ # Template file for 'mutt' pkgname=mutt -version=1.9.5 -revision=2 +version=1.10.0 +revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl --enable-sidebar @@ -11,14 +11,14 @@ hostmakedepends="libidn-devel perl pkg-config" makedepends="gdbm-devel gpgme-devel libidn-devel libressl-devel libsasl-devel ncurses-devel" depends="mime-types" -conf_files="/etc/$pkgname/Muttrc" +conf_files="/etc/${pkgname}/Muttrc" short_desc="The Mutt Mail Client" maintainer="Jan S. " license="GPL-2.0-or-later" -# changelog="http://www.mutt.org/doc/PGP-Notes.txt" homepage="http://www.mutt.org" +changelog="http://mutt.org/relnotes/1.10" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=bf617e64ae4e08a998bef8e42a965a211587e051f1437a3a4884b351a9385753 +checksum=0215b5f90ef9cc33441a6ca842379b64412ed7f8da83ed68bfaa319179f5535b provides="mutt-0_1" # Begin alternatives: From 14c3beb31406c8e1ce1c71556a566c10fce342bd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 07:08:16 -0300 Subject: [PATCH 119/759] GraphicsMagick: update to 1.3.30. --- srcpkgs/GraphicsMagick/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 4338c5769b5..1da2e6f7830 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,6 +1,6 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.29 +version=1.3.30 revision=1 keep_libtool_archives=yes build_style=gnu-configure @@ -16,8 +16,9 @@ short_desc="GraphicsMagick Image Processing System" maintainer="Juan RP " license="MIT" homepage="http://www.graphicsmagick.org/" +changelog="http://www.graphicsmagick.org/NEWS.html" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" -checksum=de820cd10597205941a7e9d02c2e679231e92e8e769c204ef09034d2279ad453 +checksum=d566a0e10d7c6c901ca5f3c3f31dd441cb758d655fd7817dc205dca11b7cf5b6 post_install() { vlicense Copyright.txt LICENSE From 78d0d08d0e4b4841520d383f5abbb8e2543f88c3 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 11:02:55 -0300 Subject: [PATCH 120/759] perl-Config-IniFiles: update to 2.98. --- srcpkgs/perl-Config-IniFiles/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/perl-Config-IniFiles/template b/srcpkgs/perl-Config-IniFiles/template index 67dbfb6cd83..f343eb8c11b 100644 --- a/srcpkgs/perl-Config-IniFiles/template +++ b/srcpkgs/perl-Config-IniFiles/template @@ -1,16 +1,17 @@ # Template file for 'perl-Config-IniFiles' pkgname=perl-Config-IniFiles -version=2.95 +version=2.98 revision=1 noarch=yes wrksrc="Config-IniFiles-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends}" -depends="${makedepends}" +makedepends="$hostmakedepends" +depends="$makedepends" short_desc="A module for reading .ini-style configuration files" maintainer="ibrokemypie " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Config-IniFiles" +changelog="https://fastapi.metacpan.org/source/SHLOMIF/Config-IniFiles-${version}/Changes" distfiles="${CPAN_SITE}/Config/Config-IniFiles-${version}.tar.gz" -checksum=414a19f98cc745769ce762aefce01fa52d031bc244403cd32fd1f6257f2dedc2 +checksum=9d5fc5c2192058e58ad35150ddae3043a2679f2aa4e1fb7e18e36794622b1797 From aaba5d937abc45c35ecc69c2911f9f482327de2d Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 11:36:06 -0300 Subject: [PATCH 121/759] sfeed: update to 0.9.4. --- srcpkgs/sfeed/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template index 8676748dfb3..012d107e5d5 100644 --- a/srcpkgs/sfeed/template +++ b/srcpkgs/sfeed/template @@ -1,6 +1,6 @@ # Template file for 'sfeed' pkgname=sfeed -version=0.9.3 +version=0.9.4 revision=1 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" @@ -10,7 +10,7 @@ maintainer="Rubén Santos " license="ISC" homepage="https://git.codemadness.org/sfeed" distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz" -checksum=09372442a76272990ecc2d295da27c25f477f5714db8dffb2eab537a08868d4c +checksum=a733b67d8c36b8782cc25214b64f47348f4f73c05341e95830648f530ac9b61a post_install() { vlicense LICENSE From 26dbbf0325219d138fdd6b6bdd9636c7cbe57d63 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 11:42:56 -0300 Subject: [PATCH 122/759] skim: update to 0.5.1. --- srcpkgs/skim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skim/template b/srcpkgs/skim/template index 825591a6ea9..d90d5b4eb54 100644 --- a/srcpkgs/skim/template +++ b/srcpkgs/skim/template @@ -1,6 +1,6 @@ # Template file for 'skim' pkgname=skim -version=0.5.0 +version=0.5.1 revision=1 hostmakedepends="cargo rust" short_desc="Fuzzy Finder in rust" @@ -8,7 +8,7 @@ maintainer="Orphan " license="MIT" homepage="https://github.com/lotabout/skim" distfiles="https://github.com/lotabout/skim/archive/v${version}.tar.gz" -checksum=bc45edfd77323b010e19247ff74cb9eaf7a5b3457a765ba50ddcd0f5b9744eba +checksum=f616e229971c75b14e46a5843389e61148262ad41965afa051ff85970f3a6773 nocross=yes do_build() { From 9883fa5d997a8b9565933b1ea5aeefa0b3f3bb7e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Jun 2018 18:31:52 +0200 Subject: [PATCH 123/759] debootstrap: update to 1.0.103. --- srcpkgs/debootstrap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index 19160e4ebf6..c7a1c059ec4 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,6 +1,6 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.102 +version=1.0.103 revision=1 build_style=fetch depends="binutils gnupg gzip tar wget xz" @@ -10,7 +10,7 @@ license="MIT" homepage="http://packages.qa.debian.org/d/debootstrap.html" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb" -checksum="f0b9d471dc84e1e13ec8050a6095d79d41d037d1b9024404234ae08b7debf5a6 +checksum="44b2896539965d1de67f8040c93ea23ff6f57fa33db4f1adbcecacb5de77e893 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0" do_install() { From 3048046d4410d106faa6d2d827a8abc946680a6e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Jun 2018 18:33:09 +0200 Subject: [PATCH 124/759] pysolfc: update to 2.4.0. --- srcpkgs/pysolfc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template index cf25922c44f..148b9608d86 100644 --- a/srcpkgs/pysolfc/template +++ b/srcpkgs/pysolfc/template @@ -1,6 +1,6 @@ # Template file for 'pysolfc' pkgname=pysolfc -version=2.2.0 +version=2.4.0 revision=1 noarch=yes wrksrc="PySolFC-${pkgname}-${version}" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0" homepage="http://pysolfc.sourceforge.net/" distfiles="https://github.com/shlomif/PySolFC/archive/${pkgname}-${version}.tar.gz" -checksum=0610c72391a9972ebac2903107b22abc24b6a991795612506ba62e714a928564 +checksum=b93a61eca8d4196b3d8101a4bf63ba56a1ad2a8c839c071f016dd1c961b599e6 post_build() { make mo rules From 830518dca8c82f3e0fe729f08750e5dd39d5dd08 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 24 Jun 2018 21:17:39 +0200 Subject: [PATCH 125/759] etcetera: change homepage (#385) --- srcpkgs/etcetera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index c1dd11cb77f..06f9af190e8 100644 --- a/srcpkgs/etcetera/template +++ b/srcpkgs/etcetera/template @@ -8,7 +8,7 @@ depends="python3" short_desc="Config file management with a touch of wisdom" maintainer="cr6git " license="GPL-3.0-or-later" -homepage="https://github.com/jeancf/etcetera" +homepage="https://gitlab.com/jeancf/etcetera" distfiles="https://github.com/jeancf/etcetera/archive/v${version}.tar.gz" checksum=1cf1df80dabddc9207fa1c44d6d2ac26fe935e084cd6d83ea8d8a7fb4c8b972d conf_files="/etc/etcetera.conf" From b3e0adf1f91d73044f9de7a203b2ab830d670871 Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Sun, 24 Jun 2018 21:28:12 +0200 Subject: [PATCH 126/759] minio: update to 2018.06.09. (#273) --- srcpkgs/minio/template | 12 ++++++------ srcpkgs/minio/update | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/minio/update diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index 639580dc493..bae6acbab4b 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -1,9 +1,9 @@ # Template file for 'minio' pkgname=minio -version=2018.03.19 -revision=2 -_version="${version//./-}T19-22-06Z" -wrksrc=$pkgname-RELEASE.$_version +version=2018.06.09 +revision=1 +_version="${version//./-}T03-43-35Z" +wrksrc=${pkgname}-RELEASE.${_version} build_style=go hostmakedepends="git" short_desc="Object storage server compatible with Amazon S3" @@ -11,8 +11,8 @@ maintainer="Gerardo Di Iorio " license="Apache-2.0" homepage="https://github.com/minio/minio" go_import_path="github.com/minio/minio" -distfiles="$homepage/archive/RELEASE.$_version.tar.gz" -checksum=91afb0b5acbfd622a5ea55495b5abca3cfdf23eef213ea15f74f1682d68eca84 +distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz" +checksum=b37d23501bf8a34f6fc72a27421b6bfc9242ca4ee95037880b8035d76a91f173 system_accounts="_minio" _minio_homedir="/var/lib/minio" _minio_descr="Minio Daemon User" diff --git a/srcpkgs/minio/update b/srcpkgs/minio/update new file mode 100644 index 00000000000..21bb98cb1c3 --- /dev/null +++ b/srcpkgs/minio/update @@ -0,0 +1 @@ +pattern="/archive/RELEASE\.\K[-\d]+(?=T[-\d]+Z\.tar\.gz)" From e95fb0bc49f6c22ab6c49129c7a1658a97cb7408 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 24 Jun 2018 21:28:39 +0200 Subject: [PATCH 127/759] wireshark: update to 2.4.7. (#270) --- srcpkgs/wireshark/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 1ebf30ce3b8..2b249cdeb2c 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,7 +1,7 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.4.6 -revision=2 +version=2.4.7 +revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua --with-krb5 --with-gtk=3 --with-qt=5 --without-portaudio CC_FOR_BUILD=cc" @@ -13,9 +13,9 @@ depends="libcap-progs" short_desc="A network protocol analyzer" maintainer="Enno Boland " homepage="https://www.wireshark.org" -license="GPL-2" +license="GPL-2.0-or-later" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe +checksum=5ecb3c68734fb89c83ac283e6cdf264eb15b9c7e7ea63dcfd4f0bad3e77c4f44 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" From 588f6ac5dbf7e0b59ce402711482f27090eb3451 Mon Sep 17 00:00:00 2001 From: Solitude Date: Sun, 24 Jun 2018 22:29:01 +0300 Subject: [PATCH 128/759] nim: link against libssl.so.45 (#263) --- srcpkgs/nim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index f8b5bbd6ad4..f057b17ad22 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -9,7 +9,7 @@ hostmakedepends="ed" short_desc="The Nim programming language" maintainer="allan " license="MIT" -homepage="http://nim-lang.org/" +homepage="https://nim-lang.org/" distfiles="https://github.com/nim-lang/Nim/archive/v${version}.tar.gz https://github.com/nim-lang/csources/archive/v${_cversion}.tar.gz>csources-${_cversion}.tar.gz https://github.com/nim-lang/nimble/archive/v${_nimbleversion}.tar.gz>nimble-${_nimbleversion}.tar.gz" @@ -31,7 +31,7 @@ do_build() { cd .. ed lib/wrappers/openssl.nim <<-EDIT - ,s/versions = "(/versions = "(|.43|.41/ + ,s/versions = "(/versions = "(.45|/ w q EDIT From ac3d73bd6f1feb6cd8de109970a389cad706d97b Mon Sep 17 00:00:00 2001 From: VoidNoire <18732253+VoidNoire@users.noreply.github.com> Date: Sun, 24 Jun 2018 19:46:52 +0000 Subject: [PATCH 129/759] subuser: added the required package "python3-setuptools" as a runtime dependency (#378) --- srcpkgs/subuser/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/subuser/template b/srcpkgs/subuser/template index 9c82023a26b..37e62401aff 100644 --- a/srcpkgs/subuser/template +++ b/srcpkgs/subuser/template @@ -1,15 +1,15 @@ # Template file for 'subuser' pkgname=subuser version=0.6.2 -revision=1 +revision=2 only_for_archs="x86_64 x86_64-musl" build_style=python3-module hostmakedepends="python3-setuptools" -depends="docker python3" +depends="docker python3-setuptools" pycompile_module="subuserlib" maintainer="cr6git " short_desc="Turns Docker containers into normal linux programs" homepage="http://subuser.org" -license="LGPL-3" +license="LGPL-3.0-only" distfiles="https://github.com/subuser-security/subuser/archive/${version}.tar.gz" checksum=1f7fc32fd61f1f8c7d04770cf4ba5c0dd0eb081eb1ef35f35e07c667959555a1 From 6e5fedf828ffe770d81313768b0b4b4179011f65 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 24 Jun 2018 22:29:14 +0200 Subject: [PATCH 130/759] perl: enforce _GNU_SOURCE on musl. Else memmem will break! Found by @svenper. --- srcpkgs/perl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index 8bea3e3643d..ef37b07e991 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,7 +1,7 @@ # Template build file for 'perl'. pkgname=perl version=5.26.1 -revision=5 +revision=6 _perl_cross_version=1.1.6 build_style=gnu-configure hostmakedepends="less" @@ -175,11 +175,11 @@ do_configure() { export HOSTLDFLAGS CFLAGS+=" -D_FILE_OFFSET_BITS=64 -DLARGE_FILE_SUPPORT64 ";; *-musl) - HOSTCFLAGS+=" -D_DEFAULT_SOURCE" + HOSTCFLAGS+=" -D_GNU_SOURCE" export HOSTCFLAGS HOSTLDFLAGS+=" -pthread" export HOSTLDFLAGS - CFLAGS+=" -D_DEFAULT_SOURCE";; + CFLAGS+=" -D_GNU_SOURCE";; esac export LD="$CC" From d3be8e9b25320b11abd1cbd9ccda4c49accc1ce8 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 25 Jun 2018 07:53:49 +0200 Subject: [PATCH 131/759] perl-File-ShareDir: update to 1.116 --- srcpkgs/perl-File-ShareDir/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-File-ShareDir/template b/srcpkgs/perl-File-ShareDir/template index 8cf12590e5e..b367b3fea5d 100644 --- a/srcpkgs/perl-File-ShareDir/template +++ b/srcpkgs/perl-File-ShareDir/template @@ -1,6 +1,6 @@ # Template file for 'perl-File-ShareDir' pkgname=perl-File-ShareDir -version=1.114 +version=1.116 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -13,4 +13,4 @@ maintainer="newbluemoon " homepage="https://metacpan.org/release/File-ShareDir" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz" -checksum=d7cff11873e29707e4be0b1332fce8366776ead3b9811dc80a9784a61486948a +checksum=59d90bfdf98c4656ff4173e62954ea8cf0de66565e35d108ecd7050596cb8328 From c05f63105b9a0120a07c46e371b6e0974d8d62b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 25 Jun 2018 10:47:59 +0200 Subject: [PATCH 132/759] lollypop: update to 0.9.516 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/lollypop/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 84edc7a5781..e6f76800d3f 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,7 +1,9 @@ # Template file for 'lollypop' pkgname=lollypop -version=0.9.515 +version=0.9.516 revision=1 +# Gitlab upload tag hash +_uhash=81888cdad8759274482060912e11a6d0 build_style=meson noarch=yes hostmakedepends="intltool itstool pkg-config glib-devel gobject-introspection python3 git" @@ -13,5 +15,5 @@ short_desc="A music player for GNOME" maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Lollypop" -distfiles="https://gitlab.gnome.org/World/lollypop/uploads/a15d6d46c8e2647eb1235616a2e484e9/lollypop-${version}.tar.xz" -checksum=ff4eaa941f8c01e422d384ba463b7b9448b165288de9a7fdeb6c10a3eb5a000c +distfiles="https://gitlab.gnome.org/World/lollypop/uploads/${_uhash}/lollypop-${version}.tar.xz" +checksum=72bd11b5e77ce984daa10937ff4115d74a772512ece202421912700877cc5d14 From b79112ddd25c1e750211ff250b007e9c982b8583 Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 11:07:24 +0200 Subject: [PATCH 133/759] etcetera: revbump for new homepage --- srcpkgs/etcetera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index 06f9af190e8..f2d85b1b4d0 100644 --- a/srcpkgs/etcetera/template +++ b/srcpkgs/etcetera/template @@ -1,7 +1,7 @@ # Template file for 'etcetera' pkgname=etcetera version=0.5 -revision=1 +revision=2 noarch=yes pycompile_dirs="/usr/lib/etcetera" depends="python3" From 3a9254b3abeea1028f08375deb8264ad915457af Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 11:09:48 +0200 Subject: [PATCH 134/759] jgmenu: update to 1.0, add patch for musl. (#377) --- srcpkgs/jgmenu/patches/musl.patch | 10 ++++++++++ srcpkgs/jgmenu/template | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/jgmenu/patches/musl.patch diff --git a/srcpkgs/jgmenu/patches/musl.patch b/srcpkgs/jgmenu/patches/musl.patch new file mode 100644 index 00000000000..918ccac0553 --- /dev/null +++ b/srcpkgs/jgmenu/patches/musl.patch @@ -0,0 +1,10 @@ +--- watch.c.orig 2018-06-25 10:42:01.431602657 +0200 ++++ watch.c 2018-06-25 10:42:59.363603488 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include "list.h" + #include "sbuf.h" diff --git a/srcpkgs/jgmenu/template b/srcpkgs/jgmenu/template index 8296967be88..e92d945b96e 100644 --- a/srcpkgs/jgmenu/template +++ b/srcpkgs/jgmenu/template @@ -1,6 +1,6 @@ # Template file for 'jgmenu' pkgname=jgmenu -version=0.9 +version=1.0 revision=1 build_style=gnu-makefile make_use_env=yes @@ -13,4 +13,4 @@ maintainer="cr6git " license="GPL-2.0-or-later" homepage="https://www.github.com/johanmalm/jgmenu" distfiles="https://www.github.com/johanmalm/jgmenu/archive/v${version}.tar.gz" -checksum=2095de1d0bceadba5a5e6e002626a936a95b0f08c4f3397f943d161cf606b3bb +checksum=75d17be9476c429c05de22a12dcd47097dad97a7fa2f5b0053cd05d4db160ac8 From 51d3e9f3dedf4dda3134862d7cc557defa4408aa Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 11:24:37 +0200 Subject: [PATCH 135/759] arpack-ng: fix license --- srcpkgs/arpack-ng/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/arpack-ng/template b/srcpkgs/arpack-ng/template index 433d9ff474d..c5ac7007e90 100644 --- a/srcpkgs/arpack-ng/template +++ b/srcpkgs/arpack-ng/template @@ -7,7 +7,7 @@ hostmakedepends="automake libtool gcc-fortran" makedepends="lapack-devel" short_desc="Collection of Fortran77 subroutines" maintainer="Diogo Leal " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="https://github.com/opencollab/arpack-ng" distfiles="https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz" checksum=c753f929d3f1092d84bb0883a8ffe2551a8cb94d5ab891e63f596a876e44c351 From d256f5071497323ff52d2f7d1a91ac818bb74be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 25 Jun 2018 12:07:11 +0200 Subject: [PATCH 136/759] gnome-chess: update to 3.28.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/gnome-chess/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index 6b6d7eb2d2f..b179ec04ca4 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -1,6 +1,6 @@ # Template file for 'gnome-chess' pkgname=gnome-chess -version=3.28.0 +version=3.28.1 revision=1 build_style=meson hostmakedepends="pkg-config vala glib-devel itstool" @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=800fe0c8f5c267dca98e7db404d7bc469bbc7342adf3dbde1a9b6c69cd58afef +checksum=61d7eda645ab74fcf6fa586bc3edc49f01d4a4076f98e1e53d4b4c842b600fe1 pre_configure() { sed -i -e '/meson.add_install_script/d' meson.build From a7b1de2d467b6b4331a27e1bbfd7760312c06ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 25 Jun 2018 12:12:16 +0200 Subject: [PATCH 137/759] gnome-chess: nocross (vala / librsvg) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/gnome-chess/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index b179ec04ca4..2af77e120af 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -12,6 +12,7 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=61d7eda645ab74fcf6fa586bc3edc49f01d4a4076f98e1e53d4b4c842b600fe1 +nocross="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/10770/steps/shell_3/logs/stdio" pre_configure() { sed -i -e '/meson.add_install_script/d' meson.build From 02c543cea74483cf8d456f17af5e719a2c7a0aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 25 Jun 2018 12:15:42 +0200 Subject: [PATCH 138/759] gnome-chess: fix cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/gnome-chess/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template index 2af77e120af..f10706e17f2 100644 --- a/srcpkgs/gnome-chess/template +++ b/srcpkgs/gnome-chess/template @@ -3,7 +3,7 @@ pkgname=gnome-chess version=3.28.1 revision=1 build_style=meson -hostmakedepends="pkg-config vala glib-devel itstool" +hostmakedepends="pkg-config vala glib-devel itstool librsvg-devel" makedepends="gtk+3-devel librsvg-devel" depends="gnuchess" short_desc="GNOME chess user interface" @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Chess" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=61d7eda645ab74fcf6fa586bc3edc49f01d4a4076f98e1e53d4b4c842b600fe1 -nocross="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/10770/steps/shell_3/logs/stdio" pre_configure() { sed -i -e '/meson.add_install_script/d' meson.build From f9d7e2e1c3ff3e5b1391952f9efd5fa7e3e99940 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 25 Jun 2018 13:18:38 +0200 Subject: [PATCH 139/759] darcs: update to 2.14.1. --- srcpkgs/darcs/files/stack.yaml | 2 +- srcpkgs/darcs/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml index 2e91ca644f7..e6b78cff3fc 100644 --- a/srcpkgs/darcs/files/stack.yaml +++ b/srcpkgs/darcs/files/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.3 +resolver: lts-11.15 extra-deps: - fgl-5.5.4.0 - graphviz-2999.19.0.0 diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template index 213f0d7aa53..091d2983900 100644 --- a/srcpkgs/darcs/template +++ b/srcpkgs/darcs/template @@ -1,18 +1,18 @@ # Template file for 'darcs' pkgname=darcs -version=2.14.0 +version=2.14.1 revision=1 -nocross=yes build_style=haskell-stack hostmakedepends="unzip" makedepends="zlib-devel libcurl-devel ncurses-devel" short_desc="Change-focused cross-platform version control system" maintainer="Leah Neukirchen " -license="GPL-2.0" +license="GPL-2.0-or-later" homepage="http://darcs.net/" distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=19fa0882a1485f03ab0552d6f01d538c2b286c4a38a1fe502e9cf2a78f782803 +checksum=61ddbc99acaf06df3a114437064e9241e0da467c23d1d3fb520a782eee32cd35 nopie_files="/usr/bin/darcs" +nocross=yes post_install() { vinstall contrib/darcs_completion 644 etc/bash_completion.d From 41776756385c8deec5425288e4f2bcacc57f394f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 20:48:39 -0300 Subject: [PATCH 140/759] apk-tools: update to 2.10.0. --- srcpkgs/apk-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 93aa388e3c4..4fb39dcf758 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -1,7 +1,7 @@ # Template file for 'apk-tools' pkgname=apk-tools -version=2.9.1 -revision=3 +version=2.10.0 +revision=1 build_style=gnu-makefile make_build_args="LUAAPK=" hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://git.alpinelinux.org/cgit/apk-tools" distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2" -checksum=24fd166d2bec2f38af32e7ce4c464c8987273094d7a652e463594b1b803ff16e +checksum=429b225e3d5c10b6d6299af37814c2ec6ac82272b0c8ffafaf69dcb4430ae076 CFLAGS=-Wno-error do_install() { From a6a0f90984269d8e1f80761f5856f77d26762588 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Jun 2018 07:35:06 -0300 Subject: [PATCH 141/759] libuv: update to 1.21.0. --- srcpkgs/libuv/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 46ef3a5fe34..7d905c4c43e 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -1,16 +1,16 @@ -# Template build file for 'libuv' +# Template file for 'libuv' pkgname=libuv -version=1.20.3 +version=1.21.0 revision=1 -build_style="gnu-configure" +build_style=gnu-configure hostmakedepends="automake libtool pkg-config" short_desc="Multi-platform support library with a focus on asynchronous I/O" maintainer="Enno Boland " license="MIT, CC-BY-SA-4.0" -#changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" -homepage="http://libuv.org/" -distfiles="https://github.com/libuv/libuv/archive/v$version.tar.gz" -checksum=43a388687194a15d5f3cc1980d53c405020a3586254c620e5f3c4d241bb9da05 +homepage="https://libuv.org/" +changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog" +distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz" +checksum=c6f53e4a75d2601db8efe0e837839969de7667d36569110429a0bc8f8229bf59 pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -26,7 +26,7 @@ libuv-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } From 5d879101c339ed82bcf522885a78f6e10e8248a6 Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 14:44:45 +0200 Subject: [PATCH 142/759] master-pdf-editor: update to 5.0.28. (#395) --- srcpkgs/master-pdf-editor/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template index 18db5dd9c32..e9bf67da6ee 100644 --- a/srcpkgs/master-pdf-editor/template +++ b/srcpkgs/master-pdf-editor/template @@ -1,8 +1,8 @@ # Template file for 'master-pdf-editor' pkgname=master-pdf-editor -version=4.3.89 +version=5.0.28 revision=1 -wrksrc=master-pdf-editor-4 +wrksrc="${pkgname}-5" only_for_archs="x86_64" repository="nonfree" nostrip="yes" @@ -12,13 +12,13 @@ maintainer="Giuseppe Fierro " license="Proprietary" homepage="https://code-industry.net/free-pdf-editor/" distfiles="https://code-industry.net/public/${pkgname}-${version}_qt5.amd64.tar.gz" -checksum=ac77db75bcc5f2bce21d98a55c07176e15682b0abe5a83708c53d38721fdab4c +checksum=f32a0b9fadf5af45502135fb11f2de9f2e02efc323cffd11a54044ce79561a9f do_install() { vlicense license.txt - vinstall masterpdfeditor4.desktop 644 usr/share/applications - rm {license.txt,masterpdfeditor4.desktop} + vinstall masterpdfeditor5.desktop 644 usr/share/applications + rm {license.txt,masterpdfeditor5.desktop} - vmkdir opt/master-pdf-editor-4 - vcopy * opt/master-pdf-editor-4 + vmkdir opt/master-pdf-editor-5 + vcopy * opt/master-pdf-editor-5 } From 67f8149a4fb3e9a901d4dc2db874cf159cba954f Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 14:47:37 +0200 Subject: [PATCH 143/759] vimb: update to 3.2.0. (#394) --- srcpkgs/vimb/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/vimb/template b/srcpkgs/vimb/template index 07e3ba1a347..d9452ea8a7a 100644 --- a/srcpkgs/vimb/template +++ b/srcpkgs/vimb/template @@ -1,14 +1,14 @@ # Template file for 'vimb' pkgname=vimb -version=3.1.0 -revision=3 +version=3.2.0 +revision=1 build_style=gnu-makefile +make_use_env=yes hostmakedepends="pkg-config" makedepends="webkit2gtk-devel" -make_build_args="PREFIX=/usr" short_desc="Fast and lightweight web browser based on WebKit/GTK+" maintainer="Eivind Uggedal " -license="GPL-3" -homepage="http://fanglingsu.github.io/vimb" +license="GPL-3.0-or-later" +homepage="https://fanglingsu.github.io/vimb/" distfiles="https://github.com/fanglingsu/vimb/archive/${version}.tar.gz" -checksum=6efc32b81759b1dfc637b5188831a787902ae296150a12b2813f6cc190009abf +checksum=9746408c45bedbca6cd5bd37c7268ace52f2655a4ead4bb50239d557bef9ab41 From daa03133f391898f5f0519d405ce750d13ce122d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 25 Jun 2018 15:01:41 +0200 Subject: [PATCH 144/759] scite: update to 4.1.0. --- srcpkgs/scite/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index b4ac40bc2fa..56d25017cd5 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,16 +1,16 @@ # Template file for 'scite' pkgname=scite -version=3.7.5 +version=4.1.0 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" -makedepends="gtk+-devel lua51-devel" +makedepends="gtk+-devel lua-devel" short_desc="SCIntilla based Text Editor" maintainer="Leah Neukirchen " license="MIT" homepage="http://www.scintilla.org/SciTEDownload.html" distfiles="http://www.scintilla.org/scite${version//./}.tgz" -checksum=51e6861284077268d4929bb2ff9c516e2ca8914b2bd0ac315d177befe24aef86 +checksum=d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile From e3b1c80f226eb0a78e54724395c781357cea4736 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 25 Jun 2018 17:16:21 +0200 Subject: [PATCH 145/759] python-msp430-tools: update to 0.9.2. --- srcpkgs/python-msp430-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-msp430-tools/template b/srcpkgs/python-msp430-tools/template index acbcd613232..f6750a116b5 100644 --- a/srcpkgs/python-msp430-tools/template +++ b/srcpkgs/python-msp430-tools/template @@ -1,6 +1,6 @@ # Template file for 'python-msp430-tools' pkgname=python-msp430-tools -version=0.9 +version=0.9.2 revision=1 noarch=yes build_style=python2-module @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://pypi.org/project/python-msp430-tools/" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=09435855b14c3a1113056a847d5dbd192021b6e9400fff1ebeb47dd2cc422f55 +checksum=544de0c333a4e58a9f5585454a515c6f6159547a5e9a6103cc1e1f064d8323d8 post_install() { vlicense LICENSE.txt LICENSE From e070823ac33b0d1108e10ae09da7843c4fcb0d97 Mon Sep 17 00:00:00 2001 From: mcz Date: Mon, 25 Jun 2018 17:32:13 +0200 Subject: [PATCH 146/759] geomyidae: update to 0.32.1. --- srcpkgs/geomyidae/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geomyidae/template b/srcpkgs/geomyidae/template index 70758a064b3..864629776d3 100644 --- a/srcpkgs/geomyidae/template +++ b/srcpkgs/geomyidae/template @@ -1,6 +1,6 @@ # Template file for 'geomyidae' pkgname=geomyidae -version=0.32 +version=0.32.1 revision=1 build_style=gnu-makefile short_desc="A small C-based gopherd" @@ -8,7 +8,7 @@ maintainer="m-cz " license="MIT" homepage="http://git.r-36.net/geomyidae/" distfiles="http://git.r-36.net/${pkgname}/snapshot/${pkgname}-${version}.tar.gz" -checksum=15608abaa8a63655dd6db5cf347a6240c1b49b9e792ef0742b17fd7b963e25e6 +checksum=df884aa04457c69f030dffad50178b96ac364952101e4d8d9eca07cc60a279a8 pre_build() { sed -i 's| -O0||g' Makefile From 8dc96a823708d23530657247e66b7922362bebd7 Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 19:45:35 +0200 Subject: [PATCH 147/759] roswell: update to 18.6.10.92. (#396) --- srcpkgs/roswell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/roswell/template b/srcpkgs/roswell/template index e4b443bbccb..de5b438017c 100644 --- a/srcpkgs/roswell/template +++ b/srcpkgs/roswell/template @@ -1,6 +1,6 @@ # Template file for 'roswell' pkgname=roswell -version=18.3.10.89 +version=18.6.10.92 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -9,8 +9,8 @@ short_desc="Lisp installer and launcher for major environment that just works" maintainer="Liam Howley " license="MIT" homepage="https://github.com/roswell/roswell" -distfiles="https://github.com/roswell/roswell/releases/download/v${version}/roswell_$version.orig.tar.gz" -checksum=3606469a787bd83f5f9bf887c49ebb264339ef18977097f63270356ce50c20b7 +distfiles="https://github.com/roswell/roswell/archive/v${version}.tar.gz" +checksum=d1d2fc0da0981f6696f3b08a0b8b2547d2230e10ba32e7290c5472a2a7793c30 pre_configure() { sh bootstrap From 877b80dfdaa68871650f12598ca552b45aa50c74 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 25 Jun 2018 12:58:24 -0500 Subject: [PATCH 148/759] timeshift: update to 18.6.1 (#401) --- srcpkgs/timeshift/patches/fix-ftbfs-vala40.patch | 11 ----------- srcpkgs/timeshift/template | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/timeshift/patches/fix-ftbfs-vala40.patch diff --git a/srcpkgs/timeshift/patches/fix-ftbfs-vala40.patch b/srcpkgs/timeshift/patches/fix-ftbfs-vala40.patch deleted file mode 100644 index 12c98297f2e..00000000000 --- a/srcpkgs/timeshift/patches/fix-ftbfs-vala40.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Utility/Gtk/TerminalWindow.vala.orig -+++ src/Utility/Gtk/TerminalWindow.vala -@@ -166,7 +166,7 @@ - } - - public void execute_command(string command){ -- term.feed_child("%s\n".printf(command), -1); -+ term.feed_child("%s\n".printf(command).to_utf8()); - } - - public void execute_script(string script_path, bool wait = false){ diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template index 6eb92b1c762..f800d9f9710 100644 --- a/srcpkgs/timeshift/template +++ b/srcpkgs/timeshift/template @@ -1,6 +1,6 @@ # Template file for 'timeshift' pkgname=timeshift -version=18.4 +version=18.6.1 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config vala" @@ -12,7 +12,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="http://www.teejeetech.in/p/timeshift.html" distfiles="https://github.com/teejee2008/timeshift/archive/v${version}.tar.gz" -checksum=5f180ba2ed66531b10e6cc9b1966e60be1c646ebe304dd0a29b4215318892feb +checksum=2c851b232e622f75facc289a4a163218d1943b239eeadb2988acb23c80fc30a2 post_install() { rm "${DESTDIR}/usr/bin/timeshift-uninstall" From 7358d023806cee1154bee561ca002261d3ff933f Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 25 Jun 2018 19:59:45 +0200 Subject: [PATCH 149/759] proxychains-ng: update to 4.13. (#397) --- srcpkgs/proxychains-ng/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template index 434c1034801..16abcdcd20c 100644 --- a/srcpkgs/proxychains-ng/template +++ b/srcpkgs/proxychains-ng/template @@ -1,13 +1,13 @@ # Template file for 'proxychains-ng' pkgname=proxychains-ng -version=4.12 +version=4.13 revision=1 build_style=gnu-configure make_install_target="install install-config" conf_files="/etc/proxychains.conf" short_desc="A hook preloader to redirect TCP traffic through SOCKS or HTTP proxies" maintainer="David " -license="GPL-2" -homepage="http://github.com/rofl0r/proxychains-ng" -distfiles="https://github.com/rofl0r/proxychains-ng/releases/download/v${version}/proxychains-ng-${version}.tar.xz" -checksum=482a549935060417b629f32ddadd14f9c04df8249d9588f7f78a3303e3d03a4e +license="GPL-2.0-only" +homepage="https://github.com/rofl0r/proxychains-ng" +distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz" +checksum=77502b3f67641214c2360b366b23e2068a2f1379cbd3def3cf83b807d1762810 From df94b7727a8393fd8b0aa38ec80df9231831f925 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Mon, 25 Jun 2018 20:02:24 +0200 Subject: [PATCH 150/759] cinnamon: update to 3.8.x (#329) * mozjs38: remove * cjs: update to 3.8.0. * cinnamon-translations: update to 3.8.1. * cinnamon-menus: update to 3.8.2. * cinnamon-desktop: update to 3.8.1. * cinnamon-screensaver: update to 3.8.2. * nemo: update to 3.8.3. * muffin: update to 3.8.1. * cinnamon-settings-daemon: update to 3.8.4. * cinnamon-control-center: update to 3.8.0. * cinnamon-session: update to 3.8.1. * New package: python3-pam-1.8.3 * cinnamon: update to 3.8.4. * xapps: add mising devel dependencies --- common/shlibs | 1 - srcpkgs/cinnamon-control-center/template | 29 +++-- .../cinnamon-desktop/files/remove-gir.patch | 114 ++++++++++++++++ .../cinnamon-desktop/patches/gnome-3.14.patch | 22 ---- srcpkgs/cinnamon-desktop/template | 23 ++-- srcpkgs/cinnamon-menus/template | 13 +- srcpkgs/cinnamon-screensaver/template | 27 ++-- srcpkgs/cinnamon-session/template | 25 ++-- srcpkgs/cinnamon-settings-daemon/template | 25 ++-- srcpkgs/cinnamon-translations/template | 9 +- srcpkgs/cinnamon/template | 28 ++-- srcpkgs/cjs/template | 21 ++- srcpkgs/mozjs38-devel | 1 - srcpkgs/mozjs38/patches/copy-headers.patch | 20 --- srcpkgs/mozjs38/patches/fix-icu-check.patch | 16 --- srcpkgs/mozjs38/patches/gcc-alignment.patch | 122 ------------------ srcpkgs/mozjs38/patches/js-version.patch | 65 ---------- .../mozjs38/patches/pkg-config-version.patch | 22 ---- srcpkgs/mozjs38/template | 47 ------- srcpkgs/mozjs38/update | 1 - srcpkgs/muffin/template | 19 ++- srcpkgs/nemo/template | 37 +++--- srcpkgs/python3-pam/template | 19 +++ srcpkgs/xapps/template | 5 +- 24 files changed, 269 insertions(+), 442 deletions(-) create mode 100644 srcpkgs/cinnamon-desktop/files/remove-gir.patch delete mode 100644 srcpkgs/cinnamon-desktop/patches/gnome-3.14.patch delete mode 120000 srcpkgs/mozjs38-devel delete mode 100644 srcpkgs/mozjs38/patches/copy-headers.patch delete mode 100644 srcpkgs/mozjs38/patches/fix-icu-check.patch delete mode 100644 srcpkgs/mozjs38/patches/gcc-alignment.patch delete mode 100644 srcpkgs/mozjs38/patches/js-version.patch delete mode 100644 srcpkgs/mozjs38/patches/pkg-config-version.patch delete mode 100644 srcpkgs/mozjs38/template delete mode 100644 srcpkgs/mozjs38/update create mode 100644 srcpkgs/python3-pam/template diff --git a/common/shlibs b/common/shlibs index d739269f7f5..f6df50b287c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1551,7 +1551,6 @@ libwx_gtk2u_webview-3.0.so.0 wxWidgets-3.0.2_3 libmspack.so.0 libmspack-0.4alpha_1 libslim.so.1.3.6 slim-1.3.6_1 libmozjs-24.so mozjs24-24.2.0_1 -libmozjs-38.so mozjs38-38.8.0_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 libinput.so.10 libinput-1.2.0_1 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1 diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index 66bc3cf0ca3..7951bf79e63 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -1,25 +1,28 @@ # Template file for 'cinnamon-control-center' pkgname=cinnamon-control-center -version=3.6.5 -revision=2 +version=3.8.0 +revision=1 short_desc="The Cinnamon Control Center" build_style=gnu-configure configure_args="--disable-static --disable-update-mimedb --disable-systemd" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool xmlto docbook-xsl gtk-doc autoconf-archive" -makedepends="dbus-glib-devel cinnamon-menus-devel libgnomekbd-devel - cinnamon-desktop-devel cinnamon-settings-daemon-devel libXxf86misc-devel - network-manager-applet-devel libSM-devel libnotify-devel upower-devel - polkit-devel colord-devel ibus-devel pulseaudio-devel libwacom-devel tzdata - libcanberra-devel cups-devel ModemManager-devel network-manager-applet-devel - gnome-online-accounts-devel" +hostmakedepends="autoconf-archive gettext-devel glib-devel gnome-common + gobject-introspection intltool pkg-config" +makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel + cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel + libSM-devel libXxf86misc-devel libcanberra-devel libgnomekbd-devel + libnotify-devel libwacom-devel network-manager-applet-devel polkit-devel + pulseaudio-devel tzdata upower-devel" depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4 cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=298daf3f0f01af11b63a57c59f0ee62cc0cb16a12b498bdd45fd92e6d32754aa +checksum=7e839b2ca42aec23a47a844f8ba48f8846eabe19ccc9fa1aaeae4a9f742e87df + +do_check() { + : +} pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/cinnamon-desktop/files/remove-gir.patch b/srcpkgs/cinnamon-desktop/files/remove-gir.patch new file mode 100644 index 00000000000..d042764fd73 --- /dev/null +++ b/srcpkgs/cinnamon-desktop/files/remove-gir.patch @@ -0,0 +1,114 @@ +--- libcinnamon-desktop/meson.build 2018-05-06 16:37:39.000000000 +0200 ++++ - 2018-05-09 19:03:26.854206934 +0200 +@@ -1,21 +1,3 @@ +-libcinnamon_desktop_gir_sources = [ +- 'display-name.c', +- 'edid-parse.c', +- 'gnome-bg-crossfade.c', +- 'gnome-bg.c', +- 'gnome-desktop-thumbnail.c', +- 'gnome-desktop-utils.c', +- 'gnome-installer.c', +- 'gnome-pnp-ids.c', +- 'gnome-rr-config.c', +- 'gnome-rr-labeler.c', +- 'gnome-rr-output-info.c', +- 'gnome-rr.c', +- 'gnome-thumbnail-pixbuf-utils.c', +- 'gnome-wall-clock.c', +- 'gnome-xkb-info.c', +-] +- + libcinnamon_desktop_misc_headers = [ + 'gnome-datetime-source.h', + 'gnome-rr-private.h', +@@ -81,31 +63,6 @@ + ) + endif + +-cdesktop_gir = gnome.generate_gir(libcinnamon_desktop, +- sources: 'cdesktop-enums.h', +- namespace: 'CDesktopEnums', +- nsversion: '3.0', +- identifier_prefix: 'CDesktop', +- symbol_prefix: 'c_desktop', +- extra_args: [ +- '-DGNOME_DESKTOP_USE_UNSTABLE_API', +- ], +- install: true, +-) +- +-gnome.generate_gir(libcinnamon_desktop, +- sources: libcinnamon_desktop_gir_sources + libcinnamon_desktop_headers, +- namespace: 'CinnamonDesktop', +- nsversion: '3.0', +- export_packages: 'cinnamon-desktop', +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome_', +- includes: ['GObject-2.0', 'Gtk-3.0', cdesktop_gir[0], ], +- extra_args: [ +- '-DGNOME_DESKTOP_USE_UNSTABLE_API', +- ], +- install: true, +-) + + # FIXME + # https://github.com/mesonbuild/meson/issues/1687 +--- libcvc/meson.build 2018-05-06 16:37:39.000000000 +0200 ++++ - 2018-05-09 19:07:38.048845300 +0200 +@@ -1,24 +1,9 @@ +-libcvc_gir_sources = [ +- 'gvc-channel-map.c', +- 'gvc-mixer-card.c', +- 'gvc-mixer-control.c', +- 'gvc-mixer-event-role.c', +- 'gvc-mixer-event-role.h', +- 'gvc-mixer-sink-input.c', +- 'gvc-mixer-sink.c', +- 'gvc-mixer-sink.h', +- 'gvc-mixer-source-output.c', +- 'gvc-mixer-source.c', +- 'gvc-mixer-stream.c', +- 'gvc-mixer-ui-device.c', +-] + libcvc_sources = [ + 'gvc-channel-map-private.h', + 'gvc-mixer-card-private.h', + 'gvc-mixer-control-private.h', + 'gvc-mixer-stream-private.h', + 'gvc-pulseaudio-fake.h', +- libcvc_gir_sources, + ] + + libcvc_headers = [ +@@ -44,20 +29,6 @@ + version: '0.0.0', + ) + +-gnome.generate_gir(libcvc, +- sources: libcvc_gir_sources + libcvc_headers, +- namespace: 'Cvc', +- nsversion: '1.0', +- identifier_prefix: 'Gvc', +- symbol_prefix: 'gvc_', +- includes: [ +- 'GObject-2.0', +- 'Gio-2.0', +- ], +- install: true, +-) +- +- + install_headers( + libcvc_headers, + subdir: join_paths('cinnamon-desktop', 'libcvc'), +--- libcinnamon-desktop/meson.build 2018-05-09 19:08:56.864652942 +0200 ++++ - 2018-05-09 19:09:17.874779723 +0200 +@@ -6,7 +6,6 @@ + ] + + libcinnamon_desktop_sources = [ +- libcinnamon_desktop_gir_sources, + libcinnamon_desktop_misc_headers, + 'gnome-datetime-source.c', + ] diff --git a/srcpkgs/cinnamon-desktop/patches/gnome-3.14.patch b/srcpkgs/cinnamon-desktop/patches/gnome-3.14.patch deleted file mode 100644 index 02fea9d0287..00000000000 --- a/srcpkgs/cinnamon-desktop/patches/gnome-3.14.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2014-10-01 03:54:35.830124486 +0000 -+++ schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2014-10-01 03:58:31.959359594 +0000 -@@ -10,7 +10,7 @@ - - - -- 'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml' -+ 'file://@datadir@/backgrounds/gnome/adwaita-timed.xml' - <_summary>Picture URI - <_description> - URI to use for the background image. Not that the backend only supports ---- schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2014-10-01 03:54:35.830124486 +0000 -+++ schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2014-10-01 03:58:35.266015393 +0000 -@@ -97,7 +97,7 @@ - - - -- 'gnome' -+ 'Adwaita' - <_summary>Icon Theme - <_description> - Icon theme to use for the panel, nautilus etc. diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template index 013be632718..bc47da33719 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -1,30 +1,25 @@ # Template file for 'cinnamon-desktop' pkgname=cinnamon-desktop -version=3.6.2 +version=3.8.1 revision=1 short_desc="Library with common API for various Cinnamon modules" -build_style=gnu-configure -configure_args=" --disable-static" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool" -makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config - libxkbfile-devel pulseaudio-devel pam-devel accountsservice-devel" +build_style=meson +hostmakedepends="glib-devel gobject-introspection intltool pkg-config" +makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel + pulseaudio-devel" depends="xkeyboard-config" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=76b053eea02c61df22d35ccec6ba83de25246b794cbc024dce636dcb1e74c812 +checksum=239c8a210de18468919d9cbc379535e55628559e396cb321100ccab4ee0d04d0 +nocross=yes build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - cinnamon-desktop-devel_package() { depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template index bfe8db42741..10f92278a1d 100644 --- a/srcpkgs/cinnamon-menus/template +++ b/srcpkgs/cinnamon-menus/template @@ -1,17 +1,18 @@ # Template file for 'cinnamon-menus' pkgname=cinnamon-menus -version=3.6.0 +version=3.8.2 revision=1 -short_desc="Cinnamon menu specifications" build_style=gnu-configure configure_args=" --disable-static" -hostmakedepends="automake libtool gnome-common pkg-config intltool gobject-introspection glib-devel" +hostmakedepends="glib-devel gnome-common gobject-introspection intltool + pkg-config" makedepends="libglib-devel" +short_desc="Cinnamon menu specifications" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=ac005b0b46fb6285f82b2f80683c7d5cdd719cb7548a4dc3e36f0cd717e38d00 +checksum=21de1b1b7367afcd7ccf9bc54633f495f30c26819da459de78b4a79fe4134725 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index cc7c3427866..d3cc9e907af 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,30 +1,35 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver -version=3.6.1 -revision=2 +version=3.8.2 +revision=1 short_desc="The Cinnamon screensaver" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-mit-ext" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool python3-devel" -makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel - libXxf86misc-devel pam-devel webkit2gtk-devel python3-devel" -depends="cinnamon-translations desktop-file-utils hicolor-icon-theme - python3-gobject xapps python3-setproctitle python3-xapp" +hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection + intltool pkg-config python3-devel" +makedepends="cinnamon-desktop-devel dbus-glib-devel libXxf86misc-devel + libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel" +depends="cinnamon-translations hicolor-icon-theme python3-gobject + python3-setproctitle python3-xapp xapps" conf_files="/etc/pam.d/${pkgname}" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=aeb3edb07f6e9a0f9aa0e291c82c26b12335dfe78fea6a32edb4ff1d049ca728 +checksum=6f07d2a13d81794d4654d04a9cb9c80ed02fccf7031747a2dfe4bf3f455ac2ca nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/28904/steps/shell_3/logs/stdio pycompile_version="$py3_ver" pycompile_dirs="/usr/share/cinnamon-screensaver" +do_check() { + : +} + pre_configure() { NOCONFIGURE=1 ./autogen.sh } + post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} } diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index 26f05b24fb8..0c889a2c7a2 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -1,27 +1,18 @@ # Template file for 'cinnamon-session' pkgname=cinnamon-session -version=3.6.1 +version=3.8.1 revision=1 short_desc="The Cinnamon session handler" -build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel dbus-glib-devel glib-devel intltool" +build_style=meson +hostmakedepends="pkg-config gobject-introspection + gettext-devel dbus-glib-devel glib-devel intltool xmlto" makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel pangox-compat-devel cinnamon-desktop-devel libcanberra-devel upower-devel - elogind-devel GConf-devel libXtst-devel" + elogind-devel GConf-devel libXtst-devel xapps-devel" depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=1de855afe097c2fe4d63f0edd4f8876ace2d73620edb65b3c665e91e5a115d9e +checksum=c5ddf1ee820a2d76f0515905b85a998e80fcbc586c1fd41ad2652aa18e1755fe -if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Fix gcc6 build for -Wformat-nonliteral - CFLAGS="-Wno-error=format-nonliteral" -fi - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index ad5e9bb24af..93c4800b4a5 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,27 +1,30 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=3.6.2 -revision=3 +version=3.8.3 +revision=1 short_desc="The Cinnamon Settings Daemon" build_style=gnu-configure configure_args=" --disable-static --disable-schemas-compile --disable-gconf" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel dbus-glib-devel intltool xmlto docbook-xml" -makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel - libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel nss-devel - pulseaudio-devel libcanberra-devel colord-devel cups-devel polkit-devel - libgnomekbd-devel libxklavier-devel xorgproto elogind-devel libgudev-devel" +hostmakedepends="dbus-glib-devel gettext-devel glib-devel gnome-common + gobject-introspection intltool pkg-config" +makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel + libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel + nss-devel polkit-devel pulseaudio-devel upower-devel" depends="desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=60f4de4eb1e05d720605dbd6f90bb841039be00ca1ad4f2bedaf39725ea34339 +checksum=4bfa74892e97e0a9b847f4711807c1e5fe3f1ab9d20b1bd0d9c8ee3821b98fa1 pre_configure() { NOCONFIGURE=1 ./autogen.sh } +do_check() { + : +} + cinnamon-settings-daemon-devel_package() { short_desc+=" - development files" depends="libglib-devel" diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template index d8a999d2dab..2124b6faada 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -1,15 +1,16 @@ # Template file for 'cinnamon-translations' pkgname=cinnamon-translations -version=3.6.4 +version=3.8.1 revision=1 noarch=yes build_style=gnu-makefile short_desc="Translations for Cinnamon and Nemo" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later" +#changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=8f993ae34e3f176dc3182c2e95d1dfa1bb4e0dfd8a71933e3670718834aeec62 +checksum=99fe1885659c68e9518186ad0152decd9e16065f5e3845ff01e455aa76db9b8c do_install() { vmkdir /usr/share/locale diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 27225c483d5..39be2f1bbd7 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,14 +1,14 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=3.6.7 -revision=2 +version=3.8.4 +revision=1 wrksrc="Cinnamon-${version}" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-compile-warnings=no" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc autoconf-archive" +hostmakedepends="automake libtool pkg-config gobject-introspection + gettext-devel glib-devel intltool xmlto gtk-doc autoconf-archive" makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel @@ -19,14 +19,15 @@ depends=" cinnamon-session>=${version%.*} muffin>=${version%.*} cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*} - gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet - python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow - polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus" + gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds + network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus + python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=ddd29e1a2e044dfa54a5c57b21f9704512845824a101eca37266109560c70d08 +checksum=823737315fbbdbf9cdf27b1184abdbc15b9fda889c4126b081e0b94298f49917 +nocross="gobject-introspection" pycompile_dirs=" /usr/share/cinnamon/cinnamon-slideshow @@ -38,13 +39,14 @@ pycompile_dirs=" /usr/share/cinnamon/cinnamon-json-makepot /usr/share/cinnamon/cinnamon-desktop-editor" +do_check() { + : +} + pre_configure() { # Add polkit agent to required components sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session - # fix for the python2 PAM module - sed -i 's:import PAM:import pam:' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py - # Use pkexec instead of gksu sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index cba71ae34aa..a50641a46a4 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -1,23 +1,34 @@ # Template file for 'cjs' pkgname=cjs -version=3.6.1 +version=3.8.0 revision=1 short_desc="Javascript for Cinnamon" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake autoconf-archive libtool gnome-common pkg-config gobject-introspection glib-devel" -makedepends="mozjs38-devel dbus-glib-devel readline-devel gobject-introspection" +makedepends="mozjs52-devel dbus-glib-devel readline-devel gobject-introspection" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/cjs/archive/${version}.tar.gz" -checksum=874b473cff62e2adaeca2135f0b2eab5efe1e397ce24ea816d92aafef1a5c845 +checksum=9018ec1ffc0c2c81c9678a23e3e57db56251b4bbf6b2a10e79aa75e83ca86d66 pre_configure() { NOCONFIGURE=1 ./autogen.sh } +do_check() { + : +# TOTAL: 729 +# PASS: 707 +# SKIP: 14 +# XFAIL: 0 +# FAIL: 3 +# XPASS: 0 +# ERROR: 5 +} + cjs-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/mozjs38-devel b/srcpkgs/mozjs38-devel deleted file mode 120000 index 31c380552da..00000000000 --- a/srcpkgs/mozjs38-devel +++ /dev/null @@ -1 +0,0 @@ -mozjs38 \ No newline at end of file diff --git a/srcpkgs/mozjs38/patches/copy-headers.patch b/srcpkgs/mozjs38/patches/copy-headers.patch deleted file mode 100644 index 7f352a795c8..00000000000 --- a/srcpkgs/mozjs38/patches/copy-headers.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Copy headers on install instead of symlinking -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- - -Index: b/python/mozbuild/mozbuild/backend/recursivemake.py -=================================================================== ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -796,7 +796,7 @@ - return - - for source, dest, _ in self._walk_hierarchy(obj, exports): -- self._install_manifests['dist_include'].add_symlink(source, dest) -+ self._install_manifests['dist_include'].add_copy(source, dest) - - if not os.path.exists(source): - raise Exception('File listed in EXPORTS does not exist: %s' % source) diff --git a/srcpkgs/mozjs38/patches/fix-icu-check.patch b/srcpkgs/mozjs38/patches/fix-icu-check.patch deleted file mode 100644 index 873697d18f2..00000000000 --- a/srcpkgs/mozjs38/patches/fix-icu-check.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add bracket for sed 4.3 compliance - -Based on upstream fix by Daniel Stenberg in 09 jan 2017 -See: https://hg.mozilla.org/mozilla-central/rev/ebcbf47a83e7 - ---- a/js/src/configure 2017-02-21 16:56:42.350105741 -0300 -+++ b/js/src/configure 2017-02-21 17:33:13.183493978 -0300 -@@ -15231,7 +15231,7 @@ - fi - fi - -- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` - if test x"$version" = x; then - { echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; } - fi diff --git a/srcpkgs/mozjs38/patches/gcc-alignment.patch b/srcpkgs/mozjs38/patches/gcc-alignment.patch deleted file mode 100644 index a3a57d54479..00000000000 --- a/srcpkgs/mozjs38/patches/gcc-alignment.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- a/js/src/jit/RegisterSets.h 2017-02-10 17:33:06.210702431 -0800 -+++ b/js/src/jit/RegisterSets.h 2017-02-10 17:43:52.877514146 -0800 -@@ -7,7 +7,6 @@ - #ifndef jit_RegisterSets_h - #define jit_RegisterSets_h - --#include "mozilla/Alignment.h" - #include "mozilla/MathAlgorithms.h" - - #include "jit/JitAllocPolicy.h" -@@ -26,8 +25,8 @@ - Code code_; - - public: -- AnyRegister() -- { } -+ AnyRegister() = default; -+ - explicit AnyRegister(Register gpr) { - code_ = gpr.code(); - } -@@ -156,7 +155,7 @@ - } - #endif - -- ValueOperand() {} -+ ValueOperand() = default; - }; - - // Registers to hold either either a typed or untyped value. -@@ -165,46 +164,25 @@ - // Type of value being stored. - MIRType type_; - -- // Space to hold either an AnyRegister or a ValueOperand. - union U { -- mozilla::AlignedStorage2 typed; -- mozilla::AlignedStorage2 value; -+ AnyRegister typed; -+ ValueOperand value; - } data; - -- AnyRegister& dataTyped() { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- ValueOperand& dataValue() { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- -- AnyRegister dataTyped() const { -- MOZ_ASSERT(hasTyped()); -- return *data.typed.addr(); -- } -- const ValueOperand& dataValue() const { -- MOZ_ASSERT(hasValue()); -- return *data.value.addr(); -- } -- - public: - -- TypedOrValueRegister() -- : type_(MIRType_None) -- {} -+ TypedOrValueRegister() = default; - - TypedOrValueRegister(MIRType type, AnyRegister reg) - : type_(type) - { -- dataTyped() = reg; -+ data.typed = reg; - } - - MOZ_IMPLICIT TypedOrValueRegister(ValueOperand value) - : type_(MIRType_Value) - { -- dataValue() = value; -+ data.value = value; - } - - MIRType type() const { -@@ -220,11 +198,13 @@ - } - - AnyRegister typedReg() const { -- return dataTyped(); -+ MOZ_ASSERT(hasTyped()); -+ return data.typed; - } - - ValueOperand valueReg() const { -- return dataValue(); -+ MOZ_ASSERT(hasValue()); -+ return data.value; - } - - AnyRegister scratchReg() { -@@ -240,19 +220,18 @@ - // Whether a constant value is being stored. - bool constant_; - -- // Space to hold either a Value or a TypedOrValueRegister. - union U { -- mozilla::AlignedStorage2 constant; -- mozilla::AlignedStorage2 reg; -+ Value constant; -+ TypedOrValueRegister reg; - } data; - - Value& dataValue() { - MOZ_ASSERT(constant()); -- return *data.constant.addr(); -+ return data.constant; - } - TypedOrValueRegister& dataReg() { - MOZ_ASSERT(!constant()); -- return *data.reg.addr(); -+ return data.reg; - } - - public: diff --git a/srcpkgs/mozjs38/patches/js-version.patch b/srcpkgs/mozjs38/patches/js-version.patch deleted file mode 100644 index cc6b3d35b32..00000000000 --- a/srcpkgs/mozjs38/patches/js-version.patch +++ /dev/null @@ -1,65 +0,0 @@ -# HG changeset patch -# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a -Add major version to shell and js-config filenames. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2014-10-29 - ---- -diff --git a/js/src/configure b/js/src/configure ---- a/js/src/configure -+++ b/js/src/configure -@@ -1696,8 +1696,13 @@ - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config -+fi - - - if test -n "$IS_ALPHA"; then - -diff --git a/js/src/configure.in b/js/src/configure.in ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI - MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` - IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` - --dnl XXX in a temporary bid to avoid developer anger at renaming files --dnl XXX before "js" symlinks exist, don't change names. --dnl --dnl if test -n "$JS_STANDALONE"; then --dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION --dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config --dnl else -+if test -n "$JS_STANDALONE"; then -+JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -+JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -+else - JS_SHELL_NAME=js - JS_CONFIG_NAME=js-config --dnl fi -+fi - - changequote([,]) - if test -n "$IS_ALPHA"; then - -diff -r 80a9e64d75f5 js/src/Makefile.in ---- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 -+++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 -@@ -273,6 +273,9 @@ - SCRIPTS = $(JS_CONFIG_NAME) - SDK_BINARY = $(JS_CONFIG_NAME) - -+$(JS_CONFIG_NAME): js-config -+ cp $^ $@ -+ - $(LIBRARY_NAME).pc: js.pc - cp $^ $@ - diff --git a/srcpkgs/mozjs38/patches/pkg-config-version.patch b/srcpkgs/mozjs38/patches/pkg-config-version.patch deleted file mode 100644 index 34a43d1f6df..00000000000 --- a/srcpkgs/mozjs38/patches/pkg-config-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add major version to pkg-config filename. -Author: Rico Tzschichholz -Forwarded: no -Last-Update: 2015-05-04 - -Index: b/js/src/Makefile.in -=================================================================== ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -214,10 +214,10 @@ - $(JS_CONFIG_NAME): js-config - cp $^ $@ - --$(LIBRARY_NAME).pc: js.pc -+$(JS_LIBRARY_NAME).pc: js.pc - cp $^ $@ - --install:: $(LIBRARY_NAME).pc -+install:: $(JS_LIBRARY_NAME).pc - $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig - - install:: js-config.h diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template deleted file mode 100644 index 86caed33a30..00000000000 --- a/srcpkgs/mozjs38/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'mozjs38' -pkgname=mozjs38 -version=38.8.0 -revision=6 -wrksrc="mozilla-esr${version%.*.*}" -build_wrksrc="js/src" -build_style=gnu-configure -hostmakedepends="perl python pkg-config" -makedepends="icu-devel libffi-devel nspr-devel zlib-devel" -short_desc="Mozilla JavaScript interpreter and library (38.x series)" -homepage="http://www.mozilla.org/js/" -license="MPL-1.1, GPL-2, LGPL-2.1" -maintainer="Juan RP " -distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" -checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 -patch_args="-Np1" -shlib_provides="libmozjs-38.so" - -# Flags for gcc6.3 conceived by Arch Linux developers -CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl -LDFLAGS="-fuse-ld=bfd" - -do_configure() { - local _args - - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="-Os" - export HOST_CXXFLAGS="-Os" - _args+=" --target=$XBPS_CROSS_TRIPLET" - fi - - SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-threadsafe --enable-system-ffi --with-system-zlib \ - --with-system-icu --with-system-nspr ${_args} -} - -mozjs38-devel_package() { - depends="nspr-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/js38-config - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/mozjs38/update b/srcpkgs/mozjs38/update deleted file mode 100644 index a1c3f7e43b0..00000000000 --- a/srcpkgs/mozjs38/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="mozjs" diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index d9a353199d2..f5fcdd2f139 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -1,22 +1,21 @@ # Template file for 'muffin' pkgname=muffin -version=3.6.0 +version=3.8.2 revision=1 short_desc="Cinnamon window manager based on Mutter" build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc --enable-compile-warnings=minimum ac_cv_path_ZENITY=/usr/bin/zenity" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel intltool glib-devel gnome-doc-utils gtk-doc gdk-pixbuf-devel - gnome-doc-utils" -makedepends="clutter-devel startup-notification-devel libcanberra-devel - cinnamon-desktop-devel libXinerama-devel libSM-devel gnome-doc-utils" -depends="dconf zenity" +hostmakedepends="automake gdk-pixbuf-devel gettext-devel glib-devel + gnome-doc-utils gobject-introspection gtk-doc intltool pkg-config" +makedepends="cinnamon-desktop-devel clutter-devel gnome-doc-utils libSM-devel + libcanberra-devel startup-notification-devel" +depends="zenity" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=b343b6bf86d83dad01dcfb12d224c7eb2d4b63e1fbbe8beb3240a618ffecf737 +checksum=b567c96022698f6fdc81118e5ffa5f14d4c95fd20c4ad228eee8c0d1b8cbc902 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index 2b41ed18005..861888280ba 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -1,37 +1,36 @@ # Template file for 'nemo' pkgname=nemo -version=3.6.5 +version=3.8.3 revision=1 short_desc="The Cinnamon file manager (nautilus fork)" -build_style=gnu-configure +build_style=meson pycompile_dirs="/usr/share/nemo/actions/myaction.py" -configure_args=" --disable-static --disable-update-mimedb - --disable-gtk-doc-html --disable-schemas-compile --disable-selinux" -hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection - gettext-devel glib-devel intltool xmlto docbook-xml gtk-doc gir-freedesktop - python-polib python-gobject" -makedepends="libexif-devel gvfs-devel dconf-devel exempi-devel tracker-devel - cinnamon-desktop-devel libnotify-devel libxml2-devel xapps-devel" -depends="gvfs dconf cinnamon-translations desktop-file-utils hicolor-icon-theme" +hostmakedepends="gettext-devel glib-devel gnome-common gobject-introspection + intltool pkg-config" +makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel + libexif-devel libnotify-devel tracker-devel xapps-devel" +depends="cinnamon-translations dconf gvfs" maintainer="Juan RP " -license="GPL-3" -homepage="http://cinnamon.linuxmint.com/" +license="GPL-2.0-or-later, LGPL-2.0-or-later" +homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=88df121685cb7bf0464a3ef41cf3734768903e832839cc4fe103c0b53ae187d5 +checksum=6111819d07a4d482ef71a5659ce09db0502026c5fc9653d3577b58d57540f049 +nocross="gobject-introspection" build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" fi +do_check() { + : + # requires a display + # Gtk-WARNING **: 18:34:08.533: cannot open display: +} + pre_configure() { - # Fix build - sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.ac - # Rename 'Files' app name to avoid having the same as nautilus - sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in - - NOCONFIGURE=1 ./autogen.sh + sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in } libnemo_package() { diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template new file mode 100644 index 00000000000..c05de824044 --- /dev/null +++ b/srcpkgs/python3-pam/template @@ -0,0 +1,19 @@ +# Template file for 'python3-pam' +pkgname=python3-pam +version=1.8.3 +revision=1 +wrksrc="${pkgname/3}-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +makedepends="python3-devel pam-devel" +depends="python3 pam" +short_desc="Python pam module supporting py3" +maintainer="John " +license="MIT" +homepage="https://github.com/FirefighterBlu3/python-pam" +distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz" +checksum=a49efa94decf881fd0964e4bc257de824412694b7ffe3a68065d1ec0dd86bde3 + +post_install() { + vlicense LICENSE +} diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template index 29ac8fe70fc..ac29d3a0d3c 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapps/template @@ -1,7 +1,7 @@ # Template file for 'xapps' pkgname=xapps version=1.2.1 -revision=1 +revision=2 build_style=meson hostmakedepends="glib-devel gnome-common pkg-config vala" makedepends="gettext-devel gobject-introspection libgnomekbd-devel @@ -17,7 +17,8 @@ checksum=daf41acb021b4dfb1b313710eea812e315a9f49e6a2cc037691ec51799f4cf26 xapps-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} libgnomekbd-devel libglib-devel + gdk-pixbuf-devel" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig From 4a00d41d3d4757f443b56899010f420f718a4672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 26 Jun 2018 02:56:25 +0200 Subject: [PATCH 151/759] New package: osmid-0.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/osmid/patches/musl.patch | 29 +++++++++++++++++++++++++++++ srcpkgs/osmid/template | 30 ++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 srcpkgs/osmid/patches/musl.patch create mode 100644 srcpkgs/osmid/template diff --git a/srcpkgs/osmid/patches/musl.patch b/srcpkgs/osmid/patches/musl.patch new file mode 100644 index 00000000000..c7f247c7258 --- /dev/null +++ b/srcpkgs/osmid/patches/musl.patch @@ -0,0 +1,29 @@ +--- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-03-27 16:52:31.000000000 +0200 ++++ JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-06-26 02:41:16.728143943 +0200 +@@ -126,9 +126,15 @@ + return result; + } + ++#if defined(__GLIBC__) + String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } + String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } + String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } ++#else ++String SystemStats::getUserLanguage() { return "en"; } ++String SystemStats::getUserRegion() { return "US"; } ++String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } ++#endif + + //============================================================================== + void CPUInformation::initialise() noexcept +--- external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-03-27 16:52:31.000000000 +0200 ++++ external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-06-26 02:45:39.903133450 +0200 +@@ -343,7 +343,7 @@ + return "Unkown error"; + + #elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || \ +- ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version ++ !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version + + if (strerror_r(err_num, buf, buf_size) == 0) + return std::string(buf); diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template new file mode 100644 index 00000000000..6da7cb2b44c --- /dev/null +++ b/srcpkgs/osmid/template @@ -0,0 +1,30 @@ +# Template file for 'osmid' +pkgname=osmid +version=0.6.1 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel libX11-devel" +short_desc="Tool to convert MIDI to OSC and OSC to MIDI" +maintainer="Jürgen Buchmüller " +license="MIT, GPL-2.0-or-later" +homepage="https://github.com/llloret/osmid/" +distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=3dd7c62e8a13f37252bd021d3855d7fc07449218c1e9c41315d01de4059a830e + +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" libexecinfo-devel" ;; +esac + +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) sed -i CMakeLists.txt \ + -e "/target_link_libraries/s/X11)/X11 execinfo)/" + ;; + esac +} + +post_install() { + vlicense LICENSE.md + vdoc README.md +} From 8024f46fea73a2d98cfeaeba182a203a675c22b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 26 Jun 2018 03:17:34 +0200 Subject: [PATCH 152/759] freetype: explicitly enable freetype-config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #366 Signed-off-by: Jürgen Buchmüller --- srcpkgs/freetype/template | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index 740407cbbca..7d6c220beaa 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -1,8 +1,9 @@ # Template file for 'freetype' pkgname=freetype version=2.9.1 -revision=2 +revision=3 build_style=gnu-configure +configure_args="--enable-freetype-config" hostmakedepends="pkg-config" makedepends="bzip2-devel libpng-devel" short_desc="Font rendering engine and library API" @@ -32,16 +33,6 @@ pre_configure() { fi } -post_build() { - # Create a legacy /usr/bin/freetype-config script - vmkdir usr/bin - cat >> "${DESTDIR}"/usr/bin/freetype-config < Date: Mon, 25 Jun 2018 23:42:40 -0300 Subject: [PATCH 153/759] git: update to 2.18.0. (#302) --- srcpkgs/git/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index bfef54dea89..1193c03b0fd 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ -# Template file for "git" +# Template file for 'git' pkgname=git -version=2.17.1 +version=2.18.0 revision=1 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 @@ -16,9 +16,10 @@ short_desc="Git Tree History Storage Tool" maintainer="Juan RP " license="GPL-2.0-only" homepage="https://git-scm.com/" +changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e -make_check_target="test" +checksum=8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92 +make_check_target=test subpackages="git-cvs git-svn gitk git-gui git-all" From c483a2c12435b659bfeb92c044c2b09e585f3759 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 06:16:03 +0200 Subject: [PATCH 154/759] New package: catfish-1.4.5 (#407) --- srcpkgs/catfish/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/catfish/template diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template new file mode 100644 index 00000000000..c079d41947f --- /dev/null +++ b/srcpkgs/catfish/template @@ -0,0 +1,15 @@ +# Template file for 'catfish' +pkgname=catfish +version=1.4.5 +revision=1 +noarch=yes +build_style=python3-module +pycompile_module="catfish catfish_lib" +hostmakedepends="intltool python3-distutils-extra python3-gobject" +depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject python3-pexpect" +short_desc="Versatile file searching tool" +maintainer="cr6git " +license="GPL-2.0-or-later" +homepage="http://www.twotoasts.de/index.php/catfish/" +distfiles="https://launchpad.net/catfish-search/${version%.*}/${version}/+download/catfish-${version}.tar.gz" +checksum=ad2304561b6eb0dea7c230241428f1017122fba403657d03a70e1f1ddc752c37 From a6ddb2498cb982963b3921b5416c6e1f3551a698 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 07:15:35 +0200 Subject: [PATCH 155/759] linux4.9: update to 4.9.110. (#404) --- srcpkgs/linux4.9/files/arm64-dotconfig | 52 +++++++++++-------------- srcpkgs/linux4.9/files/i386-dotconfig | 12 ++---- srcpkgs/linux4.9/files/x86_64-dotconfig | 12 ++---- srcpkgs/linux4.9/template | 8 ++-- 4 files changed, 34 insertions(+), 50 deletions(-) diff --git a/srcpkgs/linux4.9/files/arm64-dotconfig b/srcpkgs/linux4.9/files/arm64-dotconfig index 4a96e8e698d..5d548be2d2d 100644 --- a/srcpkgs/linux4.9/files/arm64-dotconfig +++ b/srcpkgs/linux4.9/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.93 Kernel Configuration +# Linux/arm64 4.9.110 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -440,6 +440,7 @@ CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_1024718=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -519,6 +520,7 @@ CONFIG_KEXEC=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y # # ARMv8.1 architectural features @@ -741,7 +743,7 @@ CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y CONFIG_NETLABEL=y -# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETWORK_SECMARK=y CONFIG_NET_PTP_CLASSIFY=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETFILTER=y @@ -760,6 +762,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m CONFIG_NF_LOG_COMMON=m CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_SECMARK is not set CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y @@ -855,6 +858,7 @@ CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m +# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m @@ -7210,18 +7214,30 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_NETWORK_XFRM=y -# CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY is not set -# CONFIG_SECURITY_SELINUX is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_YAMA=y # CONFIG_INTEGRITY is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m @@ -7486,27 +7502,3 @@ CONFIG_FONT_8x16=y CONFIG_SG_POOL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_SBITMAP=y -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_SECURITY_NETWORK is not set -# CONFIG_SECURITY_APPARMOR is not set -CONFIG_NETWORK_SECMARK=y -# CONFIG_NF_CONNTRACK_SECMARK is not set -# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_SELINUX_DISABLE is not set -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -# CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set diff --git a/srcpkgs/linux4.9/files/i386-dotconfig b/srcpkgs/linux4.9/files/i386-dotconfig index 96c39d1d5d6..1630c67488e 100644 --- a/srcpkgs/linux4.9/files/i386-dotconfig +++ b/srcpkgs/linux4.9/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.93 Kernel Configuration +# Linux/i386 4.9.110 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -7183,14 +7183,10 @@ CONFIG_UEFI_CPER=y # CONFIG_DCACHE_WORD_ACCESS=y CONFIG_FS_IOMAP=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set diff --git a/srcpkgs/linux4.9/files/x86_64-dotconfig b/srcpkgs/linux4.9/files/x86_64-dotconfig index d439a0b8783..66cc3e81e57 100644 --- a/srcpkgs/linux4.9/files/x86_64-dotconfig +++ b/srcpkgs/linux4.9/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.93 Kernel Configuration +# Linux/x86_64 4.9.110 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -7254,14 +7254,10 @@ CONFIG_UEFI_CPER=y # CONFIG_DCACHE_WORD_ACCESS=y CONFIG_FS_IOMAP=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS=m -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=m +CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 2cf4bd285ca..39ee51f0c54 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,15 +1,15 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.93 -revision=2 +version=4.9.110 +revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " homepage="https://www.kernel.org" -license="GPL-2" +license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=58f78ab6c945c64a7c7c246256dc8b516b009c9ef1c90572ae396e7a8d6a5903 +checksum=379a143a70a79f0eea6c9f6638942b65e6043abdde17ad23264c0abd93c4ea7a nodebug=yes # -dbg package is generated below manually nostrip=yes From d327092522dde788453203fcb1a15740f8f566fa Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 10:31:14 +0200 Subject: [PATCH 156/759] gtkedit: update to 0.1.9. (#410) --- srcpkgs/gtkedit/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtkedit/template b/srcpkgs/gtkedit/template index aa0da4eb781..279116ae171 100644 --- a/srcpkgs/gtkedit/template +++ b/srcpkgs/gtkedit/template @@ -1,18 +1,18 @@ # Template file for 'gtkedit' pkgname=gtkedit -version=0.1.8 -revision=2 +version=0.1.9 +revision=1 wrksrc="gtkwrite-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="gtk+-devel" depends="desktop-file-utils" -maintainer="cr6git " short_desc="Text Editor written in C and Gtk+2" +maintainer="cr6git " +license="GPL-2.0-or-later" homepage="https://github.com/drankinatty/gtkwrite" -license="GPL-2" distfiles="https://github.com/drankinatty/gtkwrite/archive/v${version}.tar.gz" -checksum=bcca9e6dbdfafe9c77204ff0dee57678286fd9c5b6fd21e73d11b6652f0c076f +checksum=7d00a9124baa367f840b0cf2026d2d27f6fc41e4e0a01a7a293f5ebb91fd01dd # Without GtkSourceView it will compile as 'gtkedit' # With GtkSourceView it compiles as 'gtkwrite' From c617cb0d472a6ef4990d7587dbc5a432909ce5d1 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 10:31:30 +0200 Subject: [PATCH 157/759] youtube-dl: update to 2018.06.25. (#411) --- srcpkgs/youtube-dl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 7291c5f3f3e..15650f6bac8 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2018.06.19 +version=2018.06.25 revision=1 noarch=yes wrksrc="$pkgname" @@ -14,7 +14,7 @@ license="Public Domain" homepage="http://rg3.github.io/youtube-dl/" changelog="https://raw.githubusercontent.com/rg3/youtube-dl/master/ChangeLog" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=e68ff7b344d24ecc7714b6c91ddbb833c438ac3e654d9f8fbdb29e4c10ab427b +checksum=8e1e939eb3f679ae5f17db67abecec513e1fe78ecb5ae5aaed7b6368cc9e4ba2 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From c3af6abdd6adc447495eed3f54f8418002ce0e8c Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 12:08:20 +0200 Subject: [PATCH 158/759] amp: update to 0.4.0. (#414) --- srcpkgs/amp/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template index 12a5ee63009..300671a1158 100644 --- a/srcpkgs/amp/template +++ b/srcpkgs/amp/template @@ -1,16 +1,15 @@ # Template file for 'amp' pkgname=amp -version=0.3.4 -revision=2 -hostmakedepends="cargo git python3 pkg-config cmake perl" -makedepends="libxcb-devel libressl-devel zlib-devel libcurl-devel libssh2-devel - libgit2-devel" +version=0.4.0 +revision=1 +hostmakedepends="cargo cmake git perl pkg-config python3" +makedepends="libcurl-devel libgit2-devel libxcb-devel" short_desc="A complete text editor for your terminal" maintainer="Wilson Birney " -license="GPL-3" -homepage="https://github.com/jmacdonald/amp" +license="GPL-3.0-or-later" +homepage="https://amp.rs" distfiles="https://github.com/jmacdonald/amp/archive/${version}.tar.gz" -checksum=c950560292984d135ed5c92c87a2969a7b2b2d3ab97c5d4d5f66075edbc95169 +checksum=6bb6f5da2b14776f677a2ca7781eb82532181806975ecd92496c232ef3347266 nocross=yes do_build() { From 7c446f53657ff40d82fc88ec90c405aea3ed9b87 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 12:46:46 +0200 Subject: [PATCH 159/759] adapta-kde: update to 20180618. (#418) --- srcpkgs/adapta-kde/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adapta-kde/template b/srcpkgs/adapta-kde/template index 4bdc9b64239..7996a053e1d 100644 --- a/srcpkgs/adapta-kde/template +++ b/srcpkgs/adapta-kde/template @@ -1,6 +1,6 @@ # Template file for 'adapta-kde' pkgname=adapta-kde -version=20180512 +version=20180618 revision=1 build_style=fetch noarch=yes @@ -9,7 +9,7 @@ maintainer="Giuseppe Fierro " license="GPL-3.0-or-later" homepage="https://github.com/PapirusDevelopmentTeam/adapta-kde" distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz" -checksum=9a3e04798b537a1ed6be4bcbbede0ef1d4d0b81008e45a54f281adbb2c42050e +checksum=33a23e4fe7f2ed0c3e7f6ef57694d56aa6961d384306ccf5aea56777eb2b094a do_install() { tar xzf ${version}.tar.gz --strip 1 From 207bbf218468c32cefd15cafd0de6c9688aedf62 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Jun 2018 13:08:44 +0200 Subject: [PATCH 160/759] wireguard: update to 0.0.20180625. --- srcpkgs/wireguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index 0dbab2ad4b8..1f5dfbee880 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,6 +1,6 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20180620 +version=0.0.20180625 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.wireguard.com/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=b4db98ea751c8e667454f98ea1c15d704a784fe1bc093b03bd64575418a7c242 +checksum=d9bedeb22b1f83d48581608a6521fea1d429fbeb8809419d08703ef2ec570020 triggers="dkms" dkms_modules="wireguard ${version}" From 7cce72a8e3034d603cedd535ef7f5ea06756b06d Mon Sep 17 00:00:00 2001 From: Issam Maghni Date: Mon, 25 Jun 2018 23:34:21 -0400 Subject: [PATCH 161/759] pam_rundir: patching issue 2/3 --- srcpkgs/pam_rundir/patches/fix.diff | 21 +++++++++++++++++++++ srcpkgs/pam_rundir/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/pam_rundir/patches/fix.diff diff --git a/srcpkgs/pam_rundir/patches/fix.diff b/srcpkgs/pam_rundir/patches/fix.diff new file mode 100644 index 00000000000..859d1d4a8d9 --- /dev/null +++ b/srcpkgs/pam_rundir/patches/fix.diff @@ -0,0 +1,21 @@ +--- pam_rundir.c ++++ pam_rundir.c +@@ -24,6 +24,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -396,6 +398,9 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) + goto done; + } + ++ /* to bypass permission checks for mkdir, in case it isn't group ++ * writable */ ++ prctl (PR_SET_SECUREBITS, SECBIT_NO_SETUID_FIXUP); + /* set euid so if we do create the dir, it is own by the user */ + if (seteuid (pw->pw_uid) < 0) + { diff --git a/srcpkgs/pam_rundir/template b/srcpkgs/pam_rundir/template index 34149cb55f9..bff04fedd70 100644 --- a/srcpkgs/pam_rundir/template +++ b/srcpkgs/pam_rundir/template @@ -1,7 +1,7 @@ # Template file for 'pam_rundir-1.0.0' pkgname=pam_rundir version=1.0.0 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --with-parentdir=/run/user" makedepends="pam-devel" From 027edd3317309324b081fe150f186d4cfafcfcec Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Jun 2018 13:52:21 +0200 Subject: [PATCH 162/759] ImageMagick: fix perl module version. Closes #400. --- srcpkgs/ImageMagick/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 20d90027c70..5fba8f920ce 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -3,7 +3,7 @@ pkgname=ImageMagick _majorver=6.9.10 _patchver=0 version="${_majorver}.${_patchver}" -revision=1 +revision=2 wrksrc="${pkgname}-${_majorver}-${_patchver}" build_style=gnu-configure configure_args="--without-autotrace --with-wmf=yes @@ -34,6 +34,11 @@ if [ -z "$CROSS_BUILD" ]; then subpackages+=" libmagick-perl" fi +post_extract() { + sed -i '/VERSION/s/6\.9A/6.99/g' version.sh PerlMagick/Makefile.PL \ + PerlMagick/*/Makefile.PL PerlMagick/quantum/quantum.pm +} + pre_configure() { autoreconf -if } From 3298a8e04ba4d07f9a50b6739ff8a7af676cc454 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 9 Jun 2018 19:14:12 -0300 Subject: [PATCH 163/759] python-pytest: update to 3.6.2. --- srcpkgs/python-pytest/template | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/srcpkgs/python-pytest/template b/srcpkgs/python-pytest/template index 6aba00ac20b..8723a493e2a 100644 --- a/srcpkgs/python-pytest/template +++ b/srcpkgs/python-pytest/template @@ -1,7 +1,7 @@ # Template file for 'python-pytest' pkgname=python-pytest -version=3.6.0 -revision=2 +version=3.6.2 +revision=1 noarch=yes wrksrc="${pkgname/python-//}-${version}" build_style=python-module @@ -12,25 +12,19 @@ depends="python-atomicwrites python-attrs python-funcsigs python-more-itertools checkdepends="python3-atomicwrites python3-hypothesis python3-more-itertools python3-pluggy python3-py python3-atomicwrites" short_desc="Simple powerful testing with Python2" -maintainer="maxice8 " +maintainer="Orphaned " license="MIT" homepage="https://docs.pytest.org/en/latest/" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=39555d023af3200d004d09e51b4dd9fdd828baa863cded3fd6ba2f29f757ae2d +checksum=8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c alternatives=" pytest:pytest:/usr/bin/pytest2 pytest:py.test:/usr/bin/py.test2" -pre_build() { - sed -i setup.py \ - -e '/setup_requires=/d' \ - -e '/use_scm_version/,+2d' \ - -e "/name=/ a\ - version='${version}'," -} do_check() { python3 setup.py test } + post_install() { vlicense LICENSE } From bbca2661660917ef8d7bc043e0f076333d07a2fd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 29 May 2018 19:41:46 -0300 Subject: [PATCH 164/759] pipewire: modernize and split. --- common/shlibs | 4 +- srcpkgs/gstreamer1-pipewire | 1 + srcpkgs/libpipewire | 1 + srcpkgs/libspa-bluetooth | 1 + srcpkgs/libspa-ffmpeg | 1 + srcpkgs/libspa-lib | 1 + srcpkgs/libspa-lib-devel | 1 + srcpkgs/pipewire-doc | 1 + srcpkgs/pipewire/template | 79 ++++++++++++++++++++++++++++++------- 9 files changed, 74 insertions(+), 16 deletions(-) create mode 120000 srcpkgs/gstreamer1-pipewire create mode 120000 srcpkgs/libpipewire create mode 120000 srcpkgs/libspa-bluetooth create mode 120000 srcpkgs/libspa-ffmpeg create mode 120000 srcpkgs/libspa-lib create mode 120000 srcpkgs/libspa-lib-devel create mode 120000 srcpkgs/pipewire-doc diff --git a/common/shlibs b/common/shlibs index f6df50b287c..2e41ae5d206 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3146,8 +3146,8 @@ libarcan_shmif_server.so.0.11 arcan-0.5.4.3_1 libarcan_tui.so.0.11 arcan-0.5.4.3_1 libldm.so.1 linux-driver-management-1.0.1_1 liblwipv6.so.2 lwipv6-1.5a_1 -libpipewire-0.1.so.0 pipewire-0.1.7_1 -libspa-lib.so.0 pipewire-0.1.7_1 +libpipewire-0.1.so.0 libpipewire-0.1.9_1 +libspa-lib.so.0 libspa-lib-0.1.9_1 libvolk.so.1.4 volk-1.4_1 libgnuradio-runtime-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 libgnuradio-pmt-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1 diff --git a/srcpkgs/gstreamer1-pipewire b/srcpkgs/gstreamer1-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/gstreamer1-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libpipewire b/srcpkgs/libpipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libpipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-bluetooth b/srcpkgs/libspa-bluetooth new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-bluetooth @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-ffmpeg @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-lib b/srcpkgs/libspa-lib new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-lib @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libspa-lib-devel b/srcpkgs/libspa-lib-devel new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libspa-lib-devel @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/pipewire-doc b/srcpkgs/pipewire-doc new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/pipewire-doc @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index d60347d2f8a..9abfb0ceac1 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,27 +1,78 @@ # Template file for 'pipewire' pkgname=pipewire version=0.1.9 -revision=1 -configure_args="-Denable_man=true -Denable_gstreamer=false" +revision=2 +configure_args="-Denable_man=true -Denable_gstreamer=true -Denable_docs=true" build_style=meson -hostmakedepends="pkg-config xmltoman" -makedepends="dbus-devel jack-devel alsa-lib-devel v4l-utils-devel SDL2-devel - ffmpeg-devel libX11-devel" +hostmakedepends="doxygen graphviz pkg-config xmltoman" +makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel + sbc-devel v4l-utils-devel" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="maxice8 " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="https://pipewire.org/" distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" checksum=d7dc591d60c3544f3c24b2b0ab1db458991dd69d0610337fd0accf136373916b -# XXX: There is potential to further divide into more subpkgs one for libpipewire -# and another for libspa -pipewire-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" +libpipewire_package() { + short_desc+=" - pipewire library" pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" + vmove "usr/lib/libpipewire-0.1.so.*" + } +} + +pipewire-devel_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - pipewire development files" + pkg_install() { + vmove usr/include/pipewire + vmove usr/lib/pkgconfig/libpipewire-0.1.pc + vmove usr/lib/libpipewire-0.1.so + } +} + +libspa-lib_package() { + short_desc+=" - spa-lib library" + pkg_install() { + vmove "usr/lib/libspa-lib.so.*" + } +} + +libspa-lib-devel_package() { + depends="libspa-lib-${version}_${revision}" + short_desc+=" - spa-lib development files" + pkg_install() { + vmove usr/include/spa + vmove usr/lib/libspa-lib.so + vmove usr/lib/pkgconfig/libspa-0.1.pc + } +} + +libspa-ffmpeg_package() { + short_desc+=" - ffmpeg plugins" + pkg_install() { + vmove usr/lib/spa/ffmpeg + } +} + +libspa-bluetooth_package() { + short_desc+=" - bluetooth plugins" + pkg_install() { + vmove usr/lib/spa/bluez5 + } +} + +gstreamer1-pipewire_package() { + short_desc+=" - gstreamer plugin" + pkg_install() { + vmove usr/lib/gstreamer-1.0 + } +} + +pipewire-doc_package() { + noarch=yes + short_desc+=" - documentation" + pkg_install() { + vmove usr/share/doc } } From 7c8d2958b30d3792e2e510863fae01ee45ec748c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 29 May 2018 19:56:35 -0300 Subject: [PATCH 165/759] xdg-desktop-portal: rebuild against libpipewire.so.0. --- srcpkgs/xdg-desktop-portal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index 8b78ae3858a..81ddd9e9137 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,10 +1,10 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal version=0.11 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config glib-devel" -makedepends="flatpak-devel fuse-devel pipewire-devel" +makedepends="flatpak-devel fuse-devel pipewire-devel libspa-lib-devel" short_desc="Portal frontend service for Flatpak" maintainer="Duncaen " license="LGPL-2.1-or-later" From 6e74ab0517bc06936d196c2e377e2b51c13e933c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 09:30:43 -0300 Subject: [PATCH 166/759] elfutils: update to 0.172. --- .../patches/musl-canonicalize_file_name.patch | 22 ------------------ srcpkgs/elfutils/patches/musl-qsort_r.patch | 23 +++++++++++++------ srcpkgs/elfutils/template | 6 ++--- 3 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch diff --git a/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch b/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch deleted file mode 100644 index ccceb12b1aa..00000000000 --- a/srcpkgs/elfutils/patches/musl-canonicalize_file_name.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libdwfl/dwfl_build_id_find_elf.c 2015-10-12 12:22:58.000000000 +0200 -+++ libdwfl/dwfl_build_id_find_elf.c 2015-11-20 05:13:10.972994172 +0100 -@@ -94,7 +94,7 @@ - { - if (*file_name != NULL) - free (*file_name); -- *file_name = canonicalize_file_name (name); -+ *file_name = realpath (name, NULL); - if (*file_name == NULL) - { - *file_name = name; ---- libdwfl/find-debuginfo.c 2015-10-12 12:22:58.000000000 +0200 -+++ libdwfl/find-debuginfo.c 2015-11-20 05:18:56.990967176 +0100 -@@ -372,7 +372,7 @@ - /* If FILE_NAME is a symlink, the debug file might be associated - with the symlink target name instead. */ - -- char *canon = canonicalize_file_name (file_name); -+ char *canon = realpath (file_name, NULL); - if (canon != NULL && strcmp (file_name, canon)) - fd = find_debuginfo_in_path (mod, canon, - debuglink_file, debuglink_crc, diff --git a/srcpkgs/elfutils/patches/musl-qsort_r.patch b/srcpkgs/elfutils/patches/musl-qsort_r.patch index 0f3102dd905..10697d6023a 100644 --- a/srcpkgs/elfutils/patches/musl-qsort_r.patch +++ b/srcpkgs/elfutils/patches/musl-qsort_r.patch @@ -1,7 +1,7 @@ ---- src/readelf.c 2015-10-12 12:22:58.000000000 +0200 -+++ src/readelf.c 2015-11-20 08:11:32.945159213 +0100 -@@ -4366,10 +4366,11 @@ - return base; +--- src/readelf.c ++++ src/readelf.c +@@ -4773,10 +4773,11 @@ listptr_base (struct listptr *p) + return cudie_base (&cu); } +static const char *listptr_name; @@ -14,7 +14,7 @@ struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; -@@ -4385,21 +4386,21 @@ +@@ -4792,21 +4793,21 @@ compare_listptr (const void *a, const void *b, void *arg) p1->warned = p2->warned = true; error (0, 0, gettext ("%s %#" PRIx64 " used with different address sizes"), @@ -37,9 +37,18 @@ - name, (uint64_t) p1->offset); + listptr_name, (uint64_t) p1->offset); } + if (p1->attr != p2 ->attr) + { +@@ -4814,7 +4815,7 @@ compare_listptr (const void *a, const void *b, void *arg) + error (0, 0, + gettext ("%s %#" PRIx64 + " used with different attribute %s and %s"), +- name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), ++ listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr), + dwarf_attr_name (p2->attr)); + } } - -@@ -4464,9 +4465,11 @@ +@@ -4885,9 +4886,11 @@ notice_listptr (enum section_e section, struct listptr_table *table, static void sort_listptr (struct listptr_table *table, const char *name) { diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index e48c0950b92..3f4c6e84ebb 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,7 +1,7 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.170 -revision=2 +version=0.172 +revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" hostmakedepends="automake libtool" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066 +checksum=779c99e6344c4982bbab60b8d276cec3d468151c758905f9a44ba6b6edaa0e24 CFLAGS="-Wno-error" From e76b97ee9274e6421255c6705face17a83ffe3db Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 05:14:42 +0200 Subject: [PATCH 167/759] [ci skip] linux4.4: update to 4.4.138. --- srcpkgs/linux4.4/files/i386-dotconfig | 3 ++- srcpkgs/linux4.4/files/x86_64-dotconfig | 3 ++- srcpkgs/linux4.4/template | 17 ++++++----------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/srcpkgs/linux4.4/files/i386-dotconfig b/srcpkgs/linux4.4/files/i386-dotconfig index fb37a255aa8..8638ff2b5d7 100644 --- a/srcpkgs/linux4.4/files/i386-dotconfig +++ b/srcpkgs/linux4.4/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.130 Kernel Configuration +# Linux/i386 4.4.138 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -178,6 +178,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y diff --git a/srcpkgs/linux4.4/files/x86_64-dotconfig b/srcpkgs/linux4.4/files/x86_64-dotconfig index b54f418f853..bc36047a19c 100644 --- a/srcpkgs/linux4.4/files/x86_64-dotconfig +++ b/srcpkgs/linux4.4/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.130 Kernel Configuration +# Linux/x86_64 4.4.138 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -187,6 +187,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index c02ef349a8f..f9d02290058 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,14 +1,14 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.130 -revision=2 +version=4.4.138 +revision=1 wrksrc="linux-${version}" maintainer="Juan RP " homepage="https://www.kernel.org" -license="GPL-2" +license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=b29bdf90659deee725dd760096c5d86b69cde0e787e98efb75f1c32294434de5 +checksum=e6f9c64e17e0ba353e12fe97974319d6b633cd91e4f98144752c91c9372cc4ee nocross=yes nodebug=yes @@ -46,13 +46,8 @@ do_configure() { i686*) arch=i386;; x86_64*) arch=x86_64;; armv7*) arch=arm - # This file does not exist!? - # $XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x2/patch-${version}-armv7-x2.diff.gz - # gunzip patch-${version}-armv7-x2.diff.gz - # patch -Np1 -i patch-${version}-armv7-x2.diff - # Found the latest here: - $XBPS_FETCH_CMD http://rcn-ee.com/deb/zesty-armhf/v${version}-armv7-x15/patch-${version}-armv7-x15.diff.xz - unxz patch-${version}-armv7-x15.diff.xz + $XBPS_FETCH_CMD http://rcn-ee.com/deb/sid-armhf/v${version}-armv7-x15/patch-${version}-armv7-x15.diff.gz + gunzip patch-${version}-armv7-x15.diff.gz patch -Np1 -i patch-${version}-armv7-x15.diff ;; aarch64*) arch=arm64;; From b32e77fefda275c9c8c64f4cbad71a592a543060 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Fri, 22 Jun 2018 03:05:16 -0400 Subject: [PATCH 168/759] linux4.14: update to 4.14.52. [ci skip] --- srcpkgs/linux4.14/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index 9eb605ee91c..fd7b4914f1b 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -1,15 +1,15 @@ # Template file for 'linux4.14' pkgname=linux4.14 -version=4.14.49 +version=4.14.52 revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " homepage="http://www.kernel.org" -license="GPL-2" +license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=c69f49731ef392034a5d8816e2e2668bc8928878764d1c8caac37d00339d3bf7 +checksum=a5d226c7b2fd1eb0f01d56e4e2c6a0100784b68df907cc7317f32bde34f88810 nodebug=yes # -dbg package is generated below manually nostrip=yes From 3879c50b4b8b8a3e7a4b4d1bc94aaf727ae9b02a Mon Sep 17 00:00:00 2001 From: Martijn van Buul Date: Sat, 23 Jun 2018 09:16:16 +0200 Subject: [PATCH 169/759] linux4.17: Enable CONFIG_DRM_LOAD_EDID_FIRMARE for x86 and x86_64 Closes: #349 [via git-merge-pr] --- srcpkgs/linux4.17/files/i386-dotconfig | 2 +- srcpkgs/linux4.17/files/x86_64-dotconfig | 2 +- srcpkgs/linux4.17/template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.17/files/i386-dotconfig b/srcpkgs/linux4.17/files/i386-dotconfig index 4bd8ce78bbc..656f4c89329 100644 --- a/srcpkgs/linux4.17/files/i386-dotconfig +++ b/srcpkgs/linux4.17/files/i386-dotconfig @@ -5062,7 +5062,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y diff --git a/srcpkgs/linux4.17/files/x86_64-dotconfig b/srcpkgs/linux4.17/files/x86_64-dotconfig index 1c173a8f2ae..3b3f73ee67d 100644 --- a/srcpkgs/linux4.17/files/x86_64-dotconfig +++ b/srcpkgs/linux4.17/files/x86_64-dotconfig @@ -5136,7 +5136,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y diff --git a/srcpkgs/linux4.17/template b/srcpkgs/linux4.17/template index 58b30fe32ea..dd7a000d135 100644 --- a/srcpkgs/linux4.17/template +++ b/srcpkgs/linux4.17/template @@ -1,7 +1,7 @@ # Template file for 'linux4.17' pkgname=linux4.17 version=4.17.1 -revision=1 +revision=2 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " From 888f94c78bd0a402447fcb07d234b8863b8b5ba7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 26 Jun 2018 14:14:45 +0200 Subject: [PATCH 170/759] linux4.17: update to 4.17.3. Closes #206. --- .../linux4.17/patches/gpd-win-2-goodix.patch | 26 -------------- .../linux4.17/patches/gpd-win-2-xpad.patch | 34 ------------------- srcpkgs/linux4.17/template | 6 ++-- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch delete mode 100644 srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch diff --git a/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch b/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch deleted file mode 100644 index 4ea2e4e3de1..00000000000 --- a/srcpkgs/linux4.17/patches/gpd-win-2-goodix.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit ec62ab71dab19c079bd689e907bbb0e3ce5b546f -Author: Ethan Lee -Date: Thu May 31 16:13:17 2018 -0700 - - Input: goodix - add new ACPI id for GPD Win 2 touch screen - - GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp - - Tested on a unit from the first production run sent to Indiegogo backers - - Signed-off-by: Ethan Lee - Cc: stable@vger.kernel.org - Signed-off-by: Dmitry Torokhov - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 9736c83dd418..f2d9c2c41885 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -933,6 +933,7 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id); - #ifdef CONFIG_ACPI - static const struct acpi_device_id goodix_acpi_match[] = { - { "GDIX1001", 0 }, -+ { "GDIX1002", 0 }, - { } - }; - MODULE_DEVICE_TABLE(acpi, goodix_acpi_match); diff --git a/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch b/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch deleted file mode 100644 index 0051c49766d..00000000000 --- a/srcpkgs/linux4.17/patches/gpd-win-2-xpad.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3e8a4c1a96a49ab258307132a641631ac7462fcf (HEAD) -Author: Ethan Lee -Date: Fri Jun 1 11:46:08 2018 -0700 - - Input: xpad - add GPD Win 2 Controller USB IDs - - GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp - - Tested on a unit from the first production run sent to Indiegogo backers - - Signed-off-by: Ethan Lee - Cc: stable@vger.kernel.org - Signed-off-by: Dmitry Torokhov - -diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c -index 06e9650b3b30..a89b81b35932 100644 ---- a/drivers/input/joystick/xpad.c -+++ b/drivers/input/joystick/xpad.c -@@ -123,6 +123,7 @@ static const struct xpad_device { - u8 mapping; - u8 xtype; - } xpad_device[] = { -+ { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, - { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, - { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, - { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, -@@ -409,6 +410,7 @@ static const signed short xpad_abs_triggers[] = { - - static const struct usb_device_id xpad_table[] = { - { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ -+ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ - XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ - XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ - XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ diff --git a/srcpkgs/linux4.17/template b/srcpkgs/linux4.17/template index dd7a000d135..9647c21031d 100644 --- a/srcpkgs/linux4.17/template +++ b/srcpkgs/linux4.17/template @@ -1,7 +1,7 @@ # Template file for 'linux4.17' pkgname=linux4.17 -version=4.17.1 -revision=2 +version=4.17.3 +revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=c93f3fbcbce66b7ed51e1d33d669b0ad56dd5088c23ea77fb8925b328faa7070 +checksum=af32ab2427cd0916c030c751b6b8fd4e72b7359feefd642aefad74838e921ffd nodebug=yes # -dbg package is generated below manually nostrip=yes From 30b1415eaabf41c53786f030edaac55dc189cb98 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 09:53:36 -0300 Subject: [PATCH 171/759] toxcore: update to 0.2.3. --- srcpkgs/toxcore/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template index 3128748e528..2f2bd66c379 100644 --- a/srcpkgs/toxcore/template +++ b/srcpkgs/toxcore/template @@ -1,6 +1,6 @@ # Template file for 'toxcore' pkgname=toxcore -version=0.2.2 +version=0.2.3 revision=1 wrksrc="c-toxcore-${version}" configure_args="-DMUST_BUILD_TOXAV=ON -DBUILD_TOXAV=ON -DDHT_BOOTSTARP=OFF @@ -12,8 +12,9 @@ short_desc="Encrypted peer-to-peer instant messenger protocol library" maintainer="Spencer Hill " license="GPL-3.0-or-later" homepage="https://tox.chat" +changelog="https://raw.githubusercontent.com/TokTok/c-toxcore/master/CHANGELOG.md" distfiles="https://github.com/TokTok/c-toxcore/archive/v${version}.tar.gz" -checksum=a3b25d8bd92b9526b47ba1f60a2893d2154a80bb7ae690f44b5a2dea41c76ea1 +checksum=22c52f286c46d3f802edb6978bcf2a53f8301363e2b745784613427a33ba3a34 post_install() { vsconf other/bootstrap_daemon/tox-bootstrapd.conf @@ -24,7 +25,7 @@ toxcore-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a + vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } From 341f83b96e8a9c3841837152bbaa6c131a17837f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 10:11:53 -0300 Subject: [PATCH 172/759] newsboat: update to r2.12. --- srcpkgs/newsboat/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template index a7258ee602a..f37a51bb0a6 100644 --- a/srcpkgs/newsboat/template +++ b/srcpkgs/newsboat/template @@ -1,6 +1,6 @@ # Template file for 'newsboat' pkgname=newsboat -version=r2.11.1 +version=r2.12 revision=1 build_style=configure configure_script="./config.sh" @@ -11,9 +11,10 @@ makedepends="json-c-devel libcurl-devel libxml2-devel sqlite-devel stfl-devel" short_desc="Newsboat is a fork of Newsbeuter the Mutt of RSS feed readers" maintainer="maxice8 " license="MIT" -homepage="http://www.newsboat.org" +homepage="https://www.newsboat.org" +changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md" distfiles="https://github.com/newsboat/newsboat/archive/${version}.tar.gz" -checksum=0c48ec60e1abafd7b62cf8e376eff9e92dcb7bbc6e7dfed9b9ac141853d826d8 +checksum=8f2f511703d3218ab195fa48dc94306f5e13ceff86d94dcf78d917cb57090c88 make_build_target="all doc" CXXFLAGS=" -Wno-error=sign-compare" @@ -38,5 +39,4 @@ post_install() { vlicense LICENSE vsconf doc/example-bookmark-plugin.sh bookmark-plugin.sh mv "${DESTDIR}/usr/share/doc/$pkgname/examples/config" "${DESTDIR}/usr/share/examples/${pkgname}" - } From 19aae4127d56bff716f219b51b3eb393a97d1f08 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 18 Jun 2018 08:06:44 -0300 Subject: [PATCH 173/759] lvm2: update to 2.02.178. --- srcpkgs/lvm2/template | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 6f3f3a256cd..ccb88b249e1 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,7 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 -version=2.02.177 -revision=2 +version=2.02.178 +revision=1 wrksrc="LVM2.${version}" build_style=gnu-configure configure_args="--disable-selinux --enable-readline --enable-pkgconfig @@ -11,18 +11,19 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm --with-default-locking-dir=/run/lock/lvm" hostmakedepends="pkg-config" -makedepends="libblkid-devel libuuid-devel readline-devel eudev-libudev-devel" +makedepends="eudev-libudev-devel libaio-devel libblkid-devel readline-devel" depends="thin-provisioning-tools" +short_desc="Logical Volume Manager 2 utilities" +maintainer="Juan RP " +license="GPL-2.0-only, LGPL-2.1-only" +homepage="https://sourceware.org/lvm2/" +changelog="https://abi-laboratory.pro/?view=changelog&l=lvm2&v=${version}" +distfiles="https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${version}.tgz" +checksum=88fff4526c10830fa8c1cb490999fafba71746203b81f7d0421a14d0213d33f9 +conf_files="/etc/lvm/lvm.conf" make_dirs=" /etc/lvm/archive 0755 root root /etc/lvm/backup 0755 root root" -conf_files="/etc/lvm/lvm.conf" -short_desc="Logical Volume Manager 2 utilities" -maintainer="Juan RP " -homepage="http://sourceware.org/lvm2/" -license="GPL-2, LGPL-2.1" -distfiles="https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${version}.tgz" -checksum=4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2 case $XBPS_TARGET_MACHINE in *-musl) @@ -69,6 +70,7 @@ device-mapper-devel_package() { esac } } + device-mapper_package() { short_desc="Device Mapper userspace library and tools" pkg_install() { @@ -83,8 +85,10 @@ device-mapper_package() { vsv dmeventd } } + liblvm2app-devel_package() { - depends="device-mapper-devel>=${version}_${revision} libblkid-devel liblvm2app>=${version}_${revision}" + depends="device-mapper-devel-${version}_${revision} libblkid-devel + liblvm2app-${version}_${revision}" short_desc="LVM2 application library - development files" pkg_install() { vmove usr/include/lvm2app.h @@ -92,6 +96,7 @@ liblvm2app-devel_package() { vmove usr/lib/liblvm2app.so } } + liblvm2app_package() { short_desc="LVM2 application library" pkg_install() { From e57aef15bff0943a6c21ff2026d862f99b83ccde Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 19 Jun 2018 02:58:32 -0300 Subject: [PATCH 174/759] attr: update to 2.4.48. --- .../patches/escape-left-brace-regex.patch | 11 ++++ .../attr/patches/xattr_h_portability.patch | 55 ------------------- srcpkgs/attr/template | 24 +++----- 3 files changed, 20 insertions(+), 70 deletions(-) create mode 100644 srcpkgs/attr/patches/escape-left-brace-regex.patch delete mode 100644 srcpkgs/attr/patches/xattr_h_portability.patch diff --git a/srcpkgs/attr/patches/escape-left-brace-regex.patch b/srcpkgs/attr/patches/escape-left-brace-regex.patch new file mode 100644 index 00000000000..5c91bba818a --- /dev/null +++ b/srcpkgs/attr/patches/escape-left-brace-regex.patch @@ -0,0 +1,11 @@ +--- test/run ++++ test/run +@@ -106,7 +106,7 @@ for (;;) { + if (defined $line) { + # Substitute %VAR and %{VAR} with environment variables. + $line =~ s[%(\w+)][$ENV{$1}]eg; +- $line =~ s[%{(\w+)}][$ENV{$1}]eg; ++ $line =~ s[%\{(\w+)}][$ENV{$1}]eg; + } + if (defined $line) { + if ($line =~ s/^\s*< ?//) { diff --git a/srcpkgs/attr/patches/xattr_h_portability.patch b/srcpkgs/attr/patches/xattr_h_portability.patch deleted file mode 100644 index 14e97638217..00000000000 --- a/srcpkgs/attr/patches/xattr_h_portability.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- include/xattr.h.orig 2013-03-01 20:24:44.620880695 +0100 -+++ include/xattr.h 2013-03-01 20:26:28.802885344 +0100 -@@ -31,33 +31,37 @@ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - extern int lsetxattr (const char *__path, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - extern int fsetxattr (int __filedes, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - - extern ssize_t getxattr (const char *__path, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - extern ssize_t lgetxattr (const char *__path, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - extern ssize_t fgetxattr (int __filedes, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - - extern ssize_t listxattr (const char *__path, char *__list, -- size_t __size) __THROW; -+ size_t __size); - extern ssize_t llistxattr (const char *__path, char *__list, -- size_t __size) __THROW; -+ size_t __size); - extern ssize_t flistxattr (int __filedes, char *__list, -- size_t __size) __THROW; -+ size_t __size); - --extern int removexattr (const char *__path, const char *__name) __THROW; --extern int lremovexattr (const char *__path, const char *__name) __THROW; --extern int fremovexattr (int __filedes, const char *__name) __THROW; -- --__END_DECLS -+extern int removexattr (const char *__path, const char *__name); -+extern int lremovexattr (const char *__path, const char *__name); -+extern int fremovexattr (int __filedes, const char *__name); -+ -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template index 8ee2447e361..cf2c075fbf6 100644 --- a/srcpkgs/attr/template +++ b/srcpkgs/attr/template @@ -1,19 +1,19 @@ # Template file for 'attr' pkgname=attr -version=2.4.47 -revision=7 +version=2.4.48 +revision=1 bootstrap=yes build_style=gnu-configure checkdepends="perl" configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" short_desc="Extended attribute support library for ACL support" maintainer="Juan RP " +license="LGPL-2.1-or-later" homepage="http://savannah.nongnu.org/projects/attr" -license="LGPL-2.1" -distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz" -checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 +distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz" +checksum=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 make_check_args="-j1" # Tests broken when ran in parallel -make_check_target="tests" +conf_files="/etc/xattr.conf" # The included libtool is rotten and only works with bash; easiest fix. export CONFIG_SHELL=/bin/bash @@ -23,8 +23,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then fi pre_check() { - sed -i 's:{(:\\{(:' test/run - # Either the test wasn't updated or the package misconfigures/miscompiles # the error message in musl based systems # EXPECTED: Operation not supported @@ -34,23 +32,19 @@ pre_check() { esac } -do_install() { - make DIST_ROOT=${DESTDIR} install install-lib install-dev -} - attr-devel_package() { - depends="attr>=${version}_${revision}" + depends="attr-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.so" - vmove usr/share/man/man2 vmove usr/share/man/man3 - vmove usr/share/man/man5 vmove usr/share/doc + vmove usr/lib/pkgconfig } } + attr-progs_package() { short_desc+=" - utilities" pkg_install() { From d8446fdb2e9ad7e5f2f66a87619719bc58b68bbf Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 26 Jun 2018 17:06:44 +0200 Subject: [PATCH 175/759] libinput: fix segfault when calling libinput list-devices --- .../patches/fix-null-derefencing.patch | 59 +++++++++++++++++++ srcpkgs/libinput/template | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libinput/patches/fix-null-derefencing.patch diff --git a/srcpkgs/libinput/patches/fix-null-derefencing.patch b/srcpkgs/libinput/patches/fix-null-derefencing.patch new file mode 100644 index 00000000000..3a14e571334 --- /dev/null +++ b/srcpkgs/libinput/patches/fix-null-derefencing.patch @@ -0,0 +1,59 @@ +From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 20 Jun 2018 07:56:05 +1000 +Subject: [PATCH] tools: pass a valid grab parameter to list-devices + +My kingdome for a compiler warning. Or a scan-build warning. Or a coverity +warning. Or anything... But no, nothing. + +Also make the open_restricted() more robust to a NULL userdata, because +effectively that's what we were passing here. + +Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/50 + +Introduced in 0a13223c39fdf0f079715bf83d498c0dcd9cf4f8 + +Signed-off-by: Peter Hutterer +--- + tools/libinput-list-devices.c | 3 ++- + tools/shared.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c +index aa225ca..4cbdf77 100644 +--- tools/libinput-list-devices.c ++++ tools/libinput-list-devices.c +@@ -372,6 +372,7 @@ main(int argc, char **argv) + { + struct libinput *li; + struct libinput_event *ev; ++ bool grab = false; + + /* This is kept for backwards-compatibility with the old + libinput-list-devices */ +@@ -388,7 +389,7 @@ main(int argc, char **argv) + } + } + +- li = tools_open_backend(BACKEND_UDEV, "seat0", false, false); ++ li = tools_open_backend(BACKEND_UDEV, "seat0", false, &grab); + if (!li) + return 1; + +diff --git a/tools/shared.c b/tools/shared.c +index d1f0270..d3fb629 100644 +--- tools/shared.c ++++ tools/shared.c +@@ -232,7 +232,7 @@ open_restricted(const char *path, int flags, void *user_data) + if (fd < 0) + fprintf(stderr, "Failed to open %s (%s)\n", + path, strerror(errno)); +- else if (*grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) ++ else if (grab && *grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) + fprintf(stderr, "Grab requested, but failed for %s (%s)\n", + path, strerror(errno)); + +-- +libgit2 0.27.1 + + diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index 21079753af8..9ad80ae7315 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,7 +1,7 @@ # Template file for 'libinput' pkgname=libinput version=1.11.1 -revision=1 +revision=2 build_style=meson configure_args="-Ddebug-gui=false -Ddocumentation=false" hostmakedepends="pkg-config valgrind" From d622332b8c4135f47944331a508e34d6efa54ee6 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 20:24:53 +0200 Subject: [PATCH 176/759] nestopia: update to 1.49. (#424) --- srcpkgs/nestopia/template | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/srcpkgs/nestopia/template b/srcpkgs/nestopia/template index 18c73821448..236bd372ecd 100644 --- a/srcpkgs/nestopia/template +++ b/srcpkgs/nestopia/template @@ -1,15 +1,18 @@ # Template file for 'nestopia' pkgname=nestopia -version=1.48 +version=1.49 revision=1 -wrksrc="rdanbrook-nestopia-f0540f9" -build_style=cmake -hostmakedepends="pkg-config" -makedepends="SDL2-devel gtk+3-devel glu-devel libarchive-devel libao-devel" -depends="desktop-file-utils" -short_desc="NES/Famicom emulator designed to emulate the NES hardware accurately" +build_style=gnu-configure +hostmakedepends="autoconf-archive automake pkg-config" +makedepends="SDL2-devel gtk+3-devel libao-devel libarchive-devel" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Portable NES/Famicom emulator written in C++" maintainer="Juan RP " -license="GPL-2" -homepage="http://nestopia.sourceforge.net/" -distfiles="https://github.com/rdanbrook/nestopia/tarball/${version}>${pkgname}-${version}.tar.gz" -checksum=ee14b9476748669ac1af73116beb2a6e3dd6b41c0b1d2f7149fb8716bb02d749 +license="GPL-2.0-only" +homepage="http://0ldsk00l.ca/nestopia/" +distfiles="https://github.com/0ldsk00l/nestopia/archive/${version}.tar.gz" +checksum=c5a8b5e74a904c4e624152f8dfa081bdd7991796a24439811fc518564aa04b55 + +pre_configure() { + autoreconf -vif +} From e81763babfb6669d15f3006aadd52a5fded5fb96 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 22:04:27 +0200 Subject: [PATCH 177/759] firefox-esr: update to 52.9.0. (#435) --- srcpkgs/firefox-esr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 7d5b742eb30..b9cb667b7f8 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n". # pkgname=firefox-esr -version=52.8.1 +version=52.9.0 revision=1 wrksrc="firefox-${version}esr" short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)" @@ -11,7 +11,7 @@ maintainer="Eivind Uggedal " homepage="https://www.mozilla.org/firefox/organizations/" license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=487b4b7fe9a4aeb4dfd63991030b5df47d73f7a17ef917ba1036055f0049cf7b +checksum=c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6 lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm From bcea18f0a9d71068d64e5cc9ce48f85fd3e691e3 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 00:30:11 +0200 Subject: [PATCH 178/759] inxi: update to 3.0.13. (#441) --- srcpkgs/inxi/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template index a0b02610253..55935c1f655 100644 --- a/srcpkgs/inxi/template +++ b/srcpkgs/inxi/template @@ -1,16 +1,16 @@ # Template file for 'inxi' pkgname=inxi -version=3.0.07.1 +version=3.0.13 revision=1 -wrksrc=inxi-${version/.1/-1} +wrksrc="inxi-${version}-1" noarch=yes depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr" short_desc="Full featured system information script" maintainer="Juan RP " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://smxi.org/docs/inxi.htm" -distfiles="https://github.com/smxi/inxi/archive/${version/.1/-1}.tar.gz" -checksum=72ed009c882d25f7324e3d51ad61407d639b6fbfe9c50be97122b7dda0eb7b9e +distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz" +checksum=66f2d61a7862aa5f78f2f6962258cb82fcd5f5db287b76851560cf51512a39bf do_install() { vbin inxi From a7bee178e0941b56c5b9052d3456176264e5506f Mon Sep 17 00:00:00 2001 From: travankor <38744110+travankor@users.noreply.github.com> Date: Tue, 26 Jun 2018 16:20:44 -0700 Subject: [PATCH 179/759] rtv: update to 1.23.0. (#442) --- srcpkgs/rtv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template index e3e265012a8..faa5f48f50e 100644 --- a/srcpkgs/rtv/template +++ b/srcpkgs/rtv/template @@ -1,6 +1,6 @@ # Template file for 'rtv' pkgname=rtv -version=1.22.1 +version=1.23.0 revision=1 noarch=yes build_style=python3-module @@ -12,7 +12,7 @@ maintainer="dleeram " license="MIT" homepage="https://github.com/michael-lazar/${pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=77c9bbd0e8cd85b6c2daad7b6674d1865f06bfde0a5c2557e12ef1dc1acb2789 +checksum=66d458c37bdf377b191c899311b6b08da73312635e472cc0f55b510ad8293619 post_install() { vlicense LICENSE From b2c58f128a86d9c991fe1a308e7fb5490c172590 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Wed, 27 Jun 2018 01:37:40 +0200 Subject: [PATCH 180/759] New package: goodvibes-0.3.7 (#419) resolves #413 --- srcpkgs/goodvibes/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/goodvibes/template diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template new file mode 100644 index 00000000000..50372d64b7b --- /dev/null +++ b/srcpkgs/goodvibes/template @@ -0,0 +1,21 @@ +# Template file for 'goodvibes' +pkgname=goodvibes +version=0.3.7 +revision=1 +wrksrc="goodvibes-v${version}" +build_style=gnu-configure +hostmakedepends="automake gettext-devel glib-devel pkg-config" +makedepends="dconf-devel gst-plugins-base1-devel gtk+3-devel libkeybinder3-devel + libsoup-devel" +depends="desktop-file-utils hicolor-icon-theme" +short_desc="Light and simple internet radio player" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://gitlab.com/goodvibes/goodvibes" +changelog="https://gitlab.com/goodvibes/goodvibes/raw/v${version}/NEWS" +distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz" +checksum=8d215198ed789c69b7e08b739eb70adc9f4bd14af1cc69e286329c543c5cff91 + +pre_configure() { + ./autogen.sh +} From 59c17d23e0150823943f0d2f74442edfa350533e Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 02:14:20 +0200 Subject: [PATCH 181/759] vivaldi: update to 1.15.1147.47. (#444) --- srcpkgs/vivaldi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 0bfd67464e8..781cfc79015 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=1.14.1077.60 +version=1.15.1147.47 revision=1 _release=1 only_for_archs="i686 x86_64" @@ -15,10 +15,10 @@ nostrip=yes if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _debarch=amd64 - checksum=3352630a043b7ea7f769dfe8355378a72339bc9d98331b108c108b29eabbafbe + checksum=94a3efe2af7dbf7c1f79a2b9503d71615cb797fe38f263189489b53ee2c9da14 else _debarch=i386 - checksum=e8861873cc7634f2611d304e300df63eb80382cf2821d21991e0822c696df596 + checksum=bd4e9f88161890fdb964da643933350a7d496f3eff61d78c001eeae2c76cf084 fi distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb" From b5291cc219ca61338c85a0855a96210f52277e38 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 02:31:04 +0200 Subject: [PATCH 182/759] pianobar: update to 2018.06.22. (#420) --- srcpkgs/pianobar/template | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index 30c06748cd7..c0d1ad5d3d4 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,20 +1,18 @@ # Template file for 'pianobar' pkgname=pianobar -version=2017.08.30 -revision=3 +version=2018.06.22 +revision=1 +build_style=gnu-makefile +make_build_args="V=1" hostmakedepends="pkg-config" -makedepends="libcurl-devel faad2-devel libao-devel gnutls-devel libgcrypt-devel json-c-devel ffmpeg-devel" -short_desc="A free/open-source, console-based client for Pandora radio" +makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel libcurl-devel" +short_desc="Free/open-source, console-based client for Pandora radio" maintainer="Juan RP " license="MIT" -homepage="http://6xq.net/projects/pianobar/" +homepage="https://6xq.net/pianobar/" distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz" -checksum=d164416e01cb0f1fd05fd9db20aa75f42659d71acbe50375e7f3f894e3de66e0 +checksum=a616ef70c04ceea8294caaba091d6a16bf35293bdc587151a235fb0e6a00ad90 -do_build() { - make CC="$CC -std=c99" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" V=1 ${makejobs} -} -do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install - vlicense COPYING LICENSE +post_install() { + vlicense COPYING } From 04ebcb0c194ce37638b6098527c570f998ccca40 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 02:44:25 +0200 Subject: [PATCH 183/759] syncplay: update to 1.5.3. (#415) --- srcpkgs/syncplay/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template index eaa96192196..817082cc816 100644 --- a/srcpkgs/syncplay/template +++ b/srcpkgs/syncplay/template @@ -1,14 +1,20 @@ # Template file for 'syncplay' pkgname=syncplay -version=1.5.2 -revision=2 +version=1.5.3 +revision=1 noarch=yes build_style=gnu-makefile pycompile_dirs="usr/lib/syncplay/syncplay" -depends="python-pyside python-Twisted" +depends="desktop-file-utils python-pyside python-Twisted" short_desc="Free software that synchronises media players" maintainer="KeepBotting " license="Apache-2.0" homepage="https://syncplay.pl/" distfiles="https://github.com/syncplay/syncplay/archive/v${version}.tar.gz" -checksum=8a6a6e73b28e842230b4deef3b031f8ebeea5e30ffca393f2c4f8de207c6f428 +checksum=db7dff9362645e7ed1f79eb5c70a742a8ffb6f52c9412def6766c2a9a55260fa + +post_install() { + for res in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do + rm -rf ${DESTDIR}/usr/share/icons/${res} + done +} From 22b1bca4ef4450c4be50c73b4cec9b5197cde386 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Wed, 27 Jun 2018 03:29:53 +0200 Subject: [PATCH 184/759] intellij-idea-community-edition: update to 2018.1.5. (#181) --- srcpkgs/intellij-idea-community-edition/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template index 8fadf5fc9ba..dd767dd4c40 100644 --- a/srcpkgs/intellij-idea-community-edition/template +++ b/srcpkgs/intellij-idea-community-edition/template @@ -1,6 +1,6 @@ # Template file for 'intellij-idea-community-edition' pkgname=intellij-idea-community-edition -version=2018.1.4 +version=2018.1.5 revision=1 depends="virtual?java-environment giflib libXtst" short_desc="Java integrated development environment by JetBrains" @@ -8,7 +8,7 @@ maintainer="Adrian Siekierka " license="Apache-2.0" homepage="https://www.jetbrains.org/" distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jdk.tar.gz" -checksum=a31f0e08d718df6794e178e299cc41b16b62127d431a32b9a17568e7fb4b6c33 +checksum=d819ae48bc96f4bf6864e9d9a3e28880639bafd0e4e7be4347b907b3ffd763ad repository=nonfree nopie=yes only_for_archs="i686 x86_64" From 7a200785a3ca5404809e98cfcb69a3578827c6cd Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 03:51:04 +0200 Subject: [PATCH 185/759] tectonic: update to 0.1.8. (#409) --- srcpkgs/tectonic/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template index c1b70f7a21b..2a76177391d 100644 --- a/srcpkgs/tectonic/template +++ b/srcpkgs/tectonic/template @@ -1,15 +1,15 @@ -#template file for 'tectonic' +# Template file for 'tectonic' pkgname=tectonic -version=0.1.7 -revision=4 -hostmakedepends="rust cargo pkg-config" -makedepends="fontconfig-devel freetype-devel harfbuzz-devel graphite-devel libressl-devel libpng-devel zlib-devel icu-devel icu-libs" -short_desc="A modernized, complete, self-contained TeX/LaTeX engine" +version=0.1.8 +revision=1 +hostmakedepends="cargo pkg-config" +makedepends="harfbuzz-devel libressl-devel" +short_desc="Modernized, complete, self-contained TeX/LaTeX engine" maintainer="Chinmay Pai " license="MIT" homepage="https://tectonic-typesetting.github.io" distfiles="https://github.com/tectonic-typesetting/${pkgname}/archive/v${version}.tar.gz" -checksum=c39acc8a4e2e102245037fd2ea3e77b058d25e29bbab0dcc53a3167c5d3fee2a +checksum=e979988f89714e04e45caa894796ebce66e4ecba05bad8a9af0c323f574ed6af nocross=yes do_build() { From 35fa3d0c3d9dcf8734d75c84933d635c91b51967 Mon Sep 17 00:00:00 2001 From: guglicap Date: Wed, 27 Jun 2018 04:08:16 +0200 Subject: [PATCH 186/759] discord-ptb: update to 0.0.9 (#254) --- srcpkgs/discord-ptb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index fe4ef716e9d..ae28bc622e0 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -1,6 +1,6 @@ # Template file for 'discord-ptb' pkgname="discord-ptb" -version=0.0.8 +version=0.0.9 revision=1 wrksrc="DiscordPTB" depends="alsa-lib dbus-glib gtk+3 GConf libnotify nss libXtst libcxx libatomic" @@ -13,7 +13,7 @@ maintainer="Abel Graham " license="proprietary" homepage="https://discordapp.com/" distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz" -checksum=81db9f2b39c980cdc2537831c3bbd60aba615f423b76d9eed0788459f99e6bd2 +checksum=372d6f75203626370218c97c21519b779e5af334177cafa65a5655e357c77520 do_install() { local package_location="usr/lib/$pkgname" item From 90f3ccea0539bf1d842d1faf4681fcba0df89429 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 04:20:41 +0200 Subject: [PATCH 187/759] xreader: update to 1.8.4. (#445) --- srcpkgs/xreader/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template index c1bbfdc4673..7306d8bbee6 100644 --- a/srcpkgs/xreader/template +++ b/srcpkgs/xreader/template @@ -1,6 +1,6 @@ # Template file for 'xreader' pkgname=xreader -version=1.8.3 +version=1.8.4 revision=1 build_style=gnu-configure configure_args="--disable-introspection --disable-thumbnailer" @@ -13,7 +13,7 @@ maintainer="cr6git " license="GPL-2.0-or-later" homepage="https://github.com/linuxmint/xreader" distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz" -checksum=ab9b391aa8ca576165075ff8262981f737b35849a765001f90bd867267169ced +checksum=ed0b16bab5a48c7f5c3cdad96cebe67a013a81812224f42caeb0cd6a5258922c pre_configure() { NOCONFIGURE=1 ./autogen.sh From c00702aa886100b746f4ed681c328a14382ef679 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 05:06:16 +0200 Subject: [PATCH 188/759] nim: forgotten revision bump (#449) --- srcpkgs/nim/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index f057b17ad22..38d0384e14b 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -1,7 +1,7 @@ # Template file for 'nim' pkgname=nim version=0.18.0 -revision=1 +revision=2 _cversion=0.18.0 _nimbleversion=0.8.10 depends="gcc" From c15285852c2492dfd413a3b8b4cd52dad30c6390 Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Wed, 27 Jun 2018 05:13:51 +0200 Subject: [PATCH 189/759] minio: update to 2018.06.22. (#437) --- srcpkgs/minio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template index bae6acbab4b..6b028ee3292 100644 --- a/srcpkgs/minio/template +++ b/srcpkgs/minio/template @@ -1,8 +1,8 @@ # Template file for 'minio' pkgname=minio -version=2018.06.09 +version=2018.06.22 revision=1 -_version="${version//./-}T03-43-35Z" +_version="${version//./-}T23-48-46Z" wrksrc=${pkgname}-RELEASE.${_version} build_style=go hostmakedepends="git" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://github.com/minio/minio" go_import_path="github.com/minio/minio" distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz" -checksum=b37d23501bf8a34f6fc72a27421b6bfc9242ca4ee95037880b8035d76a91f173 +checksum=4fdcfaff5979e24c3a7e5c8f580bcf36acc8c87d903534d59c773ee0b6b0ec7a system_accounts="_minio" _minio_homedir="/var/lib/minio" _minio_descr="Minio Daemon User" From b9d1127ccf4ba2c8388ea6974e615169329a31b3 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 05:18:14 +0200 Subject: [PATCH 190/759] jenkins: update to 2.121.1. (#412) --- srcpkgs/jenkins/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/jenkins/template b/srcpkgs/jenkins/template index 1b5c16e53a0..f4e37104dde 100644 --- a/srcpkgs/jenkins/template +++ b/srcpkgs/jenkins/template @@ -1,6 +1,6 @@ # Template file for 'jenkins' pkgname=jenkins -version=2.109 +version=2.121.1 revision=1 build_style=fetch depends="virtual?java-runtime" @@ -8,8 +8,8 @@ short_desc="Open source automation server" maintainer="Renato Aguiar " license="MIT" homepage="https://jenkins.io/" -distfiles="http://mirrors.jenkins-ci.org/war/${version}/jenkins.war" -checksum=90ecc4fa84e6d78182d9616aa567164f29741a8025d159c71bad37fe2ac6aed4 +distfiles="http://mirrors.jenkins.io/war-stable/${version}/jenkins.war" +checksum=5bb075b81a3929ceada4e960049e37df5f15a1e3cfc9dc24d749858e70b48919 # Create 'jenkins' user system_accounts="jenkins" jenkins_homedir="/var/lib/jenkins" From 990c5878d8948ac557161a725af1a6cb13438c20 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 26 Jun 2018 22:22:25 -0500 Subject: [PATCH 191/759] sdb: update to 1.1.0 (#372) - Remove unneeded entry from shlibs --- common/shlibs | 1 - srcpkgs/sdb/template | 19 ++++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2e41ae5d206..25d27bbdf35 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1285,7 +1285,6 @@ libzzipmmapped-0.so.13 zziplib-0.13.62_1 libkworkspace5.so.5 plasma-workspace-5.8.4_1 libdb-5.3.so libdb-5.3.21_1 libdb_cxx-5.3.so libdb-cxx-5.3.21_1 -libsdb.so.0 sdb-0.6.2_1 libcares.so.2 c-ares-1.10.0_1 libcryptopp.so.5.6 crypto++-565_1 libqzeitgeist.so.1 libqzeitgeist-0.8.0_1 diff --git a/srcpkgs/sdb/template b/srcpkgs/sdb/template index 86056f2b92c..c573ca80f5e 100644 --- a/srcpkgs/sdb/template +++ b/srcpkgs/sdb/template @@ -1,24 +1,17 @@ # Template file for 'sdb' pkgname=sdb -version=0.9.6 +version=1.1.0 revision=1 build_style=gnu-makefile +make_use_env=yes hostmakedepends="pkg-config" -makedepends="libglib-devel vala-devel" +makedepends="vala-devel" short_desc="Simple key-value database with JSON support" maintainer="Juan RP " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="http://radare.org" -distfiles="${homepage}/get/sdb-${version}.tar.gz" -checksum=e4cf6e93c2a52484fd2b52aa1addab3ed37b4237bdf0e2fce86bee48533050f5 - -do_build() { - make CC=$CC ${makejobs} -} -post_install() { - # create soname symlink - ln -s libsdb.so.${version} ${DESTDIR}/usr/lib/libsdb.so.0 -} +distfiles="https://github.com/radare/sdb/archive/${version}.tar.gz" +checksum=92f0acb30b58556a45629ebc76b9737dca99c9a3561c72ebc31f143aee9b5844 sdb-devel_package() { depends="sdb>=${version}_${revision}" From 9b6189077305f7934c400f635bb4d052c33ecbc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 27 Jun 2018 06:40:47 +0200 Subject: [PATCH 192/759] mame: update to 0.199 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/mame/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 70cf73506e4..46dbaac8437 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0198 +version=0199 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,7 +8,7 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" -checksum=0c354a5c3d82d46acf2183d6be291364c4454ce6ffdd79cf3397174779cff8fa +checksum=cf4511d6c893e699fd5bc510133aee75c852942321e1c668c9d5802229bec116 hostmakedepends="automoc4 perl pkg-config python" makedepends="SDL2_ttf-devel glm libjpeg-turbo-devel libutf8proc-devel From 1a2456d0d742e331c3de950b2883a1968c12ca0e Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 26 Jun 2018 04:55:46 +0200 Subject: [PATCH 193/759] chroot-git: update to 2.18.0. --- srcpkgs/chroot-git/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 9c3656aaa8f..95d6b859c7d 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,6 +1,6 @@ -# Template build file for "chroot-git". +# Template file for 'chroot-git' pkgname=chroot-git -version=2.17.0 +version=2.18.0 revision=1 bootstrap=yes wrksrc="git-$version" @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7 +checksum=8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92 if [ "$CHROOT_READY" ]; then hostmakedepends="perl" From 2739c66207a8857d874e7e176369c3e21c2502dd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 11:53:02 -0300 Subject: [PATCH 194/759] elogind: update to 238.1. --- .../patches/fix-missing-ftw-macros.patch | 34 ------------------- srcpkgs/elogind/template | 6 ++-- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/elogind/patches/fix-missing-ftw-macros.patch diff --git a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch b/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch deleted file mode 100644 index 3cdfdf061c5..00000000000 --- a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch +++ /dev/null @@ -1,34 +0,0 @@ -Source: maxice8 -Upstream: https://github.com/elogind/elogind/pull/57 -Reason: add missing FTW_* macros for musl libc based systems - ---- src/shared/musl_missing.h -+++ src/shared/musl_missing.h -@@ -107,6 +107,27 @@ typedef __compar_fn_t comparison_fn_t; - */ - #define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) - -+/* -+ * Missing FTW macros in musl, define them if not defined -+ * taken from -+ * https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch -+ */ -+#ifndef FTW_ACTIONRETVAL -+#define FTW_ACTIONRETVAL 16 -+#endif -+ -+#ifndef FTW_CONTINUE -+#define FTW_CONTINUE 0 -+#endif -+ -+#ifndef FTW_STOP -+#define FTW_STOP 1 -+#endif -+ -+#ifndef FTW_SKIP_SUBTREE -+#define FTW_SKIP_SUBTREE 2 -+#endif -+ - #endif // !defined(__GLIBC__) - - #endif // ELOGIND_BASIC_MUSL_MISSING_H_INCLUDED diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 0a43f62cfdc..1c127002586 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,6 +1,6 @@ # Template file for 'elogind' pkgname=elogind -version=236.1 +version=238.1 revision=1 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt @@ -15,8 +15,8 @@ short_desc="Standalone logind fork" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/elogind/elogind" -distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=391fdb66d97983827e30e7e518f822c96eadb29d5e54092c3cd348dfb3a7a3b6 +distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" +checksum=b0416c4194198f6af71f5ffb3b3d5d8f20e446acb80699eb4e8df3f79dd18acf conf_files="/etc/elogind/logind.conf" pre_check() { From beb04136ee89670e7ff0745f91c1e71f9364d3a9 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 27 Jun 2018 10:07:31 +0200 Subject: [PATCH 195/759] imv: update to 3.0.0. (#452) --- srcpkgs/imv/template | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template index 933ca9aec13..d376155bc8a 100644 --- a/srcpkgs/imv/template +++ b/srcpkgs/imv/template @@ -1,18 +1,26 @@ # Template file for 'imv' pkgname=imv -version=2.1.3 +version=3.0.0 revision=1 build_style=gnu-makefile make_build_args="V=1" -makedepends="SDL2_ttf-devel freeimage-devel fontconfig-devel" +hostmakedepends="asciidoc pkg-config" +makedepends="SDL2_ttf-devel cmocka-devel fontconfig-devel freeimage-devel" +depends="desktop-file-utils" +conf_files="/etc/imv_config" short_desc="Image viewer for X11/Wayland" maintainer="Arvin Ignaci " -license="GPL-2" +license="GPL-2.0-or-later, MIT" homepage="https://github.com/eXeC64/imv" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=f0b9acd7cff1d2f7301cb5cffb261ace4d0af2003dc4a293d9a37e73074978b7 +distfiles="https://github.com/eXeC64/imv/archive/v${version}.tar.gz" +checksum=51c3fc49b4db8b13f55816a502b68f4f660a8dfccd109cdea5af23cc9f613fad +conflicts="renameutils>=0" pre_build() { export CFLAGS+=" $(${XBPS_CROSS_BASE}/usr/bin/sdl2-config --cflags) -DIMV_VERSION='\"${version}\"'" export LDFLAGS+=" $(${XBPS_CROSS_BASE}/usr/bin/sdl2-config --libs) -lfreeimage -lSDL2_ttf -lfontconfig -lpthread" } + +post_install() { + vlicense LICENSE.MIT +} From 1c7ca8e2da4395cc744fd9138aff12f3788442b3 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 27 Jun 2018 11:04:11 +0200 Subject: [PATCH 196/759] python-tempora: update to 1.12. --- srcpkgs/python-tempora/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-tempora/template b/srcpkgs/python-tempora/template index 5266fd47901..307accd4f88 100644 --- a/srcpkgs/python-tempora/template +++ b/srcpkgs/python-tempora/template @@ -1,6 +1,6 @@ # Template file for 'python-tempora' pkgname=python-tempora -version=1.11 +version=1.12 revision=1 noarch=yes wrksrc="tempora-${version}" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/jaraco/tempora" distfiles="${PYPI_SITE}/t/tempora/tempora-${version}.tar.gz" -checksum=4be862dbdc6fcbcc57f4b355258daa41fc0932af99680142bfa20836379f57a5 +checksum=2b6dbb8402804840022e6f375bd86845e38eca5515e1c5c267ea137ee4f43978 alternatives="tempora:calc-prorate:/usr/bin/calc-prorate2" pre_build() { From 148ebb6bb3332372472562a3f5954c38071f2642 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 27 Jun 2018 11:04:39 +0200 Subject: [PATCH 197/759] vagrant: update to 2.1.2. --- srcpkgs/vagrant/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index d04fd755203..1d41e729a4c 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,6 +1,6 @@ # Template file for 'vagrant' pkgname=vagrant -version=2.1.1 +version=2.1.2 revision=1 hostmakedepends="ruby" makedepends="ruby-devel zlib-devel" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://www.vagrantup.com/" distfiles="https://github.com/mitchellh/$pkgname/archive/v$version.tar.gz" -checksum=8b54b39ad2bdfe038f5a6767a745f2139d6f62e6e4745008e906f2e1c658fa4d +checksum=610d704e737cbc0ccb9d27fd1b40be8bb1917cad693d2a3d841c8c36c8066939 nocross=yes patch_args="-p1" From ee3c6c1fc72e982223a5ca22972726866408d98e Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 27 Jun 2018 11:12:31 +0200 Subject: [PATCH 198/759] Adapta: update to 3.93.1.25. --- srcpkgs/Adapta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index e29399cd4a5..df3aeb77cb6 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,6 +1,6 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.93.1.22 +version=3.93.1.25 revision=1 noarch=yes build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage=https://github.com/adapta-project/adapta-gtk-theme distfiles="https://github.com/adapta-project/adapta-gtk-theme/archive/$version.tar.gz" -checksum=f2b7323bc31c494e338003dfb6c067504acc55d81df91b257330cb13e70e708e +checksum=c7afef7b90306ba5fc41944539b1835c16eb245a40d66ab0e616831c1cf100e3 pre_configure() { NOCONFIGURE=1 ./autogen.sh From de4e388c83d35149b8dc27edf27dfde9bc92c622 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 23:35:49 -0300 Subject: [PATCH 199/759] zabbix: update to 3.4.11. --- srcpkgs/zabbix/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template index 5c52c0bae47..7ae879f06e4 100644 --- a/srcpkgs/zabbix/template +++ b/srcpkgs/zabbix/template @@ -1,6 +1,6 @@ # Template file for 'zabbix' pkgname=zabbix -version=3.4.10 +version=3.4.11 revision=1 build_style=gnu-configure configure_args="--with-libxml2 --with-gnutls --with-libcurl --with-net-snmp @@ -15,10 +15,10 @@ maintainer="maxice8 " license="GPL-2.0-or-later" homepage="https://www.zabbix.com" distfiles="${SOURCEFORGE_SITE}/zabbix/zabbix-${version}.tar.gz" -checksum=cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b +checksum=e3048751d23c01423184e5f3305a62c435c4e4fcb16bd17a9570c5d3a171af63 conf_files="/etc/zabbix_server.conf" system_accounts="_zabbix_server" -system_groups=_zabbix_server +system_groups="_zabbix_server" make_dirs="/var/run/zabbix-server 0750 _zabbix_server _zabbix_server /var/log/zabbix-server 0750 _zabbix_server _zabbix_server" From 5818f2e86a264a3fe6c601115f0ff185d0bedec5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 23:29:43 -0300 Subject: [PATCH 200/759] ndctl: update to 61.1. --- srcpkgs/ndctl/patches/fix-musl.patch | 15 +++++++++++++++ srcpkgs/ndctl/template | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ndctl/patches/fix-musl.patch diff --git a/srcpkgs/ndctl/patches/fix-musl.patch b/srcpkgs/ndctl/patches/fix-musl.patch new file mode 100644 index 00000000000..cf0621ff66f --- /dev/null +++ b/srcpkgs/ndctl/patches/fix-musl.patch @@ -0,0 +1,15 @@ +Source: maxice8 +Upstream: soon +Reason: Fixes compilation on musl libc by defining missing ssize_t + +--- util/strbuf.h ++++ util/strbuf.h +@@ -17,6 +17,7 @@ + #define __NDCTL_STRBUF_H + #include + #include ++#include /* for ssize_t */ + + /* + * Strbuf's can be use in many ways: as a byte array, or to store arbitrary + diff --git a/srcpkgs/ndctl/template b/srcpkgs/ndctl/template index 45c0446e678..506eaa731e7 100644 --- a/srcpkgs/ndctl/template +++ b/srcpkgs/ndctl/template @@ -1,6 +1,6 @@ # Template file for 'ndctl' pkgname=ndctl -version=60.3 +version=61.1 revision=1 build_style=gnu-configure hostmakedepends="asciidoc automake libtool pkg-config xmlto" @@ -10,7 +10,7 @@ maintainer="maxice8 " license="LGPL-2.1-only, GPL-2.0-only" homepage="https://github.com/pmem/ndctl" distfiles="https://github.com/pmem/ndctl/archive/v${version}.tar.gz" -checksum=5a97672e90eb9916fbde05e4246754a9290d780200e140be68fd4babc0cfe775 +checksum=815a06600a233326b898504262c359cb7c1282b1f11c011a558bf5f26b8b28be pre_configure() { ./autogen.sh From 02583ceec56cd5a1b847ab8a1cf8cc49e935001b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 27 Jun 2018 15:53:30 +0200 Subject: [PATCH 201/759] git-annex: update to 6.20180626. Closes #456. --- srcpkgs/git-annex/files/stack.yaml | 31 ------------------------------ srcpkgs/git-annex/template | 6 +++--- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/git-annex/files/stack.yaml diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml deleted file mode 100644 index b25c6eba91a..00000000000 --- a/srcpkgs/git-annex/files/stack.yaml +++ /dev/null @@ -1,31 +0,0 @@ -flags: - git-annex: - concurrentoutput: true - production: true - assistant: true - pairing: true - network-uri: true - s3: true - testsuite: true - webdav: true - torrentparser: true - webapp: true - magicmime: false - dbus: false - android: false - androidsplice: false -packages: -- '.' -extra-deps: -- aws-0.16 -- bloomfilter-2.0.1.0 -- torrent-10000.0.0 -- yesod-default-1.2.0 -- conduit-extra-1.1.17 -- time-1.6.0.1 -- xml-conduit-1.5.1 -- happy-1.19.8 -- alex-3.2.3 -explicit-setup-deps: - git-annex: true -resolver: lts-10.2 diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index d2494ab0559..1e6b2744827 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -1,10 +1,10 @@ # Template file for 'git-annex' pkgname=git-annex -version=6.20171214 +version=6.20180626 revision=1 nocross=yes build_style=haskell-stack -stackage="lts-10.2" +stackage="lts-10.10" hostmakedepends="pkg-config ghc stack" makedepends="gsasl-devel gnutls-devel libxml2-devel rsync curl lsof gnupg2 file-devel" # depends are utilities required by git-annex @@ -14,7 +14,7 @@ maintainer="Evan Deaubl " license="GPL-3" homepage="http://git-annex.branchable.com" distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=9a9b12d460aed25ddbed1a928511eb1c221969aa664872d9562db6c8caa0dd0d +checksum=8eca36ce61f25079a4f0eb3c23d635e64e3208645402c5d48686eb1b5bc23a72 nopie_files="/usr/bin/git-annex" # These install steps are pulled from the install target in the From 25869bcf98187cd009b55ece091e088032238033 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 12:09:00 -0300 Subject: [PATCH 202/759] tracker-miners: update to 2.0.5. --- srcpkgs/tracker-miners/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template index 1cdaf6aa842..76cd25c184d 100644 --- a/srcpkgs/tracker-miners/template +++ b/srcpkgs/tracker-miners/template @@ -1,19 +1,18 @@ # Template file for 'tracker-miners' pkgname=tracker-miners -version=2.0.4 +version=2.0.5 revision=1 build_style=gnu-configure configure_args="--enable-libvorbis --enable-libflac" -hostmakedepends="pkg-config glib vala intltool glib-devel" -makedepends="zlib-devel libglib-devel tracker-devel glib-devel libxml2-devel - libseccomp-devel giflib-devel libpng-devel taglib-devel libgsf-devel - libvorbis-devel libflac-devel" +hostmakedepends="glib-devel intltool pkg-config vala" +makedepends="giflib-devel glib-devel libflac-devel libgsf-devel libpng-devel + libseccomp-devel libvorbis-devel taglib-devel tracker-devel" short_desc="Data miners for tracker" maintainer="Sir_Boops " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=4626646167e405be5f8b3f831c82cfcdf86ba20d3598fca41ea8c4a8b8a8e956 +checksum=6499c083761631b14ad58d463c4af1d69bca842d9a3d11a6c456ced5d0b26802 post_install() { rm -rf ${DESTDIR}/usr/lib/systemd # we don't need this From e65a445cc9ca52cdab1a6fdf46c01462f7de9fb5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 10:38:29 -0300 Subject: [PATCH 203/759] tracker: update to 2.0.4. --- srcpkgs/tracker/template | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 15c6c92be10..6b0b75c2d71 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,6 +1,6 @@ # Template file for 'tracker' pkgname=tracker -version=2.0.3 +version=2.0.4 revision=1 build_style=gnu-configure configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests @@ -8,22 +8,19 @@ configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests $(vopt_enable gir introspection) LDFLAGS= ac_cv_lib_sqlite3_sqlite3_threadsafe=yes ax_cv_sqlite_threadsafe=yes ax_cv_sqlite_auto_extension=yes ax_cv_sqlite_builtin_fts5=yes" -hostmakedepends="automake libtool pkg-config intltool glib-devel - gettext-devel gobject-introspection libxslt python3" -makedepends=" - libpng-devel libgee-devel libsecret-devel upower-devel - exempi-devel poppler-glib-devel gupnp-dlna-devel libgxps-devel - libgsf-devel icu-devel enca-devel libvorbis-devel libflac-devel - taglib-devel giflib-devel totem-pl-parser-devel - libexif-devel tiff-devel network-manager-applet-devel sqlite-devel - libmediaart-devel libuuid-devel libxslt-devel json-glib-devel - libseccomp-devel" +hostmakedepends="automake gettext-devel glib-devel gobject-introspection + intltool libxslt pkg-config" +makedepends="enca-devel exempi-devel giflib-devel gupnp-dlna-devel + json-glib-devel libexif-devel libflac-devel libgee-devel libgsf-devel + libgxps-devel libmediaart-devel libseccomp-devel libsecret-devel + libvorbis-devel libxslt-devel network-manager-applet-devel poppler-glib-devel + taglib-devel totem-pl-parser-devel upower-devel" short_desc="Personal search tool and storage system" maintainer="Juan RP " -license="GPL-2" -homepage="http://live.gnome.org/Tracker" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5a2fb274c128ec67a920944937b5147ceaf5db16fef6691ea22c4cb841e20580 +license="GPL-2.0-or-later" +homepage="https://live.gnome.org/Tracker" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=ce2f0db52666592d313a04ce14663110eafa8ab08dc213b53e790281362dccd5 # Package build options build_options="gir" From 36a3eedae90942093340af21902ce02f31b42747 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 11:41:31 -0300 Subject: [PATCH 204/759] windowchef: update to 0.4.2. --- srcpkgs/windowchef/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/windowchef/template b/srcpkgs/windowchef/template index d8ed80459b7..6a4f9b4b883 100644 --- a/srcpkgs/windowchef/template +++ b/srcpkgs/windowchef/template @@ -1,6 +1,6 @@ # Template file for 'windowchef' pkgname=windowchef -version=0.4.1 +version=0.4.2 revision=1 build_style=gnu-makefile makedepends="xcb-util-wm-devel xcb-util-keysyms-devel" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="ISC" homepage="https://github.com/tudurom/windowchef" distfiles="https://github.com/tudurom/windowchef/archive/v${version}.tar.gz" -checksum=f1d06da84dafc4bbbacf273815af5bbbf318afa524194b3ab1c55ebc71d2a14d +checksum=e38c5cc81ec9374357625431986dfcd1b3abc2d11797b459ef36f262b1705053 pre_build() { sed -i 's|^CFLAGS +=|override CFLAGS +=|g' config.mk From b2bc40db6d5620c02edbe353947ce4a049e17043 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 10:32:20 -0300 Subject: [PATCH 205/759] units: update to 2.17. --- srcpkgs/units/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/units/template b/srcpkgs/units/template index 86ee2af4401..03d1a1cf8ce 100644 --- a/srcpkgs/units/template +++ b/srcpkgs/units/template @@ -1,6 +1,6 @@ # Template file for 'units' pkgname=units -version=2.16 +version=2.17 revision=1 build_style=gnu-configure hostmakedepends="python" @@ -8,7 +8,13 @@ makedepends="readline-devel" depends="python python-Unidecode" short_desc="Converts between different units" maintainer="Juan RP " -license="GPL-3" -homepage="http://www.gnu.org/software/units/units.html" +license="GPL-3.0-or-later" +homepage="https://www.gnu.org/software/units/units.html" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=dcf3f78482a13b150fc6bf0f8d611510816a3424bc2b26229b85b1cadeb81686 +checksum=1f03c9f9aef1fb0ccddc6fb545f2925f7754de2bfa67d4e62f8758d7edfd5dd8 + +post_install() { + # Tries to install to /usr/com/currency.units + rm -f -- "${DESTDIR}"/usr/share/units/currency.units + mv "${DESTDIR}"/usr/com/units/currency.units "${DESTDIR}"/usr/share/units/currency.units +} From 02e83552585f3e84993b7dfe63c66fb947d11b52 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 18:30:24 -0300 Subject: [PATCH 206/759] python-progress: update to 1.4. --- srcpkgs/python-progress/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-progress/template b/srcpkgs/python-progress/template index 3a3a6b47e92..3a26a4f15af 100644 --- a/srcpkgs/python-progress/template +++ b/srcpkgs/python-progress/template @@ -1,7 +1,7 @@ # Template file for 'python-progress' pkgname=python-progress -version=1.3 -revision=2 +version=1.4 +revision=1 noarch=yes wrksrc="progress-${version}" build_style=python-module @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Easy to use progress bars (Python2)" maintainer="Joseph LaFreniere " -homepage="https://github.com/verigak/progress" license="ISC" +homepage="https://github.com/verigak/progress" distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz" -checksum=c88d89ee3bd06716a0b8b5504d9c3bcb3c1c0ab98f96dc7f1dc5f56812a4f60a +checksum=5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a post_install() { vlicense LICENSE From d4f0dd7522c822dba3dad785cfc387e79d0b8a01 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 11:00:20 -0300 Subject: [PATCH 207/759] libskk: update to 1.0.4. --- srcpkgs/libskk/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/libskk/template b/srcpkgs/libskk/template index 5c0afef30ef..9caf8c90a22 100644 --- a/srcpkgs/libskk/template +++ b/srcpkgs/libskk/template @@ -1,16 +1,17 @@ -# Template file for 'lib-skk' +# Template file for 'libskk' pkgname=libskk -version=1.0.3 +version=1.0.4 revision=1 +build_style=gnu-configure +hostmakedepends="gettext-devel gnome-common gobject-introspection intltool + libgee08-devel pkg-config vala" +makedepends="json-glib-devel libgee08-devel" short_desc="Japanese SKK input method library" maintainer="Satoshi Amemiya " +license="GPL-3.0-or-later" homepage="https://github.com/ueno/${pkgname}" -license="GPL-3" -hostmakedepends="libgee08-devel pkg-config intltool gnome-common gobject-introspection vala gettext-devel" -makedepends="libgee08-devel json-glib-devel" -build_style=gnu-configure distfiles="https://github.com/ueno/${pkgname}/archive/${version}.tar.gz" -checksum=9c1fe5f426608cf81dc6db11741c7e07d3cc6264b225455aff361ed408df3887 +checksum=39ff9a7df25b319b0e0e74fe4161de17720a32bf73dea8096647e13efcd89f9d build_options="gir" if [ "$CROSS_BUILD" ]; then @@ -28,7 +29,7 @@ libskk-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.so + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 From 58e040678321fcfbe85b452b98bbe519347736d1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 22:57:35 -0300 Subject: [PATCH 208/759] antibody: update to 3.5.1. --- srcpkgs/antibody/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template index b8c273d31ce..c41ae938380 100644 --- a/srcpkgs/antibody/template +++ b/srcpkgs/antibody/template @@ -1,6 +1,6 @@ # Template file for 'antibody' pkgname=antibody -version=3.5.0 +version=3.5.1 revision=1 build_style=go go_import_path=github.com/getantibody/antibody @@ -10,7 +10,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://getantibody.github.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=0c774cf2d7e29293b1ca2ad1c05d4c8a4226a2956be1f7c50cb2c8456a88810d +checksum=ee0f73041a4e4b6dad8a6704430f84cd58e0894fee547a6c302a80f49833175b post_install() { vlicense LICENSE.md From 81c6bd0a84b627e38646e08af358d808f5231320 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 23:37:13 -0300 Subject: [PATCH 209/759] feh: update to 2.26.4. --- srcpkgs/feh/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index c3318ad80b6..ba3e728cfb3 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -1,6 +1,6 @@ # Template file for 'feh' pkgname=feh -version=2.26.3 +version=2.26.4 revision=1 hostmakedepends="pkg-config" makedepends="giblib-devel libXinerama-devel libXt-devel libcurl-devel @@ -10,9 +10,9 @@ short_desc="Fast and light imlib2-based image viewer" maintainer="Juan RP " license="MIT-feh" homepage="https://feh.finalrewind.org/" -#changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" +changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" distfiles="${homepage}/feh-${version}.tar.bz2" -checksum=3ff3e64db0811e2ff14add77d1aab4ae6d16616f5f78fe54649b49f5aa7f4a21 +checksum=074f8527a17fc5add70018a7f3887d78d5bdf545611636b88641f27e9e844795 do_build() { make ${makejobs} CC=$CC PREFIX=/usr exif=1 help=1 stat64=1 From 655f25f133cd5be2549e6374cd2457379365d090 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 23:26:11 -0300 Subject: [PATCH 210/759] iperf: update to 2.0.12. --- srcpkgs/iperf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template index 655743ebab9..8d04cb19553 100644 --- a/srcpkgs/iperf/template +++ b/srcpkgs/iperf/template @@ -1,16 +1,16 @@ # Template file for 'iperf' pkgname=iperf -version=2.0.11 +version=2.0.12 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --enable-multicast --enable-threads ac_cv_sizeof_bool=0" short_desc="Perform network throughput tests" -maintainer="Leah Neukirchen " +maintainer="maxice8 " license="NCSA" homepage="https://iperf.fr/" distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz" -checksum=b7d650d07c6bb0e357b5938a20e4ac33876012fddb952299c5d321e6958da5d2 +checksum=367f651fb1264b13f6518e41b8a7e08ce3e41b2a1c80e99ff0347561eed32646 post_install() { vlicense COPYING LICENSE From b24564cadad378b4a55e3d9d55f7aca1a667408d Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 27 Jun 2018 19:37:07 +0200 Subject: [PATCH 211/759] firefox-esr-i18n: update to 52.9.0. (#465) --- srcpkgs/firefox-esr-i18n/template | 187 +++++++++++++++--------------- 1 file changed, 93 insertions(+), 94 deletions(-) diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template index 9cd4cc954f5..d649f1604e4 100644 --- a/srcpkgs/firefox-esr-i18n/template +++ b/srcpkgs/firefox-esr-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-esr-i18n' pkgname=firefox-esr-i18n -version=52.8.0 +version=52.9.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -134,96 +134,95 @@ _pkgtmpl() { } } -checksum=" -0c069738a285dfbc4d5754086cdd108ae36ca89e5ac08cecbcc42e972a5d275d -d7645158223413e16473bb56a44c7c04ab8ef7b3ff7da6cf02f4ece06ac9d454 -06907c301e1cbcba62d31661b64f1744f7df8827722b21252277749642de4857 -c96116a11b70fe005284aacc6b9c5758902667c5e412a658665390ac505b7857 -c998b908c3999c096560ec00ec9abc4e179c2399e4b4c12e67f4db80388a0a71 -b30101831b319b655e75fa54a6805c9ccfa62918906b1fb1c5057fb3317c1a61 -e33318ccee8f9d51af79939a8ff0bb8aede9c82113ff28bf67bf53b9db6acce3 -bc8f076c26966fb7267d4d83dd8aa42cec8afee83e4fb9f9179bae6900c3724b -8b0beccda82b82ae4ae3c6ec8aaa8f5650848a069d7dbd6a9ae9332e9131bc26 -119e447221572186d0bd390767e25214f157a8dfdeba461c2ddbf76e5fa3b8e4 -cc3ce8d3c3c54d5418e5c911ba7e94dea503c62b969f7effd26790ab100aadc2 -5ae3a134fc1c14bc8547532d1848ba483f1e0d4faa7119d6615c35f0656caa7d -8c8f8c8ffc64e435b29f9ed8751c6006fe9a665e754e1a656d78a06b9f989b0b -2fd0fdfc2785365f78277c9fe4fc9a3c3a8494448f94c302379cc71af0afd9f3 -d902653a500d41d157148c7812a16118b65d321a5d5c9edacfd4a3e6276f3142 -a66f32cef38343a78f7f38990861cce9de29a8bb2b3237c52841d3c9336fb4dd -2818096eea89b3fbd8a77a23e587d8770ec0f5175f1bf7838c2db8bb7456ae1c -f70b4b250a9ca85640fba8467293a0b52f2882d53694edd80abc96b13df13d69 -71b9e71ca4545ea55f13245b90600d0114d3ae72d16ad2db25db3f034592ec7f -94ee8b852a012f3a0a9997fd263ff9f88405d6bbe427ffa33fc37bff567df0bf -e5b5a6ff2e3d9f483b9afb425f5a89a25a3333db06260a2623faf2d7847a014b -e5487e67c1789fa15d3a37f5316f9204a9c871868720205c81d9b5c6bb2a4f9e -0d6e4fcca8b7160a4c262229d06e61b116e3bfa8f164097d32e37ae53bb0a06f -24ea6ff03bed39895d0c3f6cc4432fba6d58bd42814efd2dacfc12021090a2d7 -e9830ef15fe651c794e8c912fdbe6deb9b611cca49f02c31b847a56e5def71e0 -fe09b523998ec03878a6198b0ecd93145340ee9fad37b0a891e252754af12fab -c45f4ca91ccee666079790ce377f474c7992d410c88c16ce4551867711467a30 -2f4b8e0e9377a85fb85a891cbbf1cd2007456dfa22c7ed78462d39fc6ad0c558 -a59a78a08c5116b103304952f4abcaa347bb9992d49ac0e6251d32258b24fcf3 -34147575109ddb584dcb64d79d0e52f3fb923816269e9322c967a78b93c7825c -734508a2d7997969c0cfa2f46751830e0e29b5522548994b385f7010449a05c9 -4bc09e0c823a44eff73d3a6e8500254f3e4296099428545c8fe8018a89013ecc -00bdbade3619e757805e043cf210bc20bc9ef67e7c5a7d2d5d87a921b782ad4e -0797c241bfc4b15becab480c8eb7ed68797f9f745a116511a55a92aea68c0577 -006dd61c7bb4582355fc5d50363152348a51b47ced2b81e0cc34a27c2a28f746 -311c222f54accb81014384cfda644c9d718a09baf4935056016307324cadf83a -1672e7edba46bfb551628e65066b7246270b19159fbae0fabb988ddb21b74ad3 -6ba049f809536745ba87e2ef459781f1c8ff99edbe08330edea157f4cf7056aa -2bb3a7347135675dd29bb72658c523428eb6af15380d52457a7f1aac1d381b7c -fbb71bf898b556476ddef5396c93daab30fb613229323c4ccedec789361e5db3 -86917c56b4e7563db92a36d9facb9e41777d5751ea3357688946bd157f1c629e -452c73e8962c3ed2858a95e69caf8afaa432e6c3a0f6b3c04b1d758e8b0aadf3 -2298fd3b2ff6260fe27a41f46efe98b5c4e17b33f8f21f5a6d74caea31ca8fce -4bf3aa58d2c8d0659da6027d85fc5c516921cc87d70fedf092621c2ff27f8d4a -35b2ac640ec58bda58073d45d3a0cff6d278e251fa11a98596151943961ec0ce -5347069b88b0020bf2bebcbf7fbc6e397088ac74e046458e4aaba9c837c211aa -dad28e6b93f574d2995455eac8dccaa537eb3d8a3366807932161a12eafd97fb -c4c3296f24996c35c9e18db7bbbcd4025c0a3a774d7af570b8edb6096fd5e1d1 -608ecc2e914ac17979ec28bd4c18532d4ea7e274b001326e082e2f642737f597 -ac443368d345d2401f1e994f1f1698d5eea19af07b3fb7cf7d50b1d9662c13e1 -8b0d1d355dde3d69d5f926a7a40b9f2a35c9de6c62b09c05f034f553908cdfbe -b1c074e5f191bf464911fbfcf7b77bb6b7207a70f058afe9660ff2b877b95c71 -e78680221cc5d0e726a1ac8362df672a70aa4d0f3e0c08c47c9f3fac7eab0211 -d6311f10d091e66902947db4a71fa4951876beed37b4c03e02cbffb63049eff8 -fd95160dad8787ed8803bc8e98f2ef7c3e57df5e03a05013acb038753f82baa6 -ca78841e987df549a641e078e355c3ca025cdcf7c65124b610f0844ac07a6015 -4864ae85dd728391e3144b48771b26bdf60a6c226924ef3dac3583b57635f2d8 -116b6981342e442f448c98289fd6439068128d2a0362076d9522095dea6f7320 -dca41d4e38dbb5bae255108f7ee853579346ecfe50b0572a2c7c7a04b969913b -8141c6320d0e52a82f5a6574be227f193fa3491a3db4eddb0a6a39ac83f56793 -1ce5170def238a5eb32f0f55c99f010f255902212c416b055520748f7a873de6 -2023a29c5725ea458ebade2874e49c48e4fd83931f110a4d172ef238f0a4635f -7b8b4f669e445aac69fc7b5d6159c2459a97b65af06d8db9cd8acc60f82abb0a -5c8df679a379c443a5ac3416e0d3b21fd2ed5ef955addc7d0b09acd26085b285 -0a222ca1fda65aa5c291d08bdc50807d674d05bb52ce77683c063bd768391b05 -9da67e7a18168ccf4b3b805945c2dffd75f7d1574b05bb384049bfc3e29c37f3 -a98bf22c3ecc3225ebfbb310c84324e545ce85627461c1bff22008aa29f504d6 -6ab0259bf3666112a6171b0ac11b9ae74341930aa5158f154a2eeebd5a33eeb4 -10dffc15f93c9347a6ce6c2ca53877057fc758a8c3a3e7777ab5858839072f9c -ebc90628adaf91bff4a2dbfa3bedb0bdb363cab180dea7b341d048f6a494c739 -d73047b8c868acdd502498fa0731d672f4e8e50e55fab6661ad1e8b68e03d522 -d3692c2cdc86a60b5ab872d3ae70805c7623636831adba34759c99fe4760451a -dbad8461140a9bcc5677b64af330adc48da4a5c2a140e10b1fced2f8229b526f -fa81c4bd21272c894d35b273658218a51c2f17e0f6149fcfc6e07c94217a1377 -b2eff18982c8464b34455dd375b888d76f3b13b488c9ad1cd0c6e5075616bb6b -03c7d40c2df94c8d1a1e838b22aa974d86ee50c5f61d735da8802b1a5ae04d85 -8ee0ca43a6f4600891ee2258879d575aa4fa475421bdd53aac5b66462d9ba34a -e03149721297f487b6b8d395add7594f72d6c506ec1be0eb229cf36dcf256824 -16906b5639d0331c96a89e443dc173ff50136c3a9663c769d81cc450a0f8f70d -f9d6bb89af80e355ac77b59bd0d7d9088fb0e400fc59402ddf83bf6337fc7f1e -5ea9289e509f62ac2315db1d332741a31d935cc02b9ce3af36898b082f293d9f -7967be14966c44205fb1319350210667bdea3772cc59309c67cff972bbd19fe8 -2b009ceb488018ac7473e3a3f6fea9e9218644be4fef53e6b88dc27ec4290bca -9907eef05e38743e66758248a7bf52edf2d4e9d22c82b437ba7deb920e5da9c0 -94942825b0d1a0cfe49fa64e1789635c527064ce5c599740d96590ffd4a86231 -b023c5398ff903a2f276802a11e5acda7d591b0a25f54ad1f857d71ccd3dcf05 -ae9002bac9accfc3037322208e19ab98258ad796e1696cb74ffd17359ac41843 -f729000a17f6770423895af7d123fb0cde0f5fbe854d692a474a26a4991f6f2e -324ff5d2900d58d7c44b05381ac4d280d94586392d786aa7ae3b68f11a5bc4b0 -f2abe016111ec875c19d76e7265d40c3bcbb264fbb3c5aee71835326a8231a03 -a1bdc0ad4365fedf3cd9cb87a58dafcc08333a79e0383cdf97a20e91e5a4f1b4 -a837d5724e77fc8a7983caa7cd913dcb52588c807f21d27f502d426430059acf" +checksum="f0430c3a56a450f4bf5c21caf847a279cb19e8a5373939a13f537f8b7bab7367 + e271fa624527ff760878cd420942c704077fecbf723de22d3dd9287a60e076af + 0d58ab44168656d85fc4d2a726ab39f7a79a5e3d161cd21c32b190bbae05e560 + 1658b2782ff9ba538f9215d1214be2d201293739fba29cade86205506465aab4 + bb14fbbd04c85f4ad09c98afe27a8eccfc86b965e269c6599cbb76507e1018d7 + 0a9fb3717235352a72ba21707dc5bf15337e16a7cf16ebe72a9695a238d26648 + 9eb05526f4e3fe539d3c756d617cd50780116bbd87a3eda5817f156c30bfa286 + dabfefa33d774e99047e30fd1ca2bd6049ed98d8ed7f1e70d92573b9c5ec8dd5 + 4ba54f6692543397f7694169dba0568331ef60cb09b9a5b08e8170a7bf6a75fe + 11e44f831003ed4cfb929cbbe7c7a9a80830b9d3e0da29cb2f40e8f042fd6ffb + fe9d9df8b4437d3bb9b160dfef6e908bb88ae99546a6a05691ea68417dd96816 + 8d2074da2ddece656e1b65a957cb1ffc027ce21df62e83acaf57deb37c0481ab + 66a1d3ba08d4324706763eaebbe4b4d60b02fb6710187681100c342d7d4b5ad8 + 324e161c85f2287502e04abab1de88e8b4c0924a30996aa848f859d2d1d556e3 + 8ea19529b0536099bee5ad65799bb422a6e9460fe9670c951e8609eef54133d6 + 0e5f8613768bfa6456b781effb1982bd78f8405c30ee3e763d95ed5cae0de97f + b50c30e90580b0c8bc6871dae8639a01019618caf713c1b8bae32485f0e8b167 + f59ed6f6466815a47ba0e62bee6f589c851f1d6248df0ad0b439e31929e61338 + c8f57aec50a10b6475ef4d06d7c2de794918c1ee17596a80445cf90c1e450082 + c3bcece23d752bc3bb6bf36f135354f6abaa244bdd82a37ebdef2024b97efd65 + 2d0c00c47132e19c470c23758df33d0fa5583efab1a3b5648b18148dded4e7f7 + 55586600fa4bcb6223998639116e47a0ecadde8278fc8db54bfe7f1deecd839b + f76a6b8ccaaffbbeade411976d71176dd598c30a0fc576caef7b8e2140e7e8ea + e81a9b48b0c87944de07a2cb7bb3b1329137f283c5dd0d81b05ed8b5e62e66f0 + 3567cddae4a303042938d2a2d744dade06ab77831816c0f32295cbebe79c75ca + 657225821c9c37fdfe12d09ac561d2702f20b2d17c9141f7e7bbcf7a1d7494e4 + 9b67115c23cebe3e3ce57c3a19dd7a5afaaf98e18e06357c4eace53b4808f302 + 348b9a59d5c621e807c002be4f57f616ed51da2d6e750611bb18da9081a61b42 + 487f6643e335e8a9cec42f14d50140de2f0a3b6d55af87aa123c432fd5f5eda1 + 63aac2681aae850d61b69c0411013ce2ae2c56bc428f174934668a3affd5f3fa + b8799469657e5c39cea9ecb034db50bd0cd28a8ce146d5335a14ba22245291b7 + 2e794d017814967a4a142d53c8d6004d8f15f85d42b1d9d31bef989f1ee147f3 + d8570f7716ad0b1e9fd59dc731f972b0518dd2dcaa1e41014ee6ce1de24795c1 + d57f183a96c7d57502a884458839518b20b183afcf88662c5a3fac4198afa320 + c00ec788d868a77fe1b6fa1532ededef75b1339c803b7b6ba75e5029c0d8a4e9 + 19fd25e53641298c2d726cda6ed60a1bf978813331405b04adecb101213c545b + 14291f4955b8d24f01586c4e2b46ef00cf2b684f83fdb2f62ee4a5eea8fac8a3 + aa5b1ab335018aa7e45ef7274fa37807a4a7999224aa6632a19f18e50a6558d4 + bb5829ca7512341d4d5c395ecfda75e1d8a1f66725032f09533c60bfa7c32efe + b0b7ffdc54d1067f4405f33a568941d738dcc0ad9a045b66fc50ca4e05a25f2d + 5054a5f1071c926290dbffd5820ff19214e22ad6a63662bc93a5c1af885d14e7 + 444a522fdcac5ce9d4901de58fa6e6fa9c5b8a772755c6d1eec120e22aa5c964 + 553bdf6a60bded015ceeef002db99028c9334a4fc2825f9f147ac922f923b1e2 + 4838a040484a5e06e641c05f04f83c3f69b8e6c214e38589e154d53d61e96004 + 2d1a34a83c15f87c05c5be22dd48fd447e1d0772843e4ae3fbd64f17a6660acc + 818c2dbfdc5900391e8aab5d27418bdc88959b66164e0a57890cff5ae56d5b9d + 1c6a6c1c5024a81df3f858ab8038c4228630d9a4eca073cabbe35fb884503ec7 + c85bb05e1e43bb34a469423efd70d4b3d0bd0266d8f851c959687d2ba346f197 + 5b4a5350d9f44cc9535987c50da886b52922402d1d607008239aa289f23f9a34 + aaed4fa95b9f1766f4a2e2537b15554b7a8821d105f27254c4bbb23cef22cb47 + c1aa4b8781925a68975a0e4a7ea419a8c2c8312fc5d81f2b35f5aabfa0a379a5 + 13a4f598164775e3a5fcffcca073460c5760294c54bf8d3b86c4d3e6354bac42 + c07c624b39f030e2b670c7b95df82ce3118af2a46c9a4ce2bd4d24c3405a1104 + 207736a063247eddb70838c1b8101c2b6fa8e4b8fff55447378780af6c2a5646 + ebffd88e898ad8aedefeb15d85628ecc02014ba17578fa01347e536c16eba46a + 465c5cf939297ea1a4b2725ac6b647f084a34000990f0c6bc2e755313c57691a + 8c38efcfb7b55a05c8435a175b08f3f040b9ba670e658b3c010c71aa758242f4 + 74ea5a3e367d775ebd31eeba01650d8d380ac2dc863aa26eafe17e431b0b40be + 107e399c050de243083d4d05a184de9ceb645fba067bd6c97ac6ba692f3cbc9a + 5904ecb6bee710f6a25eb9eb4a70ce3b32cc921545f4d3aae089573a8ced89c7 + 071310d0e7c2b0fdfbdc8f2646660383ec590f933d2f72a6464414976d873b21 + 5da1ac0f791df172435fe6e9dc0f8fed5a54bec5bcc219380718b6dec0739a56 + dd9da1a0f0a33c2fcc6a9a149c97314478d62471c33aec00f0324836b894748a + 76905cf4d180915ab1dd8ce07acc618ee0a8f32e25245aa193a0285c39181ae6 + badc78dfdc174feb0b3c360ff6f087aeac2c00ab177768f5fc3d9db37eb03265 + e87999ef3c49563295fe7229127c5c32b2a1deaed77d142923a1c02f1eacdceb + 65be2e545586bda4c63a4ea17f904cd93e8a5ab69e8f692dfdb03e4348ca22ae + e6d616793b35f5a3ec08eaf21a58fde941f4e704478ad728e754d3b9db6a9df6 + 15705ba576cc09df020e02b5fa1e98039e6438daffaf44ef169dbc3da352eba7 + a3431256dc89be10524babf7243ef48b366348166f8c6f3b33e7ab3dad8f6fa9 + 15b2d810761ea44828d5166588143b631a8341414a35742c2985142260464faa + 7fe472ee9817615a200326c14556281b75a1190b5918725251f6b5b48793979e + 12206fb5285cd7d2b1125a6c372b05591e7beec37bbd05c3e0fafd900af70cfe + 7d7311b5c059d86f5db629d7bb2fdd88232c138f911076f9533d144c139fd2cf + 3baf8d0aa2769c76e548ff41dbd11dea6796ef0a25558c9aa3c9447ad7ba3fd6 + a05cf9bef043afebabf9b7db194706288a3d73eaf1007f4ce6d96a0084b2d441 + ba88eec4cd462d636662529ed5757c359d9a684b3659dfcfc899b5863c07a552 + 99746474185eb6090a3cfc5917166da3a598007f0dd9a4d864483938c2f1786d + 5a9a0ff096f06f5885f0f3b95825fece99c9bffa340d51c2eecf76c6a710e4f9 + 7300854b0367c3569bccba4552f94ab948dbba28e4b407a1919cc509dc6e9224 + ba95f83cd63abf7518e98ec71eed90a47f4fe43e1ce1215ef047663935543d43 + e427833cf0985c680732d5ff6c98e34d0c86caa4ed8363f822bfadc291d24f3f + 66bfb2dcbe11b41207e81e1d259f0a0783dd7425c26f1c97f02df4e275c9d50f + a9be8bbaffbf17dc64ef42de29de38b61b3acf493141de9f462161afc7fbe8ba + 24daaab49e4b71be426ef7276d556edb22fb8c53bb20f684fae1985fedbe2ba4 + 52cc765c308a4f1bc9d99396784da84fd4405c6e571b4911f36f34bc5aa94735 + 43a2b0033269aa6bce8699ef9cff2407fda2cc0ad56b924d0fb110cccbe5125a + 4bc7a88ffa5a025f1eeb2533ede56e1b76259df57cba6bfb30acc82b48ed5a7b + 844dfecaf0156967b6c8ca031e1782f2afbfc7c057d15f3ed47ae3962f0dfca7 + 693a74d9a97667fbd741f5db3ff3ee2648eefddb41fe53b0fb7a91300022d4c1 + 3f77022c3669c5d2c8a728c2027bd515263361cc7722c546662a56e9c63ed788 + b029a2c9828c8f7fa4161bc7d0280ceed8ae23a1fd1f85e8052dfaa288b60bfd" From b14f1314de9f3fae9081eb6270e454abe40d61ac Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Wed, 27 Jun 2018 14:51:39 -0300 Subject: [PATCH 212/759] unrar: update to 5.6.5. (#466) --- srcpkgs/unrar/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template index 30145c701d0..97bc7498b77 100644 --- a/srcpkgs/unrar/template +++ b/srcpkgs/unrar/template @@ -1,15 +1,15 @@ # Template file for 'unrar' pkgname=unrar -version=5.6.4 +version=5.6.5 revision=1 wrksrc=unrar short_desc="Unarchiver for .rar files (non-free version)" maintainer="Juan RP " license="freeware" -repository="nonfree" homepage="https://www.rarlab.com/rar_add.htm" distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz" -checksum=9335d2201870f2034007c04be80e00f1dc23932cb88b329d55c76134e6ba49fe +checksum=eba36a421bf41491818dee9507d934064622bc0bd9db6bbb8422a4706f200898 +repository=nonfree do_build() { sed -i -e 's/^\(CXXFLAGS\)=\(.*\)/\1+=\2/' \ From 0a07a494090e29e9d7d592d30c07cfa474a158ab Mon Sep 17 00:00:00 2001 From: Solitude Date: Wed, 27 Jun 2018 21:01:08 +0300 Subject: [PATCH 213/759] choosenim: build in release mode (#264) --- srcpkgs/choosenim/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template index 4ea58e9b18f..0ea4850ebd2 100644 --- a/srcpkgs/choosenim/template +++ b/srcpkgs/choosenim/template @@ -1,8 +1,8 @@ # Template file for 'choosenim' pkgname=choosenim version=0.3.2 -revision=1 -hostmakedepends="git nim libressl-devel" +revision=2 +hostmakedepends="git nim" makedepends="libressl-devel zlib-devel" depends="gcc" short_desc="The Nim toolchain installer" @@ -12,6 +12,10 @@ homepage="https://github.com/dom96/choosenim" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=2478fcc75c5a147f63f755f700601ce25f8e2ca964b39ac3cb0d903d2fa22a2b +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" libressl-devel" +fi + do_build() { local arch args case "$XBPS_TARGET_MACHINE" in @@ -21,12 +25,12 @@ do_build() { esac if [ -n "$arch" ]; then cat > nim.cfg < Date: Wed, 27 Jun 2018 20:51:50 +0200 Subject: [PATCH 214/759] firefox: update to 61.0. --- srcpkgs/firefox/files/mozconfig | 2 -- srcpkgs/firefox/patches/sndio.patch | 6 +++--- srcpkgs/firefox/template | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index ac17cc10ed3..4581cd1855f 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -42,8 +42,6 @@ ac_add_options --disable-strip ac_add_options --disable-profiling ac_add_options --enable-optimize="$CFLAGS" ac_add_options --enable-pie -# needed to enable stylo at runtime by default -ac_add_options --enable-stylo ac_add_options --enable-official-branding ac_add_options --enable-application=browser diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch index 097b313e90b..b885aa3802a 100644 --- a/srcpkgs/firefox/patches/sndio.patch +++ b/srcpkgs/firefox/patches/sndio.patch @@ -52,13 +52,13 @@ --- build/moz.configure/old.configure.orig +++ build/moz.configure/old.configure @@ -159,6 +159,7 @@ + '--cache-file', + '--datadir', '--enable-accessibility', - '--enable-address-sanitizer', - '--enable-alsa', + '--enable-sndio', '--enable-bundled-fonts', - '--enable-clang-plugin', '--enable-content-sandbox', + '--enable-cookies', --- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig +++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp @@ -349,6 +349,21 @@ diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index d2c39126d26..ad705909fc7 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,19 +3,19 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=60.0.2 +version=61.0 revision=1 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=764566a06b71164e7fd20b2b0e6b08a71b4ccd4d6fd61867eb08011a551f6725 +checksum=3453e8ac7c602390bda0d34a4a636e0d65fd89d9ae69f7aa1740926715c42268 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes -hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm rust cargo +hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo llvm clang" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel From ddcf9a3783a41dd0ed72a8b4161d153260c505f9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 27 Jun 2018 20:59:09 +0200 Subject: [PATCH 215/759] firefox-i18n: update to 61.0. --- srcpkgs/firefox-i18n/template | 190 +++++++++++++++++----------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 32304f861ea..b05611c07c1 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=60.0.1 +version=61.0 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -136,97 +136,97 @@ _pkgtmpl() { } } -checksum="9f2c6f2d1b27ee90446c5b583ceb95c47ad6be65c17011f90d7187c129cc3ebe - 2a2f394a16282de72cb80bcdcfddb8b9eb098094bc12093753634e3198015ccc - 482af3329153e5a207191c0f5ddd7fa6dabbb63060bcca7f08a512e411e23627 - 647e6bf7407f2c34bf1de9709df3ed220abc5ad010e1e3a87a0f77596df35f08 - c84b760bb9245465c61eb0e90a3fd1c8ac4b6f519599c07b8427af84808ea6e4 - 58e15d4b11e2cd031a0eff7d55b5ef9b32f2f3d308079b374ebd45a3d2367788 - bdf804c72b67343a0a55db1c35abb635c59c352ea4283bd69ea961af65666443 - 290f9dd93d9ef59a6429140c544933415558fca996bbafd31d585326781e7c6e - 2223f37aacdc12eef02122a6dd8c54b99909f95344075d05dfdc28335736da54 - 2b4e9781d3bca1c094872d6148c9106d14531fd5446bbd3ba991614ad4ceda19 - e941441bbc58d5a6d29a75eadafe99073404c6c12f8de6b26e4ff7b14174a5ae - f6610922e0f3ac92a5a873e761c347747050a9d8978d200483cd26edbd92085f - 057da7330714f6e89c12890cad670ef5bc03f20950fda1d5e408a47e78d1a3ff - c1fcd9892f63f7a6fa91f049484077196d58cccd4fd4968842f4b476b1e6d8ac - e2b41274cdfa4b61df75e4253fd55e8a4e33acd9695e9486ef3977b247209a86 - 3659e380259d4945fa64a6ba0a98c5b6d7f46fb28ec2645c106472a7f05a38bd - 7e15ac8a2355191b69f6c3053c6552b4dcf96fb24612ee253b9cede182b6fc10 - d7b511aceebcc368436cdfe77aabccb5fcba182a8d02973cb2729e0a1359e428 - bfe7510cf77085ad28c894241af5bcef535dacf96f6206c866a03f2926cd2e4c - 42138b4a07de44cb27b44fd2eeaa61f3eaf4aeeeba86f36a7c4531a3c70eb99b - 69527b9f6c52dad90be4c1ea81ad35c14b1c2885871b61b74887021ee3fd8ca3 - a3e3a41fdf1d6ad25db011d58e89aa36b2d0906d4d7b1db26155825508bf9151 - 32dfd22ef99404837e6ba0b67ac34d26229f3d2b40844e8499aaeb5801c3ac00 - d81cbe48fa673d8869389ee2f7f0e52fdcc83382f49c03026b46a78ad8ffefe2 - fa0afaba0b1f23eeeb1ceb67215d2c246c75c2cf61f7ebc2afefe17d4314421a - c60c8798199f6908c87955026e29fea2545481ccb80c28a958a93223a99d184d - df52b591b8e528235cb2ca61b075f7c44b1a40f949024328a74a71a56e14a9c8 - e2d8dd7efa699707a5ab4264247a28d722a55bbd2ecc90d3c3a04777ab5f8055 - 096c45ba243f82f0cc91e0fb28e6eef88291795123d906d0b77c4ae455d726e9 - 809f3f363669aad573f019bd8a2bfe3f12b6363de510701c827f3b2bd4e41a18 - 70cf5cde3cfb2a91ea30dac79f3001bd039aa4e882f9b3f921ce8120429b79dd - b48059fe0a235dc0df1f6f7acc1f72bbb691842e742df94b034779e9980c4bb7 - fb8b2ebbe19ff794b45ead1fab2b50e77a2d89dc55f6160c7342ff2fa9d1e3a6 - d79350afa1badd3c0afae5080c56cb9b197958a1ea1cb22e2d5607f4e3ddd7cf - e204eb2d93082be7c4c325f2ebd8f15e6942c245bb692a5a9b48746ae9fe3459 - 702915d5a991059d915bd6d51417c8c89de92f44a182ed2a951a6f3f2af3a26e - ce654b3dc192b0ee795badf83ee4d3e3fe43e9cdf241e036cd8310bead7feb1a - 911f6bd57ac08d651e0d2dbebb8fa5c9dc1920c9399b7cde569c0f8c41060b54 - afea12b7291ce528c2e461dd603a8880b3034c155517c55e94d7aa602762fd68 - 43210cf6586debf7d0946582ae3c421b04a9acbff1245e04dd2f82ead7c54528 - 99633747e77d3ccf2b70fb93f3ea0c0d3fe2f4bb12a96da8b43ffa3cc8dd0ea8 - bfd8775a3f53a30d3f213deba8b40c31afb90f79cae2072b5abd552a7550b513 - 05771b81434832f5df8276c1f633c5d9da17beddcedce054a144eb672f58637d - 461b7d0947095cddd96fd38755683abd4da3361cde629790ddd1a4c5f50a7905 - a3664259042d39aa8d103c2697bfd8dec36b204d4cfaa39b94ffab0610f80dde - eb08e4e062a15d2570e73753ba64eee950103f81fb7a3c13f8fabdb9db4bb8a8 - a9cf353ef6875918aa10ac3db90e71e9cda866be9f2241f0129dd2d8166c60ad - 6f82420dac7da25658d558d622c145279e7b6c9e024e7c4f6c9248ade53289fd - 0b5107c7bcb0cfc5c7330acc81e29a10cab19d17dc29b35628489d34674965d3 - 143478665cfcec9737a799016e00b65e9ff7fb649d82d5c562fd2bc86bf871e8 - 3baf02081f34ec5e44a9f52d14117561b39307557eb945cea694d07ce8802bbe - 38dab4b4367ef37d07ccde165c7fda9b5578ecfc30c5e1cacb2f559062ac55d2 - f28fab89f8a8ce81be3ee517b1ff2b93142d8e157e4e951bd403d6a756347a2f - 2162170912aaa6df11d2d73536a58e84f4e2f8a0260c922f710a02b4a2ebfb2c - b8885aff79fa2c783ac036fc2b64a7aae0c9e14267582e9cbb361b7619cf22ff - bc50ce2b586a1bf7c194d3d55742c282ce9cab10a210d027e11166ecc5d71782 - 7706fb846466b87776a1c96035275dc443678b854ffba6e17c1401ad1c7b0a0a - 4bb7fede9dbfc0e632a651d7805aa21bff1cf00e2c7ca2f42fe0941560814b33 - 91496fbf1c46acc5cddc993f5fb698d6cb3b18418134119637b03fc698aed3dd - 5a81cb391be617b680b17c60f3bf9832c5dba05fe88cac719d1c56fe2b7e563e - be1d8eb967400c99e2bd0b89134321582322414df36bf7396258552ec54dc752 - dfd03cef0dc9c1ebca8de19ac22219636483c58c47c62369bb454adf6e708884 - 23449ff57a2a24a8f7c8e1188c5a0a01c8a8913ccfcb64941775a8a13accd634 - 0c5714598f7b6a9a9e373d3bf833f0e01374ba8f94cef78635d0ea313a5db31d - 098e2e7b91f65c020e6157a847a56c3124450920a3d58a82dc051530fe259d95 - fa088a5c16a4b2e3ad9054526d673226f6668c7e21cb15be03d8236daebba7e4 - 320f6df8fcd78440845f16c28cf476d2c790127502f868faa2909255707439c1 - cfc6abda0af18af86b8183235e88a2acfb00051a1d98f57313ed14a8788b6d71 - c43b8b9ee749101b7776a0f2df9235fc579c1287417f307a28a86aa5bdd92b79 - 964e6d6765a31f54a6c5b7ee2a9ba9407d2836af571dda0fd0b64db05a0f2744 - 687b2faeb5c7108fc3bb9f6a059b24f695caffd19473b6325ba7555ebe75144d - 68b9f1792dca8a18d8d9ac54cbfe9d44cd6e2f69235d944c7cf3223ba73244af - 2b76aea47ce17fb9364a2ea3774e03f8d564da49e9a1c48965a262659438d4f7 - d3029b50c49afcd0ff0f6e8561bbbee6bd29138febe424953ad33d3d5f0ce5b9 - ac557afd2c0ddca6f9f7b2fdb770828b68e4c3897e1130b5921c08d5c1a7388d - 8a95aad047ecd3669fb9898eaa08a04dd738b950233556a1e6b3a8f77f7ee849 - 37665f3f0da975fadedd3dbff233b9da8f209ed91e17df687d77a2f4d7912368 - 1ecd05e4af7ae3ec953a5125b18491f13b3fabb426a0bce8e92160797c22921c - 690b8daef68519a709950d38a6dc6e3e08585bdeb6ca9c4307ba4143abd581ab - 129355aff86475d619998539ee4691bd6630800f28acd8b145cf793360375dec - 19ace977dfc039940c6551d012bda76cf367adc55bee35f20daa1c2a8f6ca49a - 79f87e86506a5c0b708b3e03afb676ca7ec691524b25ea87b121f3fe1844995b - 463b3ce225bb89d1575d80d76bcc38cb1563a14e6fe1205c6e85af01aa82d048 - fa57f981946c1fefaf0b60a89916c138248ebe6cff5c1beff0b7563af650f827 - a44b9c554a9a28e8deaeaa339072fb59b1b83d5ac21b9217c7a4c45991151a66 - a4a967985ff28eb2016ca1ffeda616417fa582e9b7d80ee3558ef6d3209234cf - ed6161441a846694e92e2599ed5ed3ee101c5a5614c879e75c84774c67a66e5c - b00a7592cc031b3fb303a5f0401526d66e17816b9784f9665a985ffadac7e167 - 8982bfa40fcf626cf5c8b03c5d56b39481a9de5aa79235cc51a35c93becb8262 - 279fbb7731565381d092cdb64c805b4a913e34fde2f5c1bf3beb5b39008334bf - cecaed7dabd4f6c854686c0e6b51a374aca14f6c4d410299c385b4760b89722b - 67faed09d6f6fbd8b6992916db46d48ae3f9e72c9d87619dd3babd0b0392b2aa - 8f59eec11b816f160b5f767a0d6ed8afe0d61f161c01fbe6d13bd6b94e847de2 - 0dddb9ea7edd64784458381c3002a1c62a6c26ad9fefb3a8be0836d2a5a748e4" +checksum="81376263077a639a0df7dc4f160354043298590782ea7d70c42a789df50f1a32 + 84340ef11e67bae138d932fdcce967affa5966a0c5ab01f2cc03d6f68298f2aa + 7493be648f7def011e18f6c75290c6def9fac3f3ab4950b4b12b588e212f4a77 + ea4596b8811ae7e7f59f501cb3227232812bd53f3def103ad2bf549cb79d2abb + 4540af01013705c0aea6741a0e213f4874afcb14e34e90a150b19c94e38bfe0a + 6d18813b2e05fe16f66f9f0c82a8e08a3a6fa2890be393c80c301110dd81d800 + e7c42a5364a722e5f6f2351a038ff8c6d70742da71669019810d5537d36f0e39 + 0ebf8acad8a81680c135a3c5e2a323cba2207e13edeff400305e492f2c24fe05 + 4ece264c89c8255c74bf65c6a5d25a44af37609e25cc64217c21179accdeaffc + 8357eee0afe8a67521b2273ef931bf216b06aa3b47add5a11534727080b8cbea + dce2996cd26162637f4f9a7a8bca61e8d4b8499175231da3580a482c66b91b4c + 338862ca53012668fd5da30e81ae15f4f9255731110ef3c844154b71e3e8931b + da9600f62ef968b429a5d437e48f84308ced217516a3b80949e396b09bd155d5 + 2afdf45e104400f8c154aeaef8b6099f06fa1ee00cd77353422b8782c80493d5 + 2dae7c9fbff7b95e02246020518f044c97efdb25264523041fc305bc515dd787 + 859aeb9a8927fb6dbc5a29a91492989bc5a60204fbc3f8f01ad2009f89d636f9 + 6769521271903468ecd9065b418646c32cb36b617b4f628bcbd6d6e72081b879 + da9c71cc15f0fbbb272500aba824ac485fcde321e969b50e533dd71b2c5f89d6 + da95616a965a18506033d090ea51cd5875114523ba66587ea8d9e4ca06182e1a + 4522ccd3e85a2a6c8d823ff598c4d2cf1161ad3e51d15fd93b0a5d114eec5b45 + b87c388daaac4a811a82ff1e1318f4655e9ba80798ba82c00bc5eb813ace1556 + c4dde8f507afcbd75466d1d16049227b5b8889e5713607c728f1ba914b0a808e + ca833b1e4bf09a9876394daa81a49f3b314accd9a0491266beefed7c61479be7 + f703ceee50033cbabaad718fbb0740e569e73f61ddc1df6394a458e084864fb2 + df73ab6175e45dc0b17b735ce299bcb6702b1b61aa3fdf5f37b59394ef171447 + d1724db8da185cad11a8809f3ef77876818eef8ad3231e84018461ef1b874134 + d1cf80c4cf7a1acd1f5cdac6ebb9510e23653370bea12e1db6e5c5e60bb41605 + a0ab6bc595321debd89c552873d02ffbe52da1e2e23fb0bf9e7ed6c78bf03054 + 22b801bc0b8a9df2da8db24a631927f1a7811c39fa20d2f8411312c3e302e566 + e4475907568d860b7a22c9e5bac2cb0b8eccb554969dc0302999b2bd3ccc51ea + 0c4571b60b88b12f61fdc05f14b6f1b8f45b52287cb9eac8ab963562a7d958ef + 01facb4effc8c42f898f0e1f76c2ca73e04b4ec506f6837a4572df0195de54fc + cbb3fbd66dd978a48e206b8c346b04ad444f67afb596846295057d21e36282cd + 1276c23a9a6f10b7c4aac59c9e491970e195df109a5de36ebc60cf94915e2780 + db066b4e73c962aaeb3c8756d30e929d333b1aa67c313c9851e09b841895835e + 05cd67ee6422fe7ed089541d90f73a3baf88fa8e9653bf2eb1de4f60d3442112 + 54438b167939fcf94622f98190d13c8a3fd77aec22cbf087223b434452315e7f + 392b336d0494d5e364c31e12042eda32627ef40b77930602de4c1d306a1aa0d3 + ce90b2726134c1f4de19e0238dc23b110ad20065f216a33498f282c94657ec12 + c21270be60c8300c5975bea228d5941504cc8d81757b5392d11b90c0ca353750 + ef4d075fc8b462b1fd7a0aee53432614e521421f52cd0e90cbbe88ea8e39421b + dce20732f2e5dfba243a9bf96c1956c3a0449fd81f4cacc43c350db32fabc96f + 1b8d7033480b6c2bffec3ce76c073a85142eca8ee6f9ede547207ca33d8f55a9 + a8a99bd1415e01764e4f317701f4e09377276da6db93e10e6e0ed9fb4885a7b1 + ed9b9e3792757ef4ff7422e946bc78e84c9a0f1f8e69db03bb242c8c970de163 + fd4018acb9730d98d1f3023539b6d00bde237eb9ea303cb311e88775821c8068 + 4b4f55569b4f0b521365ed18edff1aa6ca06470c4abe5ef93b33956d1d9748de + 8cd75a88cb666e0fa816211dfb943b1c3d0bd71f1fae997b6b8e4021f9ebd43b + f2592d68efd9f0ed4b030b326233d777016916be9b9f61f7feaf47f29e58c427 + 2439855ef019a354d3dd2506a4b26603b622bc35d4fae982906285f4227cd9b2 + c62496c7da43cfd521cba7a243baba3b8d8e45515cf1729a8c757168ab37ee26 + 6beeb507141d9d39a947044dcd7d0ee3e7adb9e1d4a556b0477a16bfa8863d54 + c588f1f693a12e51f47ede13dcdb392d1fa8f64f0644848f06b1fd7c6859b1bd + b2baab1a55bc5b3340ae6155deed01448aae08136427fdf210356f27dc42cc97 + fd1a3292d73db55c3f8021188c687a6f0a90fef05305f5ad917b55ff0c189be1 + d8c0e96648022e617dd8cd21a053bfa45c56ec23cc7ab6fbfdbbfb80a5f1dce0 + cc0b42757564e1b80aa46c296d9ad55aac50a730ec66a76c2b9ca7be9e77b3cf + d5b731cf3a145b590d16af59ea08bcc27438adda449df0cf1ac468ea55e1fee3 + c823dfbed5d34e1e296b698e66843be873f292db54e8748ce28e36d54bceed49 + e01c5cc2770dfbe0b4b0d35dc8ee2062907a0597a94555a7b93e9164f57b9ed7 + 74bea0ab796797620a6e121513dc2f32114dd23969d57cf3298f10a3f471a0fa + 5b1e3a476a683378e6d1af350761435219398c6c9dc7f0bfc52efb6836e6996d + e691c980d0bf89a99e445d7f726e4d5d1242aae16f940405331f8d8d48de42bc + 70c37eeddb05e6503fe381118bfb488a1368e18240125e2b947617c8a9d4c108 + f18d1a9224486c1952119f882460fbf6d32606c69afcac862c9069a4f9fdfc38 + 725958f542984c594e783fd151306e8340fbacfd05a7795ae8ce346704a89829 + 144367fb12f0b92d46854c8b8add994be91069df2f8e05ee1287c1c57f9315be + f313dd641aab012f93f06278f8da94a70cf42b84e8d2a4ba827d663a960f4126 + ec35e052f38863addfdca5a4b5a4b25f78f6ac59e9655b03f53b9b9741778a27 + e3c0ce3575adcb20ef60d44abb4051e23d560f2994b0a337a9bec0dbb50b9b45 + 534701f536ce6d665a38152cb9e0209e67383e1cedc71e28e953aa878325b96c + e97e4800c799baf4f176807e2892995c7c684672e660c5277158b1467589a9d6 + 76afbe14524ca84c6af851fe1567434237cde207f4f3ab138e8078677f00ce9c + 7402fa24d7cd719e917e5ff07d88ab955c65960e085440b553c45aa178821e86 + 3fb1389619e3e0efd2882507434c5683f04abd3aaa54d5f8113240aed3de86bf + 365dfa4198bbb355706ab405473a350ec971efaed324049f230cdf631c9c9d39 + 8c2fbba9144750e55791792c8d17d248ade6a3d6a61c727cfe4f4c69c698102b + 7ba7ee23ee35aabf8068024f7198522ac8bf3780720d63444a9fc3f4919754b9 + 47f6258d2051edfb85e698169ccb646a009eee52c44c7f11240c7f7e68be0c48 + 2c1cf7d3dd8c8db029d06ec63d3a2d1c58f4747ae2dcdc55d1d44cf2e5f2ebb9 + c9fa033ea4bcd3aca38807dc4f52cef7820ebc1e918b30d195491889eb6a4e6c + 4ba0eab56da8a68961dfb8d333dc26f6253d8fa9b5ef773f11396a16ba7cad7a + 03b2bf62131a59bf6064a9d2190e7d1c14bac55f92e33e48335913acc6cfcd75 + 6dc7695eed1cdf0e02064560675a30b6e9cca2caad290f7b46d00f3078a99993 + 72d64bcbc53d2e437c2872f26659c64a82139a7303504b9bdac3ac01ebde1df7 + d1a2e661a450680e56bc07a6dc9bf9502558a66b6689cd0841b8fc8ad37fe457 + d219719dd56d23e702bb4e6fc589b50f5f18734722b857ebbd44f49b14f2f99f + 07a4d63c033e8234e07e29be35ebf3f9ab8ac8e376e7f8882f8e5fd2eb8c9b9d + 4b44592b37c40e12dc636af6422d16327697074fcb74cee3e9bd0f631506a3e5 + fc8da974458213e019261281def322df32f225f4e3099cad5aff38bdc0e77e27 + b38ee1b09a1f539f9e5eb73ba2a01f99fb98b8896d70295bd90b442a78d8a546 + e88fea87214959b23a2cb79f2775bb82c8d5d72dd045298ca66b46a698c06e61 + 3b39e97e9837005e58584101e8048137f2580bd4bcab4688232d75c2f5d9a992 + 9e3ec5dff511c992c84b6961f77f65428bbe60e6999c4c85aea778eb815984e5" From a5a6b5efa75d3a18b73f958eaaeb9a228acc539b Mon Sep 17 00:00:00 2001 From: travankor Date: Wed, 27 Jun 2018 15:08:56 -0700 Subject: [PATCH 216/759] python-chess: update to 0.23.7. --- srcpkgs/python-chess/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-chess/template b/srcpkgs/python-chess/template index 8db35e5f7f3..a9031a71a4c 100644 --- a/srcpkgs/python-chess/template +++ b/srcpkgs/python-chess/template @@ -1,6 +1,6 @@ # Template file for 'python-chess' pkgname=python-chess -version=0.23.6 +version=0.23.7 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="cipr3s " license="GPL-3.0-or-later" homepage="https://github.com/niklasf/python-chess" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=9fff4cc105b63b64b79e602760e89d4e622d8a1193fe69a42bb17ad53e5a6020 +checksum=3cf0153965414ce3e0827c01050baf048d2f2d7c3e188b027eac4be6fcd9a3bb python3-chess_package() { noarch=yes From d1e6845296c590d405719d4b54c396d40a0538a1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 14:29:25 -0300 Subject: [PATCH 217/759] xmlsec1: update to 1.2.26. --- srcpkgs/xmlsec1/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index 3238a759d8c..a5506f7cff4 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,16 +1,16 @@ -# Template file for 'xmlsec' +# Template file for 'xmlsec1' pkgname=xmlsec1 -version=1.2.25 -revision=2 +version=1.2.26 +revision=1 +build_style=gnu-configure hostmakedepends="automake libtool pkg-config gnutls-devel" makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel" -build_style="gnu-configure" +short_desc="XML Security Library is a C library based on LibXML2" maintainer="Enno Boland " license="MIT" homepage="https://www.aleksey.com/xmlsec/" -short_desc="XML Security Library is a C library based on LibXML2" distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz" -checksum=967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2 +checksum=8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50 pre_configure() { autoreconf -if From 78c22baf32f52f37c7e6159661f4c25f8a6c2706 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 14:43:39 -0300 Subject: [PATCH 218/759] xmlrpc-c: update to 1.39.13. --- srcpkgs/xmlrpc-c/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template index 1a74d9e83cc..827d09ee2ba 100644 --- a/srcpkgs/xmlrpc-c/template +++ b/srcpkgs/xmlrpc-c/template @@ -1,6 +1,6 @@ # Template file for 'xmlrpc-c' pkgname=xmlrpc-c -version=1.39.12 +version=1.39.13 revision=1 build_style=gnu-configure configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server @@ -9,12 +9,11 @@ hostmakedepends="pkg-config python" makedepends="libcurl-devel libxml2-devel" short_desc="XML-RPC for C and C++" maintainer="Juan RP " -license="BSD" +license="BSD-3-Clause" homepage="http://xmlrpc-c.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tgz" -checksum=d830f3264a832dfe09f629cc64036acfd08121692526d0fabe090f7ff881ce08 +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" +checksum=491e44cae3763d285fc2a75fe6574882964f16451adbb7e6f3293916e120fca9 -CFLAGS="-fPIC" disable_parallel_build=yes pre_configure() { @@ -41,7 +40,7 @@ xmlrpc-c-devel_package() { local shlib vmove usr/bin vmove usr/include - vmove usr/lib/*.a - vmove usr/lib/*.so + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } From ee60759b86446e9ba2a7aff8f06cde27e0e14bb8 Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Wed, 6 Jun 2018 19:57:59 -0400 Subject: [PATCH 219/759] New package: htmlcxx-0.86 --- common/shlibs | 3 +++ srcpkgs/htmlcxx-devel | 1 + srcpkgs/htmlcxx/template | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 120000 srcpkgs/htmlcxx-devel create mode 100644 srcpkgs/htmlcxx/template diff --git a/common/shlibs b/common/shlibs index 25d27bbdf35..ab35a5f4d4f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3379,3 +3379,6 @@ libticonv.so.8 libticonv-1.1.5_1 libtifiles2.so.10 libtifiles2-1.1.7_1 libticables2.so.7 libticables2-1.3.5_1 libticalcs2.so.12 libticalcs2-1.1.9_1 +libhtmlcxx.so.3 htmlcxx-0.86_1 +libcss_parser_pp.so.0 htmlcxx-0.86_1 +libcss_parser.so.0 htmlcxx-0.86_1 diff --git a/srcpkgs/htmlcxx-devel b/srcpkgs/htmlcxx-devel new file mode 120000 index 00000000000..0469ee84c4e --- /dev/null +++ b/srcpkgs/htmlcxx-devel @@ -0,0 +1 @@ +htmlcxx \ No newline at end of file diff --git a/srcpkgs/htmlcxx/template b/srcpkgs/htmlcxx/template new file mode 100644 index 00000000000..30cf9918303 --- /dev/null +++ b/srcpkgs/htmlcxx/template @@ -0,0 +1,21 @@ +# Template file for 'htmlcxx' +pkgname=htmlcxx +version=0.86 +revision=1 +build_style=gnu-configure +short_desc="A simple non-validating CSS1 and HTML parser for C++" +maintainer="RunningDroid " +license="LGPL-2.0-or-later" +homepage="http://htmlcxx.sourceforge.net/" +distfiles="$SOURCEFORGE_SITE/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=07542b5ea2442143b125ba213b6823ff4a23fff352ecdd84bbebe1d154f4f5c1 + +htmlcxx-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From 95668e2beb6c62bcd0ddd4de74cdafdc864b29d0 Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Thu, 7 Jun 2018 22:23:48 -0400 Subject: [PATCH 220/759] New package: LGOGDownloader-3.3 --- srcpkgs/LGOGDownloader/template | 19 +++++++++++++++++++ srcpkgs/LGOGDownloader/update | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 srcpkgs/LGOGDownloader/template create mode 100644 srcpkgs/LGOGDownloader/update diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template new file mode 100644 index 00000000000..8e2b2ede65b --- /dev/null +++ b/srcpkgs/LGOGDownloader/template @@ -0,0 +1,19 @@ +# Template file for 'LGOGDownloader' +pkgname=LGOGDownloader +version=3.3 +revision=1 +wrksrc="lgogdownloader-${version}" +build_style=cmake +hostmakedepends="pkg-config" +makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel liboauth-devel + rhash-devel jsoncpp-devel boost-devel libressl-devel zlib-devel" +short_desc="An open source downloader for GOG.com games that uses the GOG.com API" +maintainer="RunningDroid " +license="WTFPL" +homepage="https://sites.google.com/site/gogdownloader/" +distfiles="https://sites.google.com/site/gogdownloader/lgogdownloader-${version}.tar.gz" +checksum=8bb7a37b48f558bddeb662ebac32796b0ae11fa2cc57a03d48b3944198e800ce + +if [ -z "$CROSS_BUILD" ]; then + hostmakedepends+=" help2man" +fi diff --git a/srcpkgs/LGOGDownloader/update b/srcpkgs/LGOGDownloader/update new file mode 100644 index 00000000000..e7782db2aa2 --- /dev/null +++ b/srcpkgs/LGOGDownloader/update @@ -0,0 +1,2 @@ +site="https://github.com/Sude-/lgogdownloader/releases" +pattern='v\K.+(?=)' From d1abc701c7bf4b5ed0de91b5f7600f1f051babd3 Mon Sep 17 00:00:00 2001 From: Adam Beckmeyer Date: Wed, 13 Jun 2018 21:23:22 -0400 Subject: [PATCH 221/759] New package: olm-2.2.2 --- srcpkgs/olm-devel | 1 + srcpkgs/olm-python | 1 + srcpkgs/olm-python3 | 1 + srcpkgs/olm/patches/python-find-olm.patch | 19 ++++++++ srcpkgs/olm/template | 58 +++++++++++++++++++++++ 5 files changed, 80 insertions(+) create mode 120000 srcpkgs/olm-devel create mode 120000 srcpkgs/olm-python create mode 120000 srcpkgs/olm-python3 create mode 100644 srcpkgs/olm/patches/python-find-olm.patch create mode 100644 srcpkgs/olm/template diff --git a/srcpkgs/olm-devel b/srcpkgs/olm-devel new file mode 120000 index 00000000000..38ebca23ad7 --- /dev/null +++ b/srcpkgs/olm-devel @@ -0,0 +1 @@ +olm \ No newline at end of file diff --git a/srcpkgs/olm-python b/srcpkgs/olm-python new file mode 120000 index 00000000000..38ebca23ad7 --- /dev/null +++ b/srcpkgs/olm-python @@ -0,0 +1 @@ +olm \ No newline at end of file diff --git a/srcpkgs/olm-python3 b/srcpkgs/olm-python3 new file mode 120000 index 00000000000..38ebca23ad7 --- /dev/null +++ b/srcpkgs/olm-python3 @@ -0,0 +1 @@ +olm \ No newline at end of file diff --git a/srcpkgs/olm/patches/python-find-olm.patch b/srcpkgs/olm/patches/python-find-olm.patch new file mode 100644 index 00000000000..a13f04fb3ad --- /dev/null +++ b/srcpkgs/olm/patches/python-find-olm.patch @@ -0,0 +1,19 @@ +--- python/olm/_base.py ++++ python/olm/_base.py +@@ -1,14 +1,13 @@ + import os.path + + from ctypes import * ++from ctypes import util + + def read_random(n): + with open("/dev/urandom", "rb") as f: + return f.read(n) + +-lib = cdll.LoadLibrary(os.path.join( +- os.path.dirname(__file__), "..", "..", "build", "libolm.so.2") +-) ++lib = cdll.LoadLibrary(util.find_library("olm")) + + lib.olm_error.argtypes = [] + lib.olm_error.restypes = c_size_t diff --git a/srcpkgs/olm/template b/srcpkgs/olm/template new file mode 100644 index 00000000000..0aef7d179aa --- /dev/null +++ b/srcpkgs/olm/template @@ -0,0 +1,58 @@ +# Template file for 'olm' +pkgname=olm +version=2.2.2 +revision=1 +build_style=gnu-makefile +make_check_target=test +hostmakedepends="python-devel python3-devel" +makedepends="python-devel python3-devel" +short_desc="An implementation of the Double Ratchet cryptographic ratchet" +maintainer="Adam Beckmeyer " +license="Apache-2.0" +homepage="https://git.matrix.org/git/olm/about/" +distfiles="https://git.matrix.org/git/olm/snapshot/${pkgname}-${version}.tar.gz" +checksum=0c00127e6c4fcb4ec2cb3f78805a9218551b878f75441a1bc282b94c9fdd7b9a + +post_configure() { + # -O0 prevents _FORTIFY_SOURCE working + for _f in $(find ${wrksrc} -name Makefile); do + sed -i $_f -e "s; -O0;;" + done +} + +do_install() { + make DESTDIR=${DESTDIR} PREFIX=/usr install + for pysl in $py2_sitelib $py3_sitelib; do + mkdir -p ${DESTDIR}${pysl} + cp -r ${wrksrc}/python/olm ${DESTDIR}${pysl} + done +} + +olm-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + } +} + +olm-python_package() { + noarch=yes + short_desc+=" - python bindings" + depends="${sourcepkg}>=${version}_${revision} python" + pycompile_module=olm + pkg_install() { + vmove ${py2_sitelib} + } +} + +olm-python3_package() { + noarch=yes + short_desc+=" - python3 bindings" + depends="${sourcepkg}>=${version}_${revision} python3" + pycompile_module=olm + pkg_install() { + vmove ${py3_sitelib} + } +} From 2358abaa282546283bae8619f1ea3d76fff49fe0 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 12:53:38 -0300 Subject: [PATCH 222/759] mbuffer: update to 20180625. --- srcpkgs/mbuffer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template index 62cb5423d9d..d127c35bbd2 100644 --- a/srcpkgs/mbuffer/template +++ b/srcpkgs/mbuffer/template @@ -1,6 +1,6 @@ # Template file for 'mbuffer' pkgname=mbuffer -version=20180505 +version=20180625 revision=1 build_style=gnu-configure makedepends="libressl-devel" @@ -9,5 +9,5 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later" homepage="http://www.maier-komor.de/mbuffer.html" distfiles="http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz" -checksum=33eb3f6969be995007fe8d3b0b5e301c8d324efeab37553a492bd23d2f330b72 +checksum=b7bce28e3f75803cb84ea31de7a1c4470fa159a33b3c8bc345666150d71f959c conf_files="/etc/mbuffer.rc" From 759be82337afae587d9ec753376a7f14665a8184 Mon Sep 17 00:00:00 2001 From: cr6git Date: Thu, 28 Jun 2018 08:03:08 +0200 Subject: [PATCH 223/759] hunspell-ru_RU: update to 0.4.3. --- srcpkgs/hunspell-ru_RU/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hunspell-ru_RU/template b/srcpkgs/hunspell-ru_RU/template index afc2a25a1fc..fdd934c5fec 100644 --- a/srcpkgs/hunspell-ru_RU/template +++ b/srcpkgs/hunspell-ru_RU/template @@ -1,6 +1,6 @@ # Template file for 'hunspell-ru_RU' pkgname=hunspell-ru_RU -version=0.4.1 +version=0.4.3 revision=1 hostmakedepends="unzip" short_desc="Russian dictionary for hunspell" @@ -8,7 +8,7 @@ maintainer="Alexander Mamay " license="LGPL-2.1-only" homepage="https://extensions.libreoffice.org/extensions/russian-spellcheck-dictionary.-based-on-works-of-aot-group" distfiles="https://extensions.libreoffice.org/extensions/russian-spellcheck-dictionary.-based-on-works-of-aot-group/${version/./-}/@@download/file/dict_ru_ru-aot-${version}.oxt>dict-ru.zip" -checksum=341c5d92c80ae17adecfb9743e040c5e39cbfb78801ad58e44b5787e166106d9 +checksum=ee9b0575e9f8caf1d0a948fb644aed864de47aaf3bc24d2b77f288fec7f8d4c4 create_wrksrc=yes noarch=yes From b387fed4364ae7c639480f8f44cf986bf73f86ea Mon Sep 17 00:00:00 2001 From: cr6git Date: Thu, 28 Jun 2018 11:15:00 +0200 Subject: [PATCH 224/759] mixxx: update to 2.1.1. (#454) --- srcpkgs/mixxx/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 59bc2327041..90c139fc875 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,6 +1,6 @@ # Template file for 'mixxx' pkgname=mixxx -version=2.1.0 +version=2.1.1 revision=1 wrksrc="mixxx-release-${version}" hostmakedepends="pkg-config scons" @@ -13,9 +13,9 @@ depends="qt5-plugin-sqlite" short_desc="Open source digital DJing software that allows mixing music" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.mixxx.org" +homepage="https://www.mixxx.org" distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz" -checksum=148b0ab222fa1c310e62b566d87c0a3d43fdee9435150d40d62055dbc228d396 +checksum=f92f8d9fd34b2b2e7e71dd8c7fd2ce0911180bbbd28407906afeab4db9195236 _scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5" nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio" From 72423cca9e351fc4b1b62592624598a2afdf7403 Mon Sep 17 00:00:00 2001 From: Piotr Date: Thu, 28 Jun 2018 11:16:20 +0200 Subject: [PATCH 225/759] inxi: update to 3.0.14. (#481) --- srcpkgs/inxi/template | 4 ++-- srcpkgs/inxi/update | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template index 55935c1f655..d026365ac25 100644 --- a/srcpkgs/inxi/template +++ b/srcpkgs/inxi/template @@ -1,6 +1,6 @@ # Template file for 'inxi' pkgname=inxi -version=3.0.13 +version=3.0.14 revision=1 wrksrc="inxi-${version}-1" noarch=yes @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://smxi.org/docs/inxi.htm" distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz" -checksum=66f2d61a7862aa5f78f2f6962258cb82fcd5f5db287b76851560cf51512a39bf +checksum=c39047d588af62f89ec0b29f6e7349373f9d33201b1793c6fffa126985695303 do_install() { vbin inxi diff --git a/srcpkgs/inxi/update b/srcpkgs/inxi/update index b2e081e14d8..78285d51b91 100644 --- a/srcpkgs/inxi/update +++ b/srcpkgs/inxi/update @@ -1,2 +1,2 @@ -site="https://github.com/smxi/inxi/raw/master/inxi" -pattern="#### Version: \K.*" +pattern='/inxi/archive/\K[-.\d]+(?=\.tar)' +version=${wrksrc##*inxi-} From 956fb479afda72f6d64a39fb7cfd7a09cfd1d67a Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 28 Jun 2018 12:05:21 +0200 Subject: [PATCH 226/759] Update Cinnamon (#455) * cinnamon-translations: update to 3.8.2. * cinnamon: update to 3.8.6. * cinnamon-settings-daemon: update to 3.8.4. --- srcpkgs/cinnamon-settings-daemon/template | 5 +++-- srcpkgs/cinnamon-translations/template | 6 +++--- srcpkgs/cinnamon/template | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index 93c4800b4a5..f3f46d1de00 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon-settings-daemon' pkgname=cinnamon-settings-daemon -version=3.8.3 +version=3.8.4 revision=1 short_desc="The Cinnamon Settings Daemon" build_style=gnu-configure @@ -14,8 +14,9 @@ depends="desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" +changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-settings-daemon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=4bfa74892e97e0a9b847f4711807c1e5fe3f1ab9d20b1bd0d9c8ee3821b98fa1 +checksum=3c1f63d4d3acc6ee6d38d5d384d49333af1470458e8b53dace3483d1b27135e5 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template index 2124b6faada..2dcf451e6f9 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -1,16 +1,16 @@ # Template file for 'cinnamon-translations' pkgname=cinnamon-translations -version=3.8.1 +version=3.8.2 revision=1 noarch=yes build_style=gnu-makefile short_desc="Translations for Cinnamon and Nemo" maintainer="Juan RP " license="GPL-2.0-or-later" -#changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" +changelog="https://raw.githubusercontent.com/linuxmint/cinnamon-translations/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=99fe1885659c68e9518186ad0152decd9e16065f5e3845ff01e455aa76db9b8c +checksum=f5d187578025d8d02832ba4f24c721a73ef0e24ff758d64272ee2a40c827127e do_install() { vmkdir /usr/share/locale diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 39be2f1bbd7..acca8acc824 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,6 +1,6 @@ # Template file for 'cinnamon' pkgname=cinnamon -version=3.8.4 +version=3.8.6 revision=1 wrksrc="Cinnamon-${version}" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" @@ -25,8 +25,9 @@ depends=" maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="http://developer.linuxmint.com/projects/cinnamon-projects.html/" +changelog="https://raw.githubusercontent.com/linuxmint/Cinnamon/${version}/debian/changelog" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" -checksum=823737315fbbdbf9cdf27b1184abdbc15b9fda889c4126b081e0b94298f49917 +checksum=b4d4a50713a9e373e987c25c9f9ffa8ba63b0673cfedf6aa93dd394359a094cc nocross="gobject-introspection" pycompile_dirs=" From a8c4c4e1729e47dac619fbd2748dbb1aa7a6979a Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 28 Jun 2018 12:59:32 +0200 Subject: [PATCH 227/759] calligra: add missing calligra-plugins dependecy to calligra-words (#459) --- srcpkgs/calligra/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index be83edf8fac..19fee01a7ee 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.1.0 -revision=4 +revision=5 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON" hostmakedepends="automoc4 perl pkg-config extra-cmake-modules" @@ -16,7 +16,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel" license="GPL-2.0-or-later LGPL-2.0-or-later GFDL-1.2-or-later" homepage="http://www.calligra-suite.org/" -distfiles="http://download.kde.org/stable/calligra/${version}/calligra-${version}.tar.xz" +distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz" checksum=6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870 replaces="calligra-braindump>=0 calligra-flow>=0" @@ -105,6 +105,7 @@ calligra-sheets_package() { } calligra-words_package() { short_desc+=" - Word Processor" + depends="calligra-plugins" pkg_install() { cd ${wrksrc}/build/words make DESTDIR=$PKGDESTDIR install From 1c978e5ed68018b89a336965d4ed549bb6e5de85 Mon Sep 17 00:00:00 2001 From: cr6git Date: Thu, 28 Jun 2018 13:53:12 +0200 Subject: [PATCH 228/759] print-manager: update to 18.04.2. (#485) --- srcpkgs/print-manager/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template index e6fb09ec646..c58516c6c71 100644 --- a/srcpkgs/print-manager/template +++ b/srcpkgs/print-manager/template @@ -1,6 +1,6 @@ # Template file for 'print-manager' pkgname=print-manager -version=17.12.1 +version=18.04.2 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -8,7 +8,7 @@ hostmakedepends="extra-cmake-modules" makedepends="plasma-framework-devel kcmutils-devel cups-devel" short_desc="Printing management for KDE 5" maintainer="Giuseppe Fierro " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/KDE/print-manager" -distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" -checksum=ad601ce2c3d8dfb961396d086d16fd37bb3830208083a736378b052505fb9008 +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" +checksum=e9d9c671e3e1095210d68a9f94ef8309a1c05e3e54266529112ab88c93aca7cd From f61f68a4ae50a3a0b54302626f7070031304319f Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Thu, 28 Jun 2018 09:55:01 -0300 Subject: [PATCH 229/759] sdb: update to 1.2.0. (#464) --- srcpkgs/sdb/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sdb/template b/srcpkgs/sdb/template index c573ca80f5e..f343343f60d 100644 --- a/srcpkgs/sdb/template +++ b/srcpkgs/sdb/template @@ -1,6 +1,6 @@ # Template file for 'sdb' pkgname=sdb -version=1.1.0 +version=1.2.0 revision=1 build_style=gnu-makefile make_use_env=yes @@ -9,9 +9,9 @@ makedepends="vala-devel" short_desc="Simple key-value database with JSON support" maintainer="Juan RP " license="LGPL-3.0-or-later" -homepage="http://radare.org" +homepage="https://radare.org" distfiles="https://github.com/radare/sdb/archive/${version}.tar.gz" -checksum=92f0acb30b58556a45629ebc76b9737dca99c9a3561c72ebc31f143aee9b5844 +checksum=7512f0e5a205937a11a5dbe0905eacb3b695c7fb71bb4b6d25b14706fa31a63f sdb-devel_package() { depends="sdb>=${version}_${revision}" From 8ba741fc8e3262f91eda189f998ea7dc423c43e0 Mon Sep 17 00:00:00 2001 From: codingHahn Date: Thu, 28 Jun 2018 14:57:39 +0200 Subject: [PATCH 230/759] godot: update to 3.0.4 (#386) --- srcpkgs/godot/patches/fix-32bit.patch | 11 ----------- srcpkgs/godot/template | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/godot/patches/fix-32bit.patch diff --git a/srcpkgs/godot/patches/fix-32bit.patch b/srcpkgs/godot/patches/fix-32bit.patch deleted file mode 100644 index 4d3de12edb6..00000000000 --- a/srcpkgs/godot/patches/fix-32bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- drivers/unix/os_unix.cpp.orig 2018-04-30 09:53:04.627075270 +0200 -+++ drivers/unix/os_unix.cpp 2018-04-30 09:53:16.892670422 +0200 -@@ -235,7 +235,7 @@ OS::TimeZoneInfo OS_Unix::get_time_zone_ - - void OS_Unix::delay_usec(uint32_t p_usec) const { - -- struct timespec rem = { p_usec / 1000000, (p_usec % 1000000) * 1000 }; -+ struct timespec rem = { (time_t)(p_usec / 1000000), (long)(p_usec % 1000000) * 1000 }; - while (nanosleep(&rem, &rem) == EINTR) { - } - } diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 3de021bd535..99e7ac06056 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,7 +1,7 @@ # Template file for 'godot' pkgname=godot -version=3.0.2 -revision=2 +version=3.0.4 +revision=1 wrksrc="${pkgname}-${version}-stable" build_style=scons hostmakedepends="scons pkg-config clang" @@ -13,7 +13,7 @@ maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=15bc91dcbc92fe49624118678fcab119ff332dc295b25f4921700a4ee498b651 +checksum=ebd2164ecde94c5276fe0420b8b232b13f255c420a1dca6b34e511e17292164e # Godot contains private copies of libraries # that already have been packaged elsewhere. make_build_args="use_llvm=yes platform=x11 tools=yes target=release_debug colored=yes pulseaudio=no" From 8fefa694765ea03f2448665d633ffe59e9c3cd27 Mon Sep 17 00:00:00 2001 From: iaroki Date: Thu, 28 Jun 2018 15:59:44 +0300 Subject: [PATCH 231/759] consul: update to 1.2.0 (#458) --- srcpkgs/consul/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index 84249f6a911..36015fa6754 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -1,6 +1,6 @@ # Template file for 'consul' pkgname=consul -version=1.1.0 +version=1.2.0 revision=1 build_style=go go_import_path="github.com/hashicorp/${pkgname}" @@ -9,4 +9,4 @@ maintainer="iaroki " license="MPL-2.0" homepage="https://www.consul.io/" distfiles="https://github.com/hashicorp/consul/archive/v${version}.tar.gz" -checksum=8e2539561eb07b2623d9828587e68f5ef46cee882227c7331ff26dddcdc0e9df +checksum=949a3904eb881133633a1b63d675c14db610c1271b450e0ecdcf6b18a9dce0d7 From f72eb2255751282d3c37aac98946e45a31f16430 Mon Sep 17 00:00:00 2001 From: cr6git Date: Thu, 28 Jun 2018 15:20:21 +0200 Subject: [PATCH 232/759] feh: update to 2.26.4. (#484) --- srcpkgs/feh/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index ba3e728cfb3..cea05f17b04 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -2,6 +2,9 @@ pkgname=feh version=2.26.4 revision=1 +build_style=gnu-makefile +make_use_env=yes +make_build_args="PREFIX=/usr exif=1 help=1 stat64=1" hostmakedepends="pkg-config" makedepends="giblib-devel libXinerama-devel libXt-devel libcurl-devel libexif-devel libjpeg-turbo-devel" @@ -14,11 +17,10 @@ changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" distfiles="${homepage}/feh-${version}.tar.bz2" checksum=074f8527a17fc5add70018a7f3887d78d5bdf545611636b88641f27e9e844795 -do_build() { - make ${makejobs} CC=$CC PREFIX=/usr exif=1 help=1 stat64=1 +pre_build() { + sed -i 's|doc/feh/examples|examples/feh|' config.mk } -do_install() { - make PREFIX=/usr example_dir=${DESTDIR}/usr/share/examples/feh DESTDIR=${DESTDIR} install +post_install() { vlicense COPYING } From 1e6fd96d8cfe0aec1e1165831e2832dcd6b6ba29 Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 28 Jun 2018 15:24:46 +0200 Subject: [PATCH 233/759] abcm2ps: update to 8.13.23. --- srcpkgs/abcm2ps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index 88ea74ceff9..e802ed7cfc6 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,6 +1,6 @@ # Template file for 'abcm2ps' pkgname=abcm2ps -version=8.13.22 +version=8.13.23 revision=1 build_style=configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="lemmi " license="GPL-2.0-or-later" homepage="http://moinejf.free.fr/" distfiles="https://github.com/leesavide/abcm2ps/archive/v${version}.tar.gz" -checksum=9a1379fd93fcf2d87d580c85b43ca1930a4bc412c291be551af1035d08f26c36 +checksum=84f8a24a57ba7a1e5b989b5154c86700be583a79d3c9c2e4e8a63a94ccdc383c pre_configure() { echo CC=${CC} >> custom From 0c06334070356c741ffb11754693cae79f86592f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 00:06:16 -0300 Subject: [PATCH 234/759] rsyslog: update to 8.36.0. --- srcpkgs/rsyslog/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 0517acb5dcd..7e8383f2894 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.35.0 +version=8.36.0 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql @@ -16,9 +16,9 @@ short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3.0-or-later, Apache-2.0" homepage="https://www.rsyslog.com" -#changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog" -distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=d216a7f7c88341d5964657e61a33193c13d884c988822fced9fce3ab0b1f1082 +changelog="https://raw.githubusercontent.com/rsyslog/rsyslog/master/ChangeLog" +distfiles="${homepage}/files/download/rsyslog/${pkgname}-${version}.tar.gz" +checksum=8a4b5beb92c6b308c3d14de2364c2788f62ef5d37ca0448144619edfe508ee70 conf_files="/etc/rsyslog.conf" make_dirs="/etc/rsyslog.d 0755 root root" lib32disabled=yes From 691a6f02250778fed998a635acf633af80b44a8b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 12:56:35 -0300 Subject: [PATCH 235/759] php: update to 7.2.7. --- srcpkgs/php/patches/fix-libressl-2.7.patch | 102 --------------------- srcpkgs/php/template | 4 +- 2 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 srcpkgs/php/patches/fix-libressl-2.7.patch diff --git a/srcpkgs/php/patches/fix-libressl-2.7.patch b/srcpkgs/php/patches/fix-libressl-2.7.patch deleted file mode 100644 index 19517ed34ea..00000000000 --- a/srcpkgs/php/patches/fix-libressl-2.7.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- ext/openssl/openssl.c.orig 2018-04-24 17:49:42.959226505 +0200 -+++ ext/openssl/openssl.c 2018-04-24 18:05:49.423593182 +0200 -@@ -72,7 +72,8 @@ - #ifdef HAVE_OPENSSL_MD2_H - #define OPENSSL_ALGO_MD2 4 - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #define OPENSSL_ALGO_DSS1 5 - #endif - #define OPENSSL_ALGO_SHA224 6 -@@ -566,7 +567,8 @@ ZEND_GET_MODULE(openssl) - #endif - - /* {{{ OpenSSL compatibility functions and macros */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa - #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh - #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa -@@ -683,7 +685,8 @@ static const unsigned char *ASN1_STRING_ - return M_ASN1_STRING_data(asn1); - } - --#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - static int X509_get_signature_nid(const X509 *x) - { -@@ -1243,7 +1246,8 @@ static void php_openssl_dispose_config(s - } - /* }}} */ - --#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) -+#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) - #define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0) - #else - #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval() -@@ -1330,7 +1334,8 @@ static EVP_MD * php_openssl_get_evp_md_f - mdtype = (EVP_MD *) EVP_md2(); - break; - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - case OPENSSL_ALGO_DSS1: - mdtype = (EVP_MD *) EVP_dss1(); - break; -@@ -1418,7 +1423,8 @@ PHP_MINIT_FUNCTION(openssl) - le_x509 = zend_register_list_destructors_ex(php_openssl_x509_free, NULL, "OpenSSL X.509", module_number); - le_csr = zend_register_list_destructors_ex(php_openssl_csr_free, NULL, "OpenSSL X.509 CSR", module_number); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - OPENSSL_config(NULL); - SSL_library_init(); - OpenSSL_add_all_ciphers(); -@@ -1461,7 +1467,8 @@ PHP_MINIT_FUNCTION(openssl) - #ifdef HAVE_OPENSSL_MD2_H - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT); - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); - #endif - REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT); -@@ -1599,7 +1606,8 @@ PHP_MINFO_FUNCTION(openssl) - */ - PHP_MSHUTDOWN_FUNCTION(openssl) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - EVP_cleanup(); - - /* prevent accessing locking callback from unloaded extension */ -@@ -3644,7 +3652,8 @@ PHP_FUNCTION(openssl_csr_get_public_key) - RETURN_FALSE; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* Due to changes in OpenSSL 1.1 related to locking when decoding CSR, - * the pub key is not changed after assigning. It means if we pass - * a private key, it will be returned including the private part. -@@ -3655,7 +3664,8 @@ PHP_FUNCTION(openssl_csr_get_public_key) - /* Retrieve the public key from the CSR */ - tpubkey = X509_REQ_get_pubkey(csr); - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && \ -+ LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* We need to free the CSR as it was duplicated */ - X509_REQ_free(csr); - #endif diff --git a/srcpkgs/php/template b/srcpkgs/php/template index a469ececde6..5164bfd2e3e 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ # Template file for 'php' pkgname=php -version=7.2.6 +version=7.2.7 revision=1 hostmakedepends="bison pkg-config" makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel @@ -12,7 +12,7 @@ maintainer="Steve Prybylski " license="PHP-3.01" homepage="https://www.php.net" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=1f004e049788a3effc89ef417f06a6cf704c95ae2a718b2175185f2983381ae7 +checksum=eb01c0153b3baf1f64b8b044013ce414b52fede222df3f509e8ff209478f31f0 conf_files="/etc/php/php.ini" # Needs (probably a lot of) work to make it cross compile From f4fedf5d372e70c6c70b68426765ac1af6c98150 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 16:19:35 -0300 Subject: [PATCH 236/759] edbrowse: update to 3.7.4. --- srcpkgs/edbrowse/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template index edf65d9c073..1b40b1b3c96 100644 --- a/srcpkgs/edbrowse/template +++ b/srcpkgs/edbrowse/template @@ -1,9 +1,9 @@ # Template file for 'edbrowse' pkgname=edbrowse -version=3.7.3 +version=3.7.4 revision=1 hostmakedepends="perl pkg-config" -build_style="cmake" +build_style=cmake makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel readline-devel" short_desc="Line-oriented text editor, web browser and mail client similar to ed(1)" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://edbrowse.org/" distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz" -checksum=ae7717c4c30297a01185ae2705fd55a7cd5f5484db05d5dfc02b7932b5766498 +checksum=b79e6417c1170c96ef68968c33d585725f0f2d27859e3fe807c980a9c33ea719 do_install() { vbin build/edbrowse From da3a25bd3b28a676e3345cdbe0a0599ea7b79372 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Jun 2018 16:23:11 +0200 Subject: [PATCH 237/759] brotli: update to 1.0.5. --- srcpkgs/brotli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/brotli/template b/srcpkgs/brotli/template index ac527471cde..94afa913f90 100644 --- a/srcpkgs/brotli/template +++ b/srcpkgs/brotli/template @@ -1,6 +1,6 @@ # Template file for 'brotli' pkgname=brotli -version=1.0.4 +version=1.0.5 revision=1 build_style=cmake short_desc="Generic-purpose lossless compression algorithm" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/google/brotli" distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz" -checksum=2268a3dff1cc36e18549e89a51ee0cd9513908a977d56d6a1f9d4c61c2af37c3 +checksum=3d5bedd48edb909fe3b87cb99f7d139b987ef6f1616b7e22d74e928270a2fd20 post_install() { vlicense LICENSE From 6642b1945574d6d471236f98ea11b00145d5b0b8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Jun 2018 16:23:14 +0200 Subject: [PATCH 238/759] debootstrap: update to 1.0.104. --- srcpkgs/debootstrap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index c7a1c059ec4..eb0ddbce920 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,6 +1,6 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.103 +version=1.0.104 revision=1 build_style=fetch depends="binutils gnupg gzip tar wget xz" @@ -10,7 +10,7 @@ license="MIT" homepage="http://packages.qa.debian.org/d/debootstrap.html" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb" -checksum="44b2896539965d1de67f8040c93ea23ff6f57fa33db4f1adbcecacb5de77e893 +checksum="1bea11bdfa83e7c8c287882e2597a7bbf619c4cc52ec62070797daac36c18bf3 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0" do_install() { From 567654a59d9f5fb49f7eb2acdc3d756dca0528ee Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Jun 2018 16:23:18 +0200 Subject: [PATCH 239/759] progress: update to 0.14. --- srcpkgs/progress/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/progress/template b/srcpkgs/progress/template index 261d50f1b08..ee8616553f6 100644 --- a/srcpkgs/progress/template +++ b/srcpkgs/progress/template @@ -1,14 +1,14 @@ # Template file for progress' pkgname=progress -version=0.13.1 -revision=2 +version=0.14 +revision=1 maintainer="Leah Neukirchen " makedepends="ncurses-devel" -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/Xfennec/progress" short_desc="Tool for showing the progress of cp, rm, dd and more" distfiles="https://github.com/Xfennec/progress/archive/v${version}.tar.gz" -checksum=064c95e8b93893dbf4b4b8152290cbb3b0c005eda0cae500353561048c9939a5 +checksum=214a0d84b3ee5dde57ec9952ec9aa68ad9261fb336ef025324b344ed7ab48af1 provides="cv-${version}_${revision}" replaces="cv>=0" From 715d919a1bae904bbc3de6b6b9415f482aef4ed3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Jun 2018 16:31:17 +0200 Subject: [PATCH 240/759] netpbm: update to 10.82.03. --- srcpkgs/netpbm/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 08f51e2f1f9..ae4d54c3b07 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.82.01 +version=10.82.03 revision=1 -_githash=41940d88c082a27d5b52d584fc044d6fa832aabd -_githash_guide=42098725cc6d9484c2d8b5c0427f38754c0a17c8 +_githash=3be1029c5d1e62ae6f243e62d0853ca3f17ba0da +_githash_guide=a615465999de69b20b7d4b2981477a90b6cc3db3 create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -17,8 +17,8 @@ homepage="http://netpbm.sourceforge.net/" nocross=yes distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="ae0228bf864221a749c5878e0cb0b5fa7814015c641ac61ac9905070834900c1 - b2f1a0d9f622c37e98fafbed69f42b7a497938eb0164f37a001a5e54051160b6" +checksum="c1825ec9942b16e21b0cb0e0c2f576287fa16da20a891f1f3c33ce64bd7e1d1a + 9060b6af454fddfa53379177600f68040b2ce83995e1ab4d58e70158bf1efdd5" post_extract() { cd $build_wrksrc From c3dac8b220b925be8b5af639d99a4a2b95b18470 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 28 Jun 2018 16:31:23 +0200 Subject: [PATCH 241/759] xpra: update to 2.3.2. --- srcpkgs/xpra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index 6bedcdbb08b..21b7c50b2ca 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=2.3.1 +version=2.3.2 revision=1 build_style=python2-module pycompile_module="xpra" @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" #changelog="https://xpra.org/svn/Xpra/trunk/debian/changelog" distfiles="https://xpra.org/src/${pkgname}-${version}.tar.xz" -checksum=3e0fea421f8ad30daecd496e8c0cf31e6993ad3f3f17f69481f39ec37395f071 +checksum=26da705a555f58b0e20b07333faaae824bbb66590dd50b95628ab7413ab5970b conf_files=" /etc/xpra/xpra.conf /etc/xpra/xorg.conf From 98bbbad6b626e47e6f25ef5583e8fe2e706e4149 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 28 Jun 2018 14:36:15 +0200 Subject: [PATCH 242/759] firefox: use internal hunspell Closes #483, #487 --- srcpkgs/firefox/files/mozconfig | 1 - srcpkgs/firefox/patches/disable-hunspell_hooks.patch | 11 ----------- srcpkgs/firefox/template | 9 ++------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/firefox/patches/disable-hunspell_hooks.patch diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index 4581cd1855f..05965d93c2d 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -17,7 +17,6 @@ ac_add_options --with-system-icu # XXX: the system's libpng doesn't have APNG support ac_add_options --without-system-png ac_add_options --enable-system-pixman -ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi diff --git a/srcpkgs/firefox/patches/disable-hunspell_hooks.patch b/srcpkgs/firefox/patches/disable-hunspell_hooks.patch deleted file mode 100644 index a5f7c29f2bd..00000000000 --- a/srcpkgs/firefox/patches/disable-hunspell_hooks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 -+++ mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 -@@ -54,7 +54,7 @@ - * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, - * unless --enable-system-hunspell is defined. - */ --#if defined(HUNSPELL_STATIC) -+#if 0 - #include "hunspell_alloc_hooks.h" - #include "hunspell_fopen_hooks.h" - #endif diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index ad705909fc7..359843748d4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -4,7 +4,7 @@ # pkgname=firefox version=61.0 -revision=1 +revision=2 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" @@ -19,7 +19,7 @@ hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo llvm clang" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel - libXrender-devel hunspell-devel libXcomposite-devel libSM-devel libXt-devel + libXrender-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if startup_notification startup-notification-devel) @@ -116,11 +116,6 @@ do_install() { usr/share/icons/hicolor/${i}/apps firefox.png done - # Use system-provided dictionaries - rm -rf ${DESTDIR}/usr/lib/firefox/{dictionaries,hyphenation} - ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/firefox/dictionaries - ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/firefox/hyphenation - # We don't want the development stuff rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel,share/idl} From 7335f49cafa4d42523a03478661b32d88d236c9d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 27 Jun 2018 23:45:45 +0000 Subject: [PATCH 243/759] haproxy: update to 1.8.11. resolves #478 --- .../haproxy/patches/fix-libressl-2.5.patch | 46 -------- srcpkgs/haproxy/patches/libressl-2.7.patch | 104 ++++++++++++++++++ ...patch-include_proto_openssl-compat_h.patch | 15 --- srcpkgs/haproxy/template | 4 +- 4 files changed, 106 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/haproxy/patches/fix-libressl-2.5.patch create mode 100644 srcpkgs/haproxy/patches/libressl-2.7.patch delete mode 100644 srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch diff --git a/srcpkgs/haproxy/patches/fix-libressl-2.5.patch b/srcpkgs/haproxy/patches/fix-libressl-2.5.patch deleted file mode 100644 index 578d64e3bcb..00000000000 --- a/srcpkgs/haproxy/patches/fix-libressl-2.5.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- src/ssl_sock.c.orig 2017-01-13 09:03:00 UTC -+++ src/ssl_sock.c -@@ -792,8 +792,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c - ocsp = NULL; - - #ifndef SSL_CTX_get_tlsext_status_cb --# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ -- *cb = (void (*) (void))ctx->tlsext_status_cb; -+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB -+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 -+#endif -+#define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ -+ *cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb) - #endif - SSL_CTX_get_tlsext_status_cb(ctx, &callback); - -@@ -821,7 +824,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c - int key_type; - EVP_PKEY *pkey; - --#ifdef SSL_CTX_get_tlsext_status_arg -+#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER) -+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG -+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129 -+#endif - SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); - #else - cb_arg = ctx->tlsext_status_arg; -@@ -3537,7 +3543,7 @@ int ssl_sock_handshake(struct connection - OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx); - empty_handshake = state == TLS_ST_BEFORE; - #else -- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; -+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; - #endif - - if (empty_handshake) { -@@ -3615,7 +3621,7 @@ int ssl_sock_handshake(struct connection - state = SSL_get_state((SSL *)conn->xprt_ctx); - empty_handshake = state == TLS_ST_BEFORE; - #else -- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; -+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; - #endif - if (empty_handshake) { - if (!errno) { diff --git a/srcpkgs/haproxy/patches/libressl-2.7.patch b/srcpkgs/haproxy/patches/libressl-2.7.patch new file mode 100644 index 00000000000..6c348dc5271 --- /dev/null +++ b/srcpkgs/haproxy/patches/libressl-2.7.patch @@ -0,0 +1,104 @@ +diff --git a/include/proto/openssl-compat.h include/proto/openssl-compat.h +index b6fe1d2..551cae2 100644 +--- a/include/proto/openssl-compat.h ++++ include/proto/openssl-compat.h +@@ -89,7 +89,7 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned cha + } + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) || defined(OPENSSL_IS_BORINGSSL) ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) || defined(OPENSSL_IS_BORINGSSL) + /* + * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL / BoringSSL + */ +@@ -121,7 +121,7 @@ static inline const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP * + + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) + /* + * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL + */ +diff --git a/src/ssl_sock.c src/ssl_sock.c +index c2b5bf6..ebde76d 100644 +--- a/src/ssl_sock.c ++++ src/ssl_sock.c +@@ -56,6 +56,14 @@ + #include + #endif + ++#if defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_ASYNC) ++#define OPENSSL_NO_ASYNC ++#endif ++ ++#if defined(SSL_READ_EARLY_DATA_ERROR) && defined(SSL_READ_EARLY_DATA_SUCCESS) ++#define HAVE_SSL_READ_EARLY ++#endif ++ + #if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(OPENSSL_NO_ASYNC) + #include + #endif +@@ -2066,7 +2074,7 @@ static void ssl_sock_switchctx_set(SSL *ssl, SSL_CTX *ctx) + SSL_set_SSL_CTX(ssl, ctx); + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) || defined(OPENSSL_IS_BORINGSSL) ++#if ((OPENSSL_VERSION_NUMBER >= 0x10101000L) || defined(OPENSSL_IS_BORINGSSL)) && !defined(LIBRESSL_VERSION_NUMBER) + + static int ssl_sock_switchctx_err_cbk(SSL *ssl, int *al, void *priv) + { +@@ -3798,7 +3806,7 @@ ssl_sock_initial_ctx(struct bind_conf *bind_conf) + #ifdef OPENSSL_IS_BORINGSSL + SSL_CTX_set_select_certificate_cb(ctx, ssl_sock_switchctx_cbk); + SSL_CTX_set_tlsext_servername_callback(ctx, ssl_sock_switchctx_err_cbk); +-#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX_set_client_hello_cb(ctx, ssl_sock_switchctx_cbk, NULL); + SSL_CTX_set_tlsext_servername_callback(ctx, ssl_sock_switchctx_err_cbk); + #else +@@ -5052,7 +5060,7 @@ int ssl_sock_handshake(struct connection *conn, unsigned int flag) + if (!conn->xprt_ctx) + goto out_error; + +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if HAVE_SSL_READ_EARLY + /* + * Check if we have early data. If we do, we have to read them + * before SSL_do_handshake() is called, And there's no way to +@@ -5252,7 +5260,7 @@ check_error: + goto out_error; + } + } +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if HAVE_SSL_READ_EARLY + else { + /* + * If the server refused the early data, we have to send a +@@ -5375,7 +5383,7 @@ static int ssl_sock_to_buf(struct connection *conn, struct buffer *buf, int coun + continue; + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if OPENSSL_READ_EARLY + if (conn->flags & CO_FL_EARLY_SSL_HS) { + size_t read_length; + +@@ -5512,7 +5520,7 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl + * in which case we accept to do it once again. + */ + while (buf->o) { +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if HAVE_SSL_EARLY_DATA + size_t written_data; + #endif + +@@ -5531,7 +5539,7 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl + conn->xprt_st |= SSL_SOCK_SEND_UNLIMITED; + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if HAVE_SSL_EARLY_DATA + if (!SSL_is_init_finished(conn->xprt_ctx)) { + unsigned int max_early; + diff --git a/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch b/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch deleted file mode 100644 index 474a51e22bc..00000000000 --- a/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-include_proto_openssl-compat_h,v 1.6 2018/03/20 21:57:55 sthen Exp $ - -Index: include/proto/openssl-compat.h ---- include/proto/openssl-compat.h.orig -+++ include/proto/openssl-compat.h -@@ -89,7 +89,8 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESS - } - #endif - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - /* - * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL - */ diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index d5821df2f41..55191c1cb7a 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,6 +1,6 @@ # Template file for 'haproxy' pkgname=haproxy -version=1.7.11 +version=1.8.11 revision=1 build_style=gnu-makefile make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 @@ -12,7 +12,7 @@ maintainer="Eivind Uggedal " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.haproxy.org" distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz" -checksum=d564b8e9429d1e8e13cb648bf4694926b472e36da1079df946bb732927b232ea +checksum=b4b403ceb5efe3c65c6d86e1a44fc0953189f12cdf0bd884e5df04bbabb27947 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}" conf_files="/etc/${pkgname}/${pkgname}.cfg" system_accounts="${pkgname}" From b5384a7a946b662ae0968a6bcc7158b3d15b5b0d Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Thu, 28 Jun 2018 13:22:26 -0600 Subject: [PATCH 244/759] kitty: update to 0.11.1 (#188) --- srcpkgs/kitty/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index f6d7d7bf71e..26e1125596d 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,9 +1,9 @@ # Template file for 'kitty' pkgname=kitty -version=0.10.1 +version=0.11.1 revision=1 python_version=3 -hostmakedepends="ncurses pkg-config python3-devel wayland-devel wayland-protocols" +hostmakedepends="ncurses pkg-config" makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel python3-devel wayland-devel wayland-protocols" depends="kitty-terminfo" @@ -11,9 +11,13 @@ conf_files="/etc/kitty/kitty.conf" short_desc="Modern, hackable, featureful, OpenGL based terminal emulator" maintainer="Julio Galvan " license="GPL-3.0-or-later" -homepage="https://github.com/kovidgoyal/kitty" -distfiles="https://github.com/kovidgoyal/kitty/archive/v${version}.tar.gz" -checksum=ef22208497a76e2f88ebe56c176e4608f049b056252cf1bf122c9c1ec711cfa6 +homepage="https://sw.kovidgoyal.net/kitty/" +distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz" +checksum=3baf72ee4de8818bbc205fd631f716b60eabc8bd215ec7e834e00a01db7912c4 + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" python3-devel wayland-devel wayland-protocols" +fi do_build() { if [ -n "$CROSS_BUILD" ]; then @@ -29,7 +33,7 @@ do_build() { do_install() { vmkdir etc/kitty - cp ${DESTDIR}/usr/lib/kitty/kitty/kitty.conf ${DESTDIR}/etc/kitty/ + cp ${DESTDIR}/usr/share/doc/kitty/html/_downloads/kitty.conf ${DESTDIR}/etc/kitty/ } kitty-terminfo_package() { From 0cc83029cc38746c8f24666351726e0344b0f2ea Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 28 Jun 2018 21:28:25 +0200 Subject: [PATCH 245/759] Rebuild xkeyboard-config and cryptsetup for aarch64 (#477) * xkeyboard-config: rebuild for aarch64 * cryptsetup: rebuild for aarch64 --- srcpkgs/cryptsetup/template | 2 +- srcpkgs/xkeyboard-config/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index be398ffe18c..81c2685f21f 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,7 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup version=2.0.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt" diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index 4144902a18f..453a86ab969 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -1,7 +1,7 @@ # Template file for 'xkeyboard-config' pkgname=xkeyboard-config version=2.24 -revision=1 +revision=2 noarch=yes build_style=gnu-configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" From 6a3cb912a7384712d70adce917f19a4f102e7c94 Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 28 Jun 2018 21:36:54 +0200 Subject: [PATCH 246/759] android-tools: update to 8.1.0r14. (#105) --- srcpkgs/android-tools/files/generate_build.rb | 415 +++++++++ .../patches/android-tools-musl.patch | 160 ---- .../patches/android-tools-uchar.patch | 10 - .../android-tools/patches/android-tools.patch | 822 ------------------ srcpkgs/android-tools/patches/gcc-fixes.patch | 30 + .../android-tools/patches/musl-fixes.patch | 199 +++++ srcpkgs/android-tools/template | 74 +- 7 files changed, 702 insertions(+), 1008 deletions(-) create mode 100755 srcpkgs/android-tools/files/generate_build.rb delete mode 100644 srcpkgs/android-tools/patches/android-tools-musl.patch delete mode 100644 srcpkgs/android-tools/patches/android-tools-uchar.patch delete mode 100644 srcpkgs/android-tools/patches/android-tools.patch create mode 100644 srcpkgs/android-tools/patches/gcc-fixes.patch create mode 100644 srcpkgs/android-tools/patches/musl-fixes.patch diff --git a/srcpkgs/android-tools/files/generate_build.rb b/srcpkgs/android-tools/files/generate_build.rb new file mode 100755 index 00000000000..e9319557b62 --- /dev/null +++ b/srcpkgs/android-tools/files/generate_build.rb @@ -0,0 +1,415 @@ +#!/usr/bin/ruby +# This ruby script has been copied from Arch Linux. + +# Android build system is complicated and does not allow to build +# separate parts easily. +# This script tries to mimic Android build rules. + +def expand(dir, files) + files.map{|f| File.join(dir,f)} +end + +# Compiles sources to *.o files. +# Returns array of output *.o filenames +def compile(sources, cflags) + outputs = [] + for s in sources + ext = File.extname(s) + + case ext + when '.c' + cc = 'cc' + lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS' + when '.cpp', '.cc' + cc = 'cxx' + lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS' + else + raise "Unknown extension #{ext}" + end + + output = s + '.o' + outputs << output + puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}" + end + + return outputs +end + +# dir - directory where ninja file is located +# lib - static library path relative to dir +def subninja(dir, lib) + puts "subninja #{dir}build.ninja" + return lib.each{|l| dir + l} +end + +# Links object files +def link(output, objects, ldflags) + puts "build #{output}: link #{objects.join(' ')}\n ldflags = #{ldflags} $LDFLAGS" +end + +puts "# This set of commands generated by generate_build.rb script\n\n" +puts "CC = #{ENV['CC'] || 'clang'}" +puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n" +puts "CFLAGS = #{ENV['CFLAGS']}" +puts "CXXFLAGS = #{ENV['CXXFLAGS']}" +puts "LDFLAGS = #{ENV['LDFLAGS']}" +puts "PKGVER = #{ENV['PKGVER']}\n\n" + + +puts """ +rule cc + command = $CC $cflags -c $in -o $out + +rule cxx + command = $CXX $cflags -c $in -o $out + +rule link + command = $CXX $ldflags $LDFLAGS $in -o $out + + +""" + +adbdfiles = %w( + adb.cpp + adb_io.cpp + adb_listeners.cpp + adb_trace.cpp + adb_utils.cpp + bugreport.cpp + line_printer.cpp + sockets.cpp + transport.cpp + transport_local.cpp + transport_usb.cpp + transport_mdns_unsupported.cpp + fdevent.cpp + adb_auth_host.cpp + shell_service_protocol.cpp +) +libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include') + +adbfiles = %w( + console.cpp + socket_spec.cpp + commandline.cpp + adb_client.cpp + services.cpp + file_sync_client.cpp + sysdeps_unix.cpp + sysdeps/errno.cpp + client/main.cpp + client/usb_dispatch.cpp + client/usb_linux.cpp + client/usb_libusb.cpp + sysdeps/posix/network.cpp +) +libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb') + +basefiles = %w( + file.cpp + logging.cpp + parsenetaddress.cpp + stringprintf.cpp + strings.cpp + errors_unix.cpp + test_utils.cpp +) +libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include') + +logfiles = %w( + log_event_write.c + fake_log_device.c + log_event_list.c + logger_write.c + config_write.c + config_read.c + logger_lock.c + local_logger.c + fake_writer.c + logger_name.c + stderr_write.c + logprint.c +) +liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include') + +cutilsfiles = %w( + load_file.c + socket_local_client_unix.c + socket_network_client_unix.c + socket_local_server_unix.c + sockets_unix.cpp + socket_inaddr_any_server_unix.c + sockets.cpp + android_get_control_file.cpp + threads.c + fs_config.cpp + canned_fs_config.c +) +libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include') + +diagnoseusbfiles = %w( + diagnose_usb.cpp +) +libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include') + +libcryptofiles = %w( + android_pubkey.c +) +libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include') + +# TODO: make subninja working +#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a']) +boringssl = ['boringssl/build/crypto/libcrypto.a'] + +link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0') + + +fastbootfiles = %w( + protocol.cpp + engine.cpp + bootimg_utils.cpp + fastboot.cpp + util.cpp + fs.cpp + usb_linux.cpp + socket.cpp + tcp.cpp + udp.cpp +) +libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include') + +sparsefiles = %w( + backed_block.c + output_file.c + sparse.c + sparse_crc32.c + sparse_err.c + sparse_read.cpp +) +libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include') + +f2fsfiles = %w( + f2fs_utils.c + f2fs_ioutils.c + f2fs_dlutils.c +) +f2fs = compile(expand('extras/f2fs_utils', f2fsfiles), '-Iextras/f2fs_utils -If2fs-tools/include -If2fs-tools/mkfs -Icore/libsparse/include -Iselinux/libselinux/include') + +zipfiles = %w( + zip_archive.cc +) +libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include') + +utilfiles = %w( + FileMap.cpp +) +libutil = compile(expand('core/libutils', utilfiles), '-Icore/include') + +ext4files = %w( + make_ext4fs.c + ext4fixup.c + ext4_utils.c + allocate.c + contents.c + extent.c + indirect.c + sha1.c + wipe.c + crc16.c + ext4_sb.c +) +libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include') + +selinuxfiles = %w( + callbacks.c + check_context.c + freecon.c + init.c + label.c + label_file.c + label_support.c + setrans_client.c + regex.c + matchpathcon.c + selinux_config.c + label_backends_android.c + canonicalize_context.c + lsetfilecon.c + policyvers.c + lgetfilecon.c + load_policy.c + seusers.c + sha1.c + booleans.c + disable.c + enabled.c + getenforce.c + setenforce.c +) +libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include') + +libsepolfiles = %w( + policydb_public.c + genbools.c + debug.c + policydb.c + conditional.c + services.c + ebitmap.c + util.c + assertion.c + avtab.c + hashtab.c + sidtab.c + context.c + genusers.c + context_record.c + mls.c + avrule_block.c + symtab.c + policydb_convert.c + write.c + constraint.c + expand.c + hierarchy.c +) +libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include') + +link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl') + + +# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955) +libext2fsfiles = %w( + lib/blkid/cache.c + lib/blkid/dev.c + lib/blkid/devname.c + lib/blkid/devno.c + lib/blkid/getsize.c + lib/blkid/llseek.c + lib/blkid/probe.c + lib/blkid/read.c + lib/blkid/resolve.c + lib/blkid/save.c + lib/blkid/tag.c + lib/e2p/feature.c + lib/e2p/hashstr.c + lib/e2p/mntopts.c + lib/e2p/ostype.c + lib/e2p/parse_num.c + lib/e2p/uuid.c + lib/et/com_err.c + lib/et/error_message.c + lib/et/et_name.c + lib/ext2fs/alloc.c + lib/ext2fs/alloc_sb.c + lib/ext2fs/alloc_stats.c + lib/ext2fs/alloc_tables.c + lib/ext2fs/atexit.c + lib/ext2fs/badblocks.c + lib/ext2fs/bb_inode.c + lib/ext2fs/bitmaps.c + lib/ext2fs/bitops.c + lib/ext2fs/blkmap64_ba.c + lib/ext2fs/blkmap64_rb.c + lib/ext2fs/blknum.c + lib/ext2fs/block.c + lib/ext2fs/bmap.c + lib/ext2fs/closefs.c + lib/ext2fs/crc16.c + lib/ext2fs/crc32c.c + lib/ext2fs/csum.c + lib/ext2fs/dirblock.c + lib/ext2fs/dir_iterate.c + lib/ext2fs/expanddir.c + lib/ext2fs/ext2_err.c + lib/ext2fs/ext_attr.c + lib/ext2fs/extent.c + lib/ext2fs/fallocate.c + lib/ext2fs/fileio.c + lib/ext2fs/freefs.c + lib/ext2fs/gen_bitmap64.c + lib/ext2fs/gen_bitmap.c + lib/ext2fs/get_num_dirs.c + lib/ext2fs/getsectsize.c + lib/ext2fs/getsize.c + lib/ext2fs/i_block.c + lib/ext2fs/ind_block.c + lib/ext2fs/initialize.c + lib/ext2fs/inline.c + lib/ext2fs/inline_data.c + lib/ext2fs/inode.c + lib/ext2fs/io_manager.c + lib/ext2fs/ismounted.c + lib/ext2fs/link.c + lib/ext2fs/llseek.c + lib/ext2fs/lookup.c + lib/ext2fs/mkdir.c + lib/ext2fs/mkjournal.c + lib/ext2fs/mmp.c + lib/ext2fs/namei.c + lib/ext2fs/newdir.c + lib/ext2fs/openfs.c + lib/ext2fs/progress.c + lib/ext2fs/punch.c + lib/ext2fs/rbtree.c + lib/ext2fs/read_bb.c + lib/ext2fs/read_bb_file.c + lib/ext2fs/res_gdt.c + lib/ext2fs/rw_bitmaps.c + lib/ext2fs/sparse_io.c + lib/ext2fs/symlink.c + lib/ext2fs/undo_io.c + lib/ext2fs/unix_io.c + lib/ext2fs/valid_blk.c + lib/support/dict.c + lib/support/mkquota.c + lib/support/parse_qtype.c + lib/support/plausible.c + lib/support/prof_err.c + lib/support/profile.c + lib/support/quotaio.c + lib/support/quotaio_tree.c + lib/support/quotaio_v2.c + lib/uuid/gen_uuid.c + lib/uuid/isnull.c + lib/uuid/pack.c + lib/uuid/parse.c + lib/uuid/unpack.c + lib/uuid/unparse.c + misc/create_inode.c +) +libext2fs = compile(expand('e2fsprogs', libext2fsfiles), '-Ie2fsprogs/lib -Icore/libsparse/include') + + +mke2fsfiles = %w( + misc/default_profile.c + misc/mke2fs.c + misc/mk_hugefiles.c + misc/util.c +) +mke2fs = compile(expand('e2fsprogs', mke2fsfiles), '-Ie2fsprogs/lib') + +link('mke2fs.android', mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lpthread -lz') + + +e2fsdroidfiles = %w( + contrib/android/e2fsdroid.c + contrib/android/basefs_allocator.c + contrib/android/block_range.c + contrib/android/hashmap.c + contrib/android/base_fs.c + contrib/android/fsmap.c + contrib/android/block_list.c + contrib/android/perms.c +) +e2fsdroid = compile(expand('e2fsprogs', e2fsdroidfiles), '-Ie2fsprogs/lib -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc') + +link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8') + + +ext2simgfiles = %w( + contrib/android/ext2simg.c +) +ext2simg = compile(expand('e2fsprogs', ext2simgfiles), '-Ie2fsprogs/lib -Icore/libsparse/include') + +link('ext2simg', ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lz -lpthread') diff --git a/srcpkgs/android-tools/patches/android-tools-musl.patch b/srcpkgs/android-tools/patches/android-tools-musl.patch deleted file mode 100644 index e3630ce48c4..00000000000 --- a/srcpkgs/android-tools/patches/android-tools-musl.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff --git core/include/ziparchive/zip_archive.h core/include/ziparchive/zip_archive.h -index 7dc60ae..8886a35 100644 ---- core/include/ziparchive/zip_archive.h -+++ core/include/ziparchive/zip_archive.h -@@ -22,11 +22,12 @@ - - #include - #include --#include - #include - #include - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Zip compression methods we support */ - enum { -@@ -215,6 +216,8 @@ int GetFileDescriptor(const ZipArchiveHandle handle); - - const char* ErrorCodeString(int32_t error_code); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif // LIBZIPARCHIVE_ZIPARCHIVE_H_ -diff --git core/liblog/log_portability.h core/liblog/log_portability.h -index 3ad2060..2b859c4 100644 ---- core/liblog/log_portability.h -+++ core/liblog/log_portability.h -@@ -17,7 +17,6 @@ - #ifndef _LIBLOG_PORTABILITY_H__ - #define _LIBLOG_PORTABILITY_H__ - --#include - #include - - /* Helpful private sys/cdefs.h like definitions */ - -diff --git core/include/private/android_filesystem_config.h core/include/private/android_filesystem_config.h -index c220a0c..d38f971 100644 ---- core/include/private/android_filesystem_config.h -+++ core/include/private/android_filesystem_config.h -@@ -22,7 +22,6 @@ - #ifndef _ANDROID_FILESYSTEM_CONFIG_H_ - #define _ANDROID_FILESYSTEM_CONFIG_H_ - --#include - #include - #include - -@@ -230,7 +229,10 @@ struct fs_path_config { - - /* Rules for directories and files has moved to system/code/libcutils/fs_config.c */ - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - - /* - * Used in: -@@ -247,7 +249,9 @@ void fs_config(const char *path, int dir, const char *target_out_path, - - ssize_t fs_config_generate(char *buffer, size_t length, const struct fs_path_config *pc); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif - #endif -diff --git core/base/file.cpp core/base/file.cpp -index da1adba..7ba6d23 100644 ---- core/base/file.cpp -+++ core/base/file.cpp -@@ -111,7 +111,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path, - - bool WriteStringToFile(const std::string& content, const std::string& path) { - int flags = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NOFOLLOW | O_BINARY; -- int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, DEFFILEMODE)); -+ int fd = TEMP_FAILURE_RETRY(open(path.c_str(), flags, (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))); - if (fd == -1) { - return false; - } -diff --git core/adb/sysdeps.h core/adb/sysdeps.h -index 75dcc86..2dba172 100644 ---- core/adb/sysdeps.h -+++ core/adb/sysdeps.h -@@ -757,18 +757,7 @@ static __inline__ int adb_thread_setname(const std::string& name) { - #ifdef __APPLE__ - return pthread_setname_np(name.c_str()); - #else -- const char *s = name.c_str(); -- -- // pthread_setname_np fails rather than truncating long strings. -- const int max_task_comm_len = 16; // including the null terminator -- if (name.length() > (max_task_comm_len - 1)) { -- char buf[max_task_comm_len]; -- strncpy(buf, name.c_str(), sizeof(buf) - 1); -- buf[sizeof(buf) - 1] = '\0'; -- s = buf; -- } -- -- return pthread_setname_np(pthread_self(), s) ; -+ return 0; - #endif - } - -diff --git core/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp -index 0f067b0..1138f8d 100644 ---- core/adb/diagnose_usb.cpp -+++ core/adb/diagnose_usb.cpp -@@ -32,28 +32,7 @@ static const char kPermissionsHelpUrl[] = "http://developer.android.com/tools/de - // Returns a message describing any potential problems we find with udev, or nullptr if we can't - // find plugdev information (i.e. udev is not installed). - static const char* GetUdevProblem() { --#if defined(__linux__) -- errno = 0; -- group* plugdev_group = getgrnam("plugdev"); -- -- if (plugdev_group == nullptr) { -- if (errno != 0) { -- perror("failed to read plugdev group info"); -- } -- // We can't give any generally useful advice here, just let the caller print the help URL. -- return nullptr; -- } -- -- // getgroups(2) indicates that the group_member() may not check the egid so we check it -- // additionally just to be sure. -- if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) { -- // The user is in plugdev so the problem is likely with the udev rules. -- return "verify udev rules"; -- } -- return "udev requires plugdev group membership"; --#else - return nullptr; --#endif - } - - // Short help text must be a single line, and will look something like: -diff --git core/fastboot/socket.cpp core/fastboot/socket.cpp -index 14ecd93..aff905c 100644 ---- core/fastboot/socket.cpp -+++ core/fastboot/socket.cpp -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - Socket::Socket(cutils_socket_t sock) : sock_(sock) {} - - Socket::~Socket() { diff --git a/srcpkgs/android-tools/patches/android-tools-uchar.patch b/srcpkgs/android-tools/patches/android-tools-uchar.patch deleted file mode 100644 index 2656c43948f..00000000000 --- a/srcpkgs/android-tools/patches/android-tools-uchar.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- core/include/cutils/jstring.h.orig 2017-04-13 09:40:53.139449328 +0200 -+++ core/include/cutils/jstring.h 2017-04-13 09:39:36.520748834 +0200 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - - #ifdef __cplusplus - extern "C" { diff --git a/srcpkgs/android-tools/patches/android-tools.patch b/srcpkgs/android-tools/patches/android-tools.patch deleted file mode 100644 index 5089eb7f1c0..00000000000 --- a/srcpkgs/android-tools/patches/android-tools.patch +++ /dev/null @@ -1,822 +0,0 @@ -diff --git a/Makefile b/Makefile -new file mode 100644 -index 000000000000..4644fc0b62ad ---- /dev/null -+++ Makefile -@@ -0,0 +1,47 @@ -+all: -+ $(MAKE) -C core/libcutils all -+ $(MAKE) -C libselinux all -+ $(MAKE) -C core/libziparchive all -+ $(MAKE) -C extras/ext4_utils all -+ $(MAKE) -C core/libsparse all -+ $(MAKE) -C core/libutils all -+ $(MAKE) -C core/liblog all -+ $(MAKE) -C core/base all -+ $(MAKE) -C gtest all -+ $(MAKE) -C extras/f2fs_utils all -+ $(MAKE) -C core/adb all -+ $(MAKE) -C core/fastboot all -+ -+install: all -+ $(MAKE) -C core/adb install -+ $(MAKE) -C core/fastboot install -+ -+clean: -+ $(MAKE) -C core/libcutils clean -+ $(MAKE) -C libselinux clean -+ $(MAKE) -C core/libziparchive clean -+ $(MAKE) -C extras/ext4_utils clean -+ $(MAKE) -C core/libsparse clean -+ $(MAKE) -C core/libutils clean -+ $(MAKE) -C core/liblog clean -+ $(MAKE) -C core/adb libdiagnose_usb -+ $(MAKE) -C core/base clean -+ $(MAKE) -C gtest clean -+ $(MAKE) -C extras/f2fs_utils clean -+ $(MAKE) -C core/adb clean -+ $(MAKE) -C core/fastboot clean -+ -+mrproper: -+ $(MAKE) -C core/libcutils mrproper -+ $(MAKE) -C libselinux mrproper -+ $(MAKE) -C core/libziparchive mrproper -+ $(MAKE) -C extras/ext4_utils mrproper -+ $(MAKE) -C core/libsparse mrproper -+ $(MAKE) -C core/libutils mrproper -+ $(MAKE) -C core/liblog mrproper -+ $(MAKE) -C core/adb libdiagnose_usb -+ $(MAKE) -C core/base mrproper -+ $(MAKE) -C gtest mrproper -+ $(MAKE) -C extras/f2fs_utils mrproper -+ $(MAKE) -C core/adb mrproper -+ $(MAKE) -C core/fastboot mrproper -diff --git core/adb/Makefile core/adb/Makefile -new file mode 100644 -index 0000000..8ef539b ---- /dev/null -+++ core/adb/Makefile -@@ -0,0 +1,97 @@ -+adb_version := $(shell git -C . rev-parse --short=12 HEAD 2>/dev/null)-android -+ -+SRCS+= \ -+ adb_client.cpp \ -+ client/main.cpp \ -+ console.cpp \ -+ commandline.cpp \ -+ file_sync_client.cpp \ -+ line_printer.cpp \ -+ services.cpp \ -+ shell_service_protocol.cpp \ -+ -+LIBADB_SRCS= \ -+ adb.cpp \ -+ adb_auth.cpp \ -+ adb_io.cpp \ -+ adb_listeners.cpp \ -+ adb_trace.cpp \ -+ adb_utils.cpp \ -+ fdevent.cpp \ -+ sockets.cpp \ -+ transport.cpp \ -+ transport_local.cpp \ -+ transport_usb.cpp \ -+ adb_auth_host.cpp \ -+ get_my_path_linux.cpp \ -+ sysdeps_unix.cpp \ -+ usb_linux.cpp \ -+ -+LIBDIAGNOSE_USB_SRCS= \ -+ diagnose_usb.cpp -+ -+ -+override CXXFLAGS+= \ -+ -I. \ -+ -I../include \ -+ -I../base/include \ -+ -D_Nonnull="" \ -+ -D_Nullable="" \ -+ -D_GNU_SOURCE \ -+ -Wall \ -+ -Wextra \ -+ -Wno-unused-parameter \ -+ -Wno-missing-field-initializers \ -+ -Wvla \ -+ -DADB_REVISION='"$(adb_version)"' \ -+ -std=gnu++14 \ -+ -DADB_HOST=1 \ -+ -fpermissive \ -+ -fvisibility=hidden -+ -+ -+LIBS= \ -+ ./libadb.a \ -+ ./libdiagnose_usb.a \ -+ ../base/libbase.a \ -+ ../libcutils/libcutils.a \ -+ ../liblog/liblog.a -+ -+override LDFLAGS+= -lssl -lcrypto -lpthread -+ -+OBJS= $(SRCS:.cpp=.o) -+LIBADB_OBJS= $(LIBADB_SRCS:.cpp=.o) -+LIBDIAGNOSE_USB_OBJS= $(LIBDIAGNOSE_USB_SRCS:.cpp=.o) -+ -+BIN= adb -+ -+all: $(BIN) -+ -+adb: $(OBJS) libadb libdiagnose_usb -+ $(CXX) -o $@ $(OBJS) $(LIBS) $(LDFLAGS) -+ -+ -+libadb: libadb.a -+ -+libadb.a: $(LIBADB_OBJS) -+ $(AR) rcs $@ $(LIBADB_OBJS) -+ -+libdiagnose_usb: libdiagnose_usb.a -+ -+libdiagnose_usb.a: $(LIBDIAGNOSE_USB_OBJS) -+ $(AR) rcs $@ $(LIBDIAGNOSE_USB_OBJS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+install: adb -+ install -Dm755 adb $(DESTDIR)$(PREFIX)/bin/adb -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) $(LIBADB_OBJS) $(LIBDIAGNOSE_USB_OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) *.a -+ -diff --git core/base/Makefile core/base/Makefile -new file mode 100644 -index 0000000..d3e7436 ---- /dev/null -+++ core/base/Makefile -@@ -0,0 +1,37 @@ -+SRCS+= \ -+ file.cpp \ -+ logging.cpp \ -+ parsenetaddress.cpp \ -+ stringprintf.cpp \ -+ strings.cpp \ -+ test_utils.cpp \ -+ errors_unix.cpp -+ -+override CXXFLAGS+= \ -+ -I./include \ -+ -I../include \ -+ -D__GLIBC__ \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -std=gnu++14 -+ -+OBJS= $(SRCS:.cpp=.o) -+ -+BIN= libbase.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/base/errors_unix.cpp core/base/errors_unix.cpp -index 296995e..3b983d3 100644 ---- core/base/errors_unix.cpp -+++ core/base/errors_unix.cpp -@@ -17,6 +17,7 @@ - #include "android-base/errors.h" - - #include -+#include - - namespace android { - namespace base { -diff --git core/base/logging.cpp core/base/logging.cpp -index 1741871..0aaae2e 100644 ---- core/base/logging.cpp -+++ core/base/logging.cpp -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git core/fastboot/Makefile core/fastboot/Makefile -new file mode 100644 -index 0000000..6d81f7c ---- /dev/null -+++ core/fastboot/Makefile -@@ -0,0 +1,70 @@ -+fastboot_version := $(shell git -C . rev-parse --short=12 HEAD 2>/dev/null)-android -+ -+SRCS+= \ -+ bootimg_utils.cpp \ -+ engine.cpp \ -+ fastboot.cpp \ -+ fs.cpp\ -+ protocol.cpp \ -+ socket.cpp \ -+ tcp.cpp \ -+ udp.cpp \ -+ util.cpp \ -+ usb_linux.cpp \ -+ util_linux.cpp -+ -+ -+override CXXFLAGS+= \ -+ -I../mkbootimg/ \ -+ -I../base/include \ -+ -I../libsparse/include \ -+ -I../include \ -+ -I../adb \ -+ -I../../gtest/include \ -+ -I../../extras/ext4_utils \ -+ -I../../extras/f2fs_utils \ -+ -Wall \ -+ -Wextra \ -+ -Werror \ -+ -Wunreachable-code \ -+ -DFASTBOOT_REVISION='"$(fastboot_version)"' \ -+ -std=gnu++14 -+ -+LIBS= \ -+ ../libziparchive/libziparchive.a \ -+ ../../extras/ext4_utils/libext4_utils.a \ -+ ../libsparse/libsparse.a \ -+ ../libutils/libutils.a \ -+ ../liblog/liblog.a \ -+ ../adb/libdiagnose_usb.a \ -+ ../base/libbase.a \ -+ ../libcutils/libcutils.a \ -+ ../../gtest/libgtest.a \ -+ ../../extras/f2fs_utils/libf2fs.a \ -+ ../libcutils/libcutils.a \ -+ ../../libselinux/libselinux.a -+ -+override LDFLAGS+= -lz -lpcre -lpthread -+ -+OBJS= $(SRCS:.cpp=.o) -+ -+BIN= fastboot -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(CXX) -o $@ $(OBJS) $(LIBS) $(LDFLAGS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+install: fastboot -+ install -Dm755 fastboot $(DESTDIR)$(PREFIX)/bin/fastboot -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/include/cutils/atomic.h core/include/cutils/atomic.h -index ded972a..2ff6fce 100644 ---- core/include/cutils/atomic.h -+++ core/include/cutils/atomic.h -@@ -19,7 +19,12 @@ - - #include - #include -+#ifdef __cplusplus -+#include -+using namespace std; -+#else - #include -+#endif - - #ifndef ANDROID_ATOMIC_INLINE - #define ANDROID_ATOMIC_INLINE static inline -@@ -114,6 +119,7 @@ int32_t android_atomic_or(int32_t value, volatile int32_t* addr) - return atomic_fetch_or_explicit(a, value, memory_order_release); - } - -+#ifndef __cplusplus - /* - * Perform an atomic load with "acquire" or "release" ordering. - * -@@ -208,6 +214,7 @@ int android_atomic_release_cas(int32_t oldvalue, int32_t newvalue, - memory_order_release, - memory_order_relaxed)); - } -+#endif - - /* - * Fence primitives. -diff --git core/include/log/log.h core/include/log/log.h -index e606a84..963347a 100644 ---- core/include/log/log.h -+++ core/include/log/log.h -@@ -38,6 +38,7 @@ - #include - - #ifdef __cplusplus -+#include - extern "C" { - #endif - -diff --git core/libcutils/Makefile core/libcutils/Makefile -new file mode 100644 -index 0000000..ec9c573 ---- /dev/null -+++ core/libcutils/Makefile -@@ -0,0 +1,59 @@ -+CSRCS+= \ -+ config_utils.c \ -+ fs_config.c \ -+ canned_fs_config.c \ -+ hashmap.c \ -+ iosched_policy.c \ -+ load_file.c \ -+ native_handle.c \ -+ open_memstream.c \ -+ process_name.c \ -+ record_stream.c \ -+ sched_policy.c \ -+ strdup16to8.c \ -+ strdup8to16.c \ -+ strlcpy.c \ -+ threads.c \ -+ fs.c \ -+ multiuser.c \ -+ socket_inaddr_any_server_unix.c \ -+ socket_local_client_unix.c \ -+ socket_local_server_unix.c \ -+ socket_loopback_client_unix.c \ -+ socket_loopback_server_unix.c \ -+ socket_network_client_unix.c \ -+ str_parms.c \ -+ ashmem-host.c \ -+ trace-host.c \ -+ dlmalloc_stubs.c -+ -+CXXSRCS+= \ -+ sockets_unix.cpp \ -+ sockets.cpp -+ -+override CFLAGS+= -I../include -+ -+override CXXFLAGS+= -I../include -+ -+COBJS= $(CSRCS:.c=.o) -+CXXOBJS= $(CXXSRCS:.cpp=.o) -+BIN= libcutils.a -+ -+all: $(BIN) -+ -+$(BIN): $(COBJS) $(CXXOBJS) -+ $(AR) rcs $@ $(COBJS) $(CXXOBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(COBJS) $(CXXOBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libcutils/fs.c core/libcutils/fs.c -index 3f14de7..175df6a 100644 ---- core/libcutils/fs.c -+++ core/libcutils/fs.c -@@ -79,7 +79,7 @@ static int fs_prepare_path_impl(const char* path, mode_t mode, uid_t uid, gid_t - create: - create_result = prepare_as_dir - ? TEMP_FAILURE_RETRY(mkdir(path, mode)) -- : TEMP_FAILURE_RETRY(open(path, O_CREAT | O_CLOEXEC | O_NOFOLLOW | O_RDONLY)); -+ : TEMP_FAILURE_RETRY(open(path, O_CREAT | O_CLOEXEC | O_NOFOLLOW | O_RDONLY, mode)); - if (create_result == -1) { - if (errno != EEXIST) { - ALOGE("Failed to %s(%s): %s", -diff --git core/liblog/Makefile core/liblog/Makefile -new file mode 100644 -index 0000000..75a0af3 ---- /dev/null -+++ core/liblog/Makefile -@@ -0,0 +1,39 @@ -+SRCS+= \ -+ log_event_list.c \ -+ log_event_write.c \ -+ logger_write.c \ -+ config_write.c \ -+ logger_name.c \ -+ logger_lock.c \ -+ fake_log_device.c \ -+ fake_writer.c \ -+ event_tag_map.c -+ -+ -+override CFLAGS+= \ -+ -I../include \ -+ -DLIBLOG_LOG_TAG=1005 \ -+ -DSNET_EVENT_LOG_TAG=1397638484 \ -+ -DFAKE_LOG_DEVICE=1 \ -+ -Werror \ -+ -fvisibility=hidden -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= liblog.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libpackagelistparser/Makefile core/libpackagelistparser/Makefile -new file mode 100644 -index 0000000..38a0158 ---- /dev/null -+++ core/libpackagelistparser/Makefile -@@ -0,0 +1,20 @@ -+SRCS+= \ -+ packagelistparser.c -+ -+override CFLAGS+= -I../include -+override CFLAGS+= -I./include -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libpackagelistparser.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+clean: -+ rm -rf *.o -diff --git core/libsparse/Makefile core/libsparse/Makefile -new file mode 100644 -index 0000000..418c028 ---- /dev/null -+++ core/libsparse/Makefile -@@ -0,0 +1,31 @@ -+SRCS+= \ -+ backed_block.c \ -+ output_file.c \ -+ sparse.c \ -+ sparse_crc32.c \ -+ sparse_err.c \ -+ sparse_read.c -+ -+override CFLAGS+= \ -+ -I./include \ -+ -Werror -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libsparse.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libutils/Makefile core/libutils/Makefile -new file mode 100644 -index 0000000..82a22b9 ---- /dev/null -+++ core/libutils/Makefile -@@ -0,0 +1,50 @@ -+SRCS+= \ -+ CallStack.cpp \ -+ FileMap.cpp \ -+ JenkinsHash.cpp \ -+ LinearTransform.cpp \ -+ Log.cpp \ -+ NativeHandle.cpp \ -+ Printer.cpp \ -+ PropertyMap.cpp \ -+ RefBase.cpp \ -+ SharedBuffer.cpp \ -+ Static.cpp \ -+ StopWatch.cpp \ -+ String8.cpp \ -+ String16.cpp \ -+ SystemClock.cpp \ -+ Threads.cpp \ -+ Timers.cpp \ -+ Tokenizer.cpp \ -+ Unicode.cpp \ -+ VectorImpl.cpp \ -+ misc.cpp \ -+ Looper.cpp \ -+ ProcessCallStack.cpp -+ -+override CXXFLAGS+= \ -+ -I../include \ -+ -I../../safe-iop/include \ -+ -DLIBUTILS_NATIVE=1 \ -+ -std=gnu++14 -+ -+OBJS= $(SRCS:.cpp=.o) -+ -+BIN= libutils.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.cpp -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libziparchive/Makefile core/libziparchive/Makefile -new file mode 100644 -index 0000000..4eef274 ---- /dev/null -+++ core/libziparchive/Makefile -@@ -0,0 +1,34 @@ -+SRCS+= \ -+ zip_archive.cc \ -+ zip_archive_stream_entry.cc \ -+ zip_writer.cc \ -+ -+override CXXFLAGS+= \ -+ -I./include \ -+ -I../include \ -+ -I../base/include \ -+ -DZLIB_CONST \ -+ -Werror \ -+ -fno-strict-aliasing \ -+ -std=gnu++14 \ -+ -Wall -+ -+OBJS= $(SRCS:.cc=.o) -+ -+BIN= libziparchive.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git core/libziparchive/zip_writer.cc core/libziparchive/zip_writer.cc -index 1ebed30..5c622d0 100644 ---- core/libziparchive/zip_writer.cc -+++ core/libziparchive/zip_writer.cc -@@ -24,6 +24,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git extras/ext4_utils/Makefile extras/ext4_utils/Makefile -new file mode 100644 -index 0000000..000aaca ---- /dev/null -+++ extras/ext4_utils/Makefile -@@ -0,0 +1,38 @@ -+SRCS+= \ -+ make_ext4fs.c \ -+ ext4fixup.c \ -+ ext4_utils.c \ -+ allocate.c \ -+ contents.c \ -+ extent.c \ -+ indirect.c \ -+ sha1.c \ -+ wipe.c \ -+ crc16.c \ -+ ext4_sb.c -+ -+override CFLAGS+= \ -+ -I../../core/libsparse/include \ -+ -I../../core/include \ -+ -I../../libselinux/include \ -+ -fno-strict-aliasing -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libext4_utils.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git extras/f2fs_utils/Makefile extras/f2fs_utils/Makefile -new file mode 100644 -index 0000000..d81ac9a ---- /dev/null -+++ extras/f2fs_utils/Makefile -@@ -0,0 +1,34 @@ -+SRCS+= \ -+ f2fs_utils.c \ -+ f2fs_ioutils.c \ -+ f2fs_dlutils.c -+ -+ -+override CFLAGS+= \ -+ -I../../f2fs-tools/include \ -+ -I../../f2fs-tools/mkfs \ -+ -I../../core/libsparse/include \ -+ -I../../libselinux/include \ -+ -Wno-unused-parameter -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libf2fs.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -+ -+ -diff --git extras/f2fs_utils/f2fs_utils.c extras/f2fs_utils/f2fs_utils.c -index 6254c08..05ec599 100644 ---- extras/f2fs_utils/f2fs_utils.c -+++ extras/f2fs_utils/f2fs_utils.c -@@ -53,7 +53,7 @@ static void reset_f2fs_info() { - config.fd = -1; - if (f2fs_sparse_file) { - sparse_file_destroy(f2fs_sparse_file); -- f2fs_sparse_file = NULL; -+ f2fs_sparse_file = 0; - } - } - -@@ -73,6 +73,6 @@ int make_f2fs_sparse_fd(int fd, long long len, - sparse_file_write(f2fs_sparse_file, fd, /*gzip*/0, /*sparse*/1, /*crc*/0); - sparse_file_destroy(f2fs_sparse_file); - flush_sparse_buffs(); -- f2fs_sparse_file = NULL; -+ f2fs_sparse_file = 0; - return 0; - } -diff --git libselinux/Makefile libselinux/Makefile -new file mode 100644 -index 0000000..52ef5cc ---- /dev/null -+++ libselinux/Makefile -@@ -0,0 +1,31 @@ -+SRCS+= \ -+ src/callbacks.c \ -+ src/check_context.c \ -+ src/freecon.c \ -+ src/init.c \ -+ src/label.c \ -+ src/label_file.c \ -+ src/label_android_property.c \ -+ src/label_support.c -+ -+override CFLAGS+= -I./include -+ -+OBJS= $(SRCS:.c=.o) -+ -+BIN= libselinux.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.c -+ $(CC) -c $< $(CFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -diff --git gtest/Makefile gtest/Makefile -new file mode 100644 -index 0000000..49a50aa ---- /dev/null -+++ gtest/Makefile -@@ -0,0 +1,36 @@ -+SRCS+= \ -+ src/gtest-all.cc \ -+ src/gtest-filepath.cc \ -+ src/gtest-printers.cc \ -+ src/gtest-typed-test.cc \ -+ src/gtest_main.cc \ -+ src/gtest-death-test.cc \ -+ src/gtest-port.cc \ -+ src/gtest-test-part.cc \ -+ src/gtest.cc -+ -+ -+override CXXFLAGS+= \ -+ -I./include \ -+ -I. -+ -+OBJS= $(SRCS:.cc=.o) -+ -+BIN= libgtest.a -+ -+all: $(BIN) -+ -+$(BIN): $(OBJS) -+ $(AR) rcs $@ $(OBJS) -+ -+%.o: %.cc -+ $(CXX) -c $< $(CXXFLAGS) -o $@ -+ -+.PHONY: clean mrproper -+ -+clean: -+ rm -rf $(OBJS) -+ -+mrproper: clean -+ rm -rf $(BIN) -+ diff --git a/srcpkgs/android-tools/patches/gcc-fixes.patch b/srcpkgs/android-tools/patches/gcc-fixes.patch new file mode 100644 index 00000000000..fc0e60fa06e --- /dev/null +++ b/srcpkgs/android-tools/patches/gcc-fixes.patch @@ -0,0 +1,30 @@ +--- core/adb/sysdeps.h ++++ core/adb/sysdeps.h +@@ -66,6 +66,11 @@ + #endif + #endif + ++#ifndef __clang__ ++#define _Nonnull ++#define _Nullable ++#endif ++ + #ifdef _WIN32 + + // Clang-only nullability specifiers +--- core/libcutils/include/cutils/trace.h ++++ core/libcutils/include/cutils/trace.h +@@ -18,7 +18,13 @@ + #define _LIBS_CUTILS_TRACE_H + + #include ++// https://gcc.gnu.org/PR60932 ++#ifdef __cplusplus ++#include ++using namespace std; ++#else + #include ++#endif + #include + #include + #include diff --git a/srcpkgs/android-tools/patches/musl-fixes.patch b/srcpkgs/android-tools/patches/musl-fixes.patch new file mode 100644 index 00000000000..235ef68854e --- /dev/null +++ b/srcpkgs/android-tools/patches/musl-fixes.patch @@ -0,0 +1,199 @@ +Patch has been taken from Arch Linux with some minor modifications for +needed to build android-tools with musl libc. + +diff -upr core.orig/adb/client/usb_libusb.cpp core/adb/client/usb_libusb.cpp +--- core.orig/adb/client/usb_libusb.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/adb/client/usb_libusb.cpp 2018-02-25 10:35:06.661418453 +0100 +@@ -21,6 +21,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -28,7 +29,7 @@ + #include + #include + +-#include ++#include + + #include + #include +diff -upr core.orig/adb/diagnose_usb.cpp core/adb/diagnose_usb.cpp +--- core.orig/adb/diagnose_usb.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/adb/diagnose_usb.cpp 2018-02-25 10:35:06.658085109 +0100 +@@ -45,9 +45,7 @@ static std::string GetUdevProblem() { + return ""; + } + +- // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it +- // additionally just to be sure. +- if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) { ++ if (getegid() == plugdev_group->gr_gid) { + // The user is in plugdev so the problem is likely with the udev rules. + return "user in plugdev group; are your udev rules wrong?"; + } +diff -upr core.orig/adb/sysdeps/posix/network.cpp core/adb/sysdeps/posix/network.cpp +--- core.orig/adb/sysdeps/posix/network.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/adb/sysdeps/posix/network.cpp 2018-02-25 10:35:06.661418453 +0100 +@@ -21,6 +21,7 @@ + #include + + #include ++#include + + #include "adb_unique_fd.h" + +diff -upr core.orig/base/errors_unix.cpp core/base/errors_unix.cpp +--- core.orig/base/errors_unix.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/base/errors_unix.cpp 2018-02-25 10:35:06.654751766 +0100 +@@ -17,6 +17,7 @@ + #include "android-base/errors.h" + + #include ++#include + + namespace android { + namespace base { +diff -upr core.orig/base/file.cpp core/base/file.cpp +--- core.orig/base/file.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/base/file.cpp 2018-02-25 10:35:06.654751766 +0100 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -upr core.orig/base/logging.cpp core/base/logging.cpp +--- core.orig/base/logging.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/base/logging.cpp 2018-02-25 10:35:06.654751766 +0100 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + // For getprogname(3) or program_invocation_short_name. + #if defined(__ANDROID__) || defined(__APPLE__) +@@ -89,7 +90,7 @@ static thread_id GetThreadId() { + } + + namespace { +-#if defined(__GLIBC__) ++#if defined(__linux__) + const char* getprogname() { + return program_invocation_short_name; + } +diff -upr core.orig/fastboot/fs.cpp core/fastboot/fs.cpp +--- core.orig/fastboot/fs.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/fastboot/fs.cpp 2018-02-25 10:35:06.651418422 +0100 +@@ -108,7 +108,7 @@ static int generate_ext4_image(const cha + static constexpr int block_size = 4096; + const std::string exec_dir = android::base::GetExecutableDirectory(); + +- const std::string mke2fs_path = exec_dir + "/mke2fs"; ++ const std::string mke2fs_path = exec_dir + "/mke2fs.android"; + std::vector mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"}; + + std::string block_size_str = std::to_string(block_size); +diff -upr core.orig/fastboot/socket.cpp core/fastboot/socket.cpp +--- core.orig/fastboot/socket.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/fastboot/socket.cpp 2018-02-25 10:35:06.651418422 +0100 +@@ -28,6 +28,8 @@ + + #include "socket.h" + ++#include ++ + #include + #include + +diff -upr core.orig/libsparse/sparse_read.cpp core/libsparse/sparse_read.cpp +--- core.orig/libsparse/sparse_read.cpp 2017-11-29 19:11:44.000000000 +0100 ++++ core/libsparse/sparse_read.cpp 2018-02-25 10:35:06.621418331 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + #include +diff -upr selinux.orig/libsepol/src/private.h selinux/libsepol/src/private.h +--- selinux.orig/libsepol/src/private.h 2017-08-13 09:34:17.000000000 +0200 ++++ selinux/libsepol/src/private.h 2018-02-25 10:36:31.765008355 +0100 +@@ -14,7 +14,7 @@ + #endif + + #include +-#include ++#include "dso.h" + + #ifdef __APPLE__ + #define __BYTE_ORDER BYTE_ORDER +diff -upr selinux.orig/libsepol/src/util.c selinux/libsepol/src/util.c +--- selinux.orig/libsepol/src/util.c 2017-08-13 09:34:17.000000000 +0200 ++++ selinux/libsepol/src/util.c 2018-02-25 10:36:31.765008355 +0100 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include "dso.h" + + struct val_to_name { + unsigned int val; +diff -upr e2fsprogs.orig/contrib/android/perms.c e2fsprogs/contrib/android/perms.c +--- e2fsprogs.orig/contrib/android/perms.c 2017-11-29 00:28:33.000000000 +0100 ++++ e2fsprogs/contrib/android/perms.c 2018-02-25 10:37:13.048466147 +0100 +@@ -5,6 +5,7 @@ + #include "support/nls-enable.h" + #include + #include ++#include "private/android_filesystem_capability.h" + + #ifndef XATTR_SELINUX_SUFFIX + # define XATTR_SELINUX_SUFFIX "selinux" +diff -upr e2fsprogs.orig/lib/ext2fs/bitops.h e2fsprogs/lib/ext2fs/bitops.h +--- e2fsprogs.orig/lib/ext2fs/bitops.h 2017-11-29 00:28:33.000000000 +0100 ++++ e2fsprogs/lib/ext2fs/bitops.h 2018-02-25 10:37:13.028466087 +0100 +@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_g + #if (__STDC_VERSION__ >= 199901L) + #define _INLINE_ extern inline + #else +-#define _INLINE_ inline ++#define _INLINE_ static inline + #endif + #else /* !INCLUDE_INLINE FUNCS */ + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else /* not C99 */ + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ +diff -upr e2fsprogs.orig/lib/ext2fs/ext2fs.h e2fsprogs/lib/ext2fs/ext2fs.h +--- e2fsprogs.orig/lib/ext2fs/ext2fs.h 2017-11-29 00:28:33.000000000 +0100 ++++ e2fsprogs/lib/ext2fs/ext2fs.h 2018-02-25 10:37:13.028466087 +0100 +@@ -53,9 +53,7 @@ extern "C" { + */ + #define EXT2_LIB_CURRENT_REV EXT2_DYNAMIC_REV + +-#ifdef HAVE_SYS_TYPES_H + #include +-#endif + + #include + #include +@@ -1736,7 +1734,7 @@ extern const struct ext2_inode *ext2fs_c + #define _INLINE_ extern + #else + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 0e68193059a..610f05bfcda 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,33 +1,75 @@ # Template file for 'android-tools' pkgname=android-tools -_distver=7.0.0_r5 # NOTE: not all upstream updates has code changes for the parts # of android used by android-tools. Check for diff with: # curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1 -version=${_distver/_/} -revision=6 +version=8.1.0r14 +revision=1 +_distver=${version/r/_r} create_wrksrc=yes -build_style=gnu-makefile -hostmakedepends="git" -makedepends="zlib-devel libressl-devel pcre-devel" +hostmakedepends="ruby cmake ninja perl go" +makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel" short_desc="Android platform tools (adb and fastboot)" maintainer="Eivind Uggedal " -license="Apache-2.0 BSD GPL-2" +license="Apache-2.0 ISC GPL-2 MIT" homepage="http://developer.android.com/tools/help/adb.html" +_baseurl=https://android.googlesource.com/platform +distfiles=" + ${_baseurl}/system/core/+archive/ac8169f45dc9e5332d3ec24d0b14f812668b0c8e.tar.gz>core.tar.gz + ${_baseurl}/system/extras/+archive/e563ed1bca5ea0421f654eef82d758ec25c10bdd.tar.gz>extras.tar.gz + ${_baseurl}/external/selinux/+archive/90efe04c55f82a7ea166c913405758fd91bc9aa9.tar.gz>selinux.tar.gz + ${_baseurl}/external/f2fs-tools/+archive/a3f779d308a10d7e6b87cf0134445e7378de4770.tar.gz>f2fs-tools.tar.gz + ${_baseurl}/external/e2fsprogs/+archive/6bdf355a7c96ddd5eb867778d857de82fca793a5.tar.gz>e2fsprogs.tar.gz + https://boringssl.googlesource.com/boringssl/+archive/a20bb7ff8bb5057065a2e7941249773f9676cf45.tar.gz>boringssl.tar.gz" +# Contents checksums because the tarballs change with every download +checksum="@ce40cf2757bdd87d458655dc00d8ad835c69304ecab88faa7eb7e514712ba98d + @7f697f84f3454658ecc609620be344f3496603605158304f2cd1055f143a07c6 + @4c7d9b0650f47e83f75088c3fbbedab45e9f1a15081fa20f25104558eb81e406 + @ae8c85b3db0f5bdc9b01eacb8b0490e5a34c9d20a9ed962d8b9942b3451c6111 + @e4ab1880f0f043da29a04f1c446155f365933a4e46a9f4e8865ec104f64a982b + @748945a2c1f50c40286c963bd4e7a08a8e5bd450a6dc71a9de1a2b451d614a38" -broken="https://github.com/voidlinux/void-packages/issues/9146" +nocross="error: requested alignment 64 is larger than 8 [-Werror=attributes]" -do_fetch() { - local r - for r in system/core system/extras external/libselinux external/f2fs-tools external/gtest external/safe-iop; do - git clone -b android-${_distver} \ - https://android.googlesource.com/platform/$r \ - ${pkgname}-${version}/$(basename $r) +do_extract() { + local tarball p + for p in ${distfiles}; do + tarball=${p##*>} + mkdir -p ${wrksrc}/${tarball/.*} + tar -x --no-same-permissions --no-same-owner -f \ + ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${tarball} \ + -C ${wrksrc}/${tarball/.*} done } -post_install() { - vlicense gtest/COPYING +pre_configure() { + PKGVER=${_distver} ${FILESDIR}/generate_build.rb > build.ninja + + mkdir -p boringssl/build + cd boringssl/build + + cmake -GNinja \ + -DBUILD_SHARED_LIBS=FALSE \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + .. + ninja +} + +do_build() { + ninja +} + +do_install() { + for i in adb fastboot mke2fs.android e2fsdroid ext2simg \ + core/mkbootimg/mkbootimg ;do + vbin $i + done + vlicense boringssl/LICENSE boringssl.LICENSE + vlicense boringssl/third_party/fiat/LICENSE fiat.LICENSE + vlicense boringssl/third_party/googletest/LICENSE gtest.LICENSE + vlicense boringssl/third_party/android-cmake/LICENSE android-cmake.LICENSE vsv adb } From b1e6a285f9d272943bd1c9bd8ab94b998af74048 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 28 Jun 2018 15:40:25 -0500 Subject: [PATCH 247/759] krita: update to 4.1.0 (#469) --- srcpkgs/krita/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 60de41e5bdb..15fc37ab62a 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,6 +1,6 @@ # Template file for 'krita' pkgname=krita -version=4.0.3 +version=4.1.0 revision=1 nocross=yes build_style=cmake @@ -15,7 +15,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel opencolorio-devel eigen vc exiv2-devel libXi-devel libopenexr-devel libgomp-devel poppler-qt5-devel" -license="BSD-3-Clause, GPL-3.0-or-later" +license="GPL-3.0-only" homepage="https://krita.org/" -distfiles="https://download.kde.org/stable/krita/${version}/krita-${version}.tar.gz" -checksum=f9ead78ff4b184af49aea59385b0cfa1238ebf7fd527bf2f408c59fc5b12b67e +distfiles="$KDE_SITE/krita/${version}/krita-${version}.tar.gz" +checksum=78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5 From 3c42b80b525ad755bf8a6aacd484291d58adbe9e Mon Sep 17 00:00:00 2001 From: lemmi Date: Thu, 28 Jun 2018 22:43:30 +0200 Subject: [PATCH 248/759] keepassxc: enable browser support https://github.com/voidlinux/void-packages/issues/13225 --- srcpkgs/keepassxc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template index b0552f5b1b6..57d46406450 100644 --- a/srcpkgs/keepassxc/template +++ b/srcpkgs/keepassxc/template @@ -1,7 +1,7 @@ # Template file for 'keepassxc' pkgname=keepassxc version=2.3.3 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_TESTS=OFF -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF) @@ -31,7 +31,7 @@ desc_option_browser="Enable browser integration with keepassxc-browser" desc_option_network="Enable networking support (favicon download)" desc_option_sshagent="Enable SSH agent support" desc_option_yubikey="Enable YubiKey HMAC-SHA1 authentication support" -build_options_default="autotype sshagent yubikey network" +build_options_default="autotype browser sshagent yubikey network" post_install() { vlicense COPYING From 392e8e95d465e686f807e52c90a19ba944a01d69 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Thu, 28 Jun 2018 18:05:54 -0300 Subject: [PATCH 249/759] feh: update to 2.27. (#492) --- srcpkgs/feh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index cea05f17b04..254963f0804 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -1,6 +1,6 @@ # Template file for 'feh' pkgname=feh -version=2.26.4 +version=2.27 revision=1 build_style=gnu-makefile make_use_env=yes @@ -15,7 +15,7 @@ license="MIT-feh" homepage="https://feh.finalrewind.org/" changelog="https://raw.githubusercontent.com/derf/feh/master/ChangeLog" distfiles="${homepage}/feh-${version}.tar.bz2" -checksum=074f8527a17fc5add70018a7f3887d78d5bdf545611636b88641f27e9e844795 +checksum=af326845ef7483ecbffde697fdadb39298a68069d79644e249c69c9ad464c64e pre_build() { sed -i 's|doc/feh/examples|examples/feh|' config.mk From 66039fd5577917f22cf135d7f2b4252aa1e94b2d Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Thu, 28 Jun 2018 23:16:58 +0200 Subject: [PATCH 250/759] New package: deepin-voice-recorder-1.3.7 (#330) --- srcpkgs/deepin-voice-recorder/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/deepin-voice-recorder/template diff --git a/srcpkgs/deepin-voice-recorder/template b/srcpkgs/deepin-voice-recorder/template new file mode 100644 index 00000000000..8925962aaa6 --- /dev/null +++ b/srcpkgs/deepin-voice-recorder/template @@ -0,0 +1,19 @@ +# Template file for 'deepin-voice-recorder' +pkgname=deepin-voice-recorder +version=1.3.7 +revision=1 +build_style=qmake +hostmakedepends="qt5-qmake pkg-config" +makedepends="qt5-multimedia-devel dtkwidget-devel ffmpeg-devel pulseaudio-devel" +depends="qt5integration gst-plugins-good1" +short_desc="Deepin voice recorder" +maintainer="John " +license="GPL-3.0-or-later" +homepage="https://github.com/linuxdeepin/deepin-voice-recorder/" +changelog="https://raw.githubusercontent.com/linuxdeepin/deepin-voice-recorder/${version}/CHANGELOG.md" +distfiles="https://github.com/linuxdeepin/deepin-voice-recorder/archive/${version}.tar.gz" +checksum=c5abf504ec67e379cd9a54a36104812e19f7dcf3ff1ac737468ac322407e1de0 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-multimedia-devel" +fi From db92d5f2f4dc2634e9c0461eb71aa36cd56ce9ac Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Thu, 28 Jun 2018 18:24:19 -0300 Subject: [PATCH 251/759] python3-pam: update to 1.8.4. (#423) --- srcpkgs/python3-pam/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template index c05de824044..6a08e60ee53 100644 --- a/srcpkgs/python3-pam/template +++ b/srcpkgs/python3-pam/template @@ -1,6 +1,6 @@ # Template file for 'python3-pam' pkgname=python3-pam -version=1.8.3 +version=1.8.4 revision=1 wrksrc="${pkgname/3}-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="John " license="MIT" homepage="https://github.com/FirefighterBlu3/python-pam" distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz" -checksum=a49efa94decf881fd0964e4bc257de824412694b7ffe3a68065d1ec0dd86bde3 +checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3 post_install() { vlicense LICENSE From b5559b7bf11bd7c55552bd0148ac7b7339869072 Mon Sep 17 00:00:00 2001 From: yopito Date: Fri, 29 Jun 2018 00:09:52 +0200 Subject: [PATCH 252/759] Seafile client stack: switch to python3 (#138) * libsearpc: update to 3.0.8, use python3 * ccnet: rebuild against new libsearpc, use python3 * seafile-libclient: rebuild against new libsearpc, use python3 --- srcpkgs/ccnet/patches/python3-syntax.patch | 22 +++ srcpkgs/ccnet/template | 6 +- .../libsearpc/patches/python3-support.patch | 176 ++++++++++++++++++ srcpkgs/libsearpc/template | 15 +- srcpkgs/seafile-libclient/template | 9 +- 5 files changed, 215 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/ccnet/patches/python3-syntax.patch create mode 100644 srcpkgs/libsearpc/patches/python3-support.patch diff --git a/srcpkgs/ccnet/patches/python3-syntax.patch b/srcpkgs/ccnet/patches/python3-syntax.patch new file mode 100644 index 00000000000..91bb0f5fd36 --- /dev/null +++ b/srcpkgs/ccnet/patches/python3-syntax.patch @@ -0,0 +1,22 @@ +--- python/ccnet/packet.py.ORIG ++++ python/ccnet/packet.py +@@ -72,7 +72,7 @@ + def parse_header(buf): + try: + ver, ptype, length, id = struct.unpack(CCNET_HEADER_FORMAT, buf) +- except struct.error, e: ++ except struct.error as e: + raise NetworkError('error when unpack packet header: %s' % e) + + return PacketHeader(ver, ptype, length, id) +--- python/ccnet/async/async_client.py.ORIG ++++ python/ccnet/async/async_client.py +@@ -26,7 +26,7 @@ + ] + + def debug_print(msg): +- print msg ++ print(msg) + + class AsyncClient(Client): + '''Async mode client''' diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template index cf05bbcc4c9..c47660a37fa 100644 --- a/srcpkgs/ccnet/template +++ b/srcpkgs/ccnet/template @@ -1,7 +1,7 @@ # Template file for 'ccnet' pkgname=ccnet version=6.1.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libsearpc-codegen libtool pkg-config vala" @@ -37,8 +37,8 @@ ccnet-python_package() { noarch=yes pycompile_module="ccnet" depends="ccnet" - short_desc="Python2 bindings" + short_desc="Python3 bindings" pkg_install() { - vmove usr/lib/python2.7 + vmove ${py3_lib} } } diff --git a/srcpkgs/libsearpc/patches/python3-support.patch b/srcpkgs/libsearpc/patches/python3-support.patch new file mode 100644 index 00000000000..ae9e00d8109 --- /dev/null +++ b/srcpkgs/libsearpc/patches/python3-support.patch @@ -0,0 +1,176 @@ +lib/searpc-codegen.py patch comes from upstream commits: + - https://github.com/haiwen/libsearpc/commit/672bb90032b9c226adee5e63a4dd273eaf8f8c12 + - https://github.com/haiwen/libsearpc/commit/0570df3f4a3c6ae4a5326722b34a9a9fda8cc8ea + +--- lib/searpc-codegen.py.ORIG ++++ lib/searpc-codegen.py +@@ -1,9 +1,10 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python + + """ + Generate function define macros. + """ + ++from __future__ import print_function + import string + import sys + import os +@@ -16,24 +17,24 @@ import os + # ) + type_table = { + "string": ("const char*", +- "char*", ++ "char*", + "json_array_get_string_or_null_element", + "searpc_set_string_to_ret_object", + "json_array_add_string_or_null_element", + "NULL"), +- "int": ("int", +- "int", ++ "int": ("int", ++ "int", + "json_array_get_int_element", + "searpc_set_int_to_ret_object", + "json_array_add_int_element", + "-1"), +- "int64": ("gint64", +- "gint64", ++ "int64": ("gint64", ++ "gint64", + "json_array_get_int_element", + "searpc_set_int_to_ret_object", + "json_array_add_int_element", + "-1"), +- "object": ("GObject*", ++ "object": ("GObject*", + "GObject*", + "", + "searpc_set_object_to_ret_object", +@@ -83,8 +84,8 @@ def generate_marshal(ret_type, arg_types): + stmt = " %s param%d = %s (param_array, %d);\n" %( + type_item[0], i+1, type_item[2], i+1) + get_parameters += stmt +- +- # func_prototype should be something like ++ ++ # func_prototype should be something like + # GList* (*)(const char*, int, GError **) + func_prototype = ret_type_in_c + " (*)(" + for arg_type in arg_types: +@@ -98,18 +99,21 @@ def generate_marshal(ret_type, arg_types): + + func_call = "%s ret = ((%s)func) (%s);" % (ret_type_in_c, func_prototype, + func_args) +- ++ + convert_ret = "%s (object, ret);" % ret_type_item[3] +- ++ + return template.substitute(marshal_name=marshal_name, + get_parameters=get_parameters, + func_call=func_call, + convert_ret=convert_ret) + ++def write_file(f, s): ++ f.write(s) ++ f.write('\n') ++ + def gen_marshal_functions(f): +- from rpc_table import func_table + for item in func_table: +- print >>f, generate_marshal(item[0], item[1]) ++ write_file(f, generate_marshal(item[0], item[1])) + + + marshal_register_item = r""" +@@ -135,12 +139,11 @@ def generate_marshal_register_item(ret_type, arg_types): + signature_name=signature_name) + + def gen_marshal_register_function(f): +- from rpc_table import func_table +- print >>f, "static void register_marshals()""" +- print >>f, "{" ++ write_file(f, "static void register_marshals()""") ++ write_file(f, "{") + for item in func_table: +- print >>f, generate_marshal_register_item(item[0], item[1]), +- print >>f, "}" ++ write_file(f, generate_marshal_register_item(item[0], item[1])) ++ write_file(f, "}") + + signature_template = r""" + inline static gchar * +@@ -159,20 +162,18 @@ def generate_signature(ret_type, arg_types): + else: + signature_name = "searpc_signature_" + ret_type + "__" + ( + '_'.join(arg_types)) +- ++ + args = "\"" + ret_type + "\"" + ", " + str(len(arg_types)) + for arg_type in arg_types: + args += ", " + "\"" + arg_type + "\"" +- ++ + template = string.Template(signature_template) + return template.substitute(signature_name=signature_name, args=args) + + def gen_signature_list(): +- f = open('searpc-signature.h', 'w') +- for item in func_table: +- print >>f,generate_signature(item[0], item[1]) +- f.close() +- ++ with open('searpc-signature.h', 'w') as f: ++ for item in func_table: ++ write_file(f, generate_signature(item[0], item[1])) + + if __name__ == "__main__": + sys.path.append(os.getcwd()) +@@ -180,20 +181,15 @@ if __name__ == "__main__": + # load function table + if len(sys.argv) == 2: + abspath = os.path.abspath(sys.argv[1]) +- d = os.path.dirname(abspath) +- f = os.path.basename(abspath) +- mod = f[:f.rfind('.')] +- sys.path.append(d) +- rpc_mod = __import__(mod, globals(), locals(), [], -1) +- print "loaded func_table from %s" % (rpc_mod.__file__) +- func_table = rpc_mod.func_table ++ with open(abspath, 'r') as fp: ++ exec(fp.read()) ++ print("loaded func_table from %s" % abspath) + else: + # load from default rpc_table.py + from rpc_table import func_table + + # gen code +- marshal = open('searpc-marshal.h', 'w') +- gen_marshal_functions(marshal) +- gen_marshal_register_function(marshal) +- marshal.close() ++ with open('searpc-marshal.h', 'w') as marshal: ++ gen_marshal_functions(marshal) ++ gen_marshal_register_function(marshal) + gen_signature_list() +--- pysearpc/server.py ++++ pysearpc/server.py +@@ -25,7 +25,7 @@ class SearpcServer(object): + """input str -> output str""" + try: + argv = json.loads(fcallstr) +- except Exception, e: ++ except Exception as e: + raise SearpcError('bad call str: ' + str(e)) + + service = self.services[svcname] +@@ -41,7 +41,7 @@ class SearpcServer(object): + def call_function(self, svcname, fcallstr): + try: + retVal = self._call_function(svcname, fcallstr) +- except Exception, e: ++ except Exception as e: + ret = {'err_code': 555, 'err_msg': str(e)} + else: + ret = {'ret': retVal} diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 3f9a17c5946..197c66956e2 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,18 +1,21 @@ # Template file for 'libsearpc' pkgname=libsearpc -version=3.0.7 +version=3.0.8 revision=1 +_tagversion=3.1-latest +wrksrc="${pkgname}-${_tagversion}" build_style=gnu-configure configure_args="--disable-static --disable-compile-demo" -hostmakedepends="automake libtool pkg-config python" +hostmakedepends="automake libtool pkg-config python3" makedepends="glib-devel jansson-devel" - +python_version=3 +pycompile_module="pysearpc" short_desc="Seafile RPC library" maintainer="yopito " license="GPL-3" homepage="https://github.com/haiwen/${pkgname}" -distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=efee6b495f93e70101c87849c78b135014dfd2f0e5c08dcfed9834def47cb939 +distfiles="https://github.com/haiwen/${pkgname}/archive/v${_tagversion}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=83b45fa2f4b7d7ae6dd34ca04d430433551ef493cdaf3cbcc768bd6099377d90 pre_configure() { ./autogen.sh @@ -35,7 +38,7 @@ libsearpc-devel_package() { libsearpc-codegen_package() { short_desc+=" - code generator" - depends="python" + depends="python3" noarch=yes pkg_install() { vdoc "AUTHORS" diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index bdee5ee804a..e0e0620ecea 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,14 +1,15 @@ # Template file for 'seafile-libclient' pkgname=seafile-libclient version=6.1.8 -revision=1 +revision=2 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake intltool libsearpc-codegen libtool pkg-config vala" makedepends="ccnet-devel libcurl-devel" -depends="python" +depends="python3" +pycompile_module="seafile" short_desc="Cloud storage system - client command-line and libraries" maintainer="yopito " license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX @@ -21,8 +22,8 @@ pre_configure() { } post_install() { - # remove server files - rm -rf "${DESTDIR}/usr/lib/python2.7/site-packages/seaserv" + # remove server stuff + rm -rf ${DESTDIR}${py3_sitelib}/searserv vdoc README.markdown } From 9301e0a8a196f9229768a9acfd2ad56f0dd7625c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 21:34:03 -0300 Subject: [PATCH 253/759] libsearpc: fix checksum. --- srcpkgs/libsearpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 197c66956e2..15d8db00272 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -15,7 +15,7 @@ maintainer="yopito " license="GPL-3" homepage="https://github.com/haiwen/${pkgname}" distfiles="https://github.com/haiwen/${pkgname}/archive/v${_tagversion}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=83b45fa2f4b7d7ae6dd34ca04d430433551ef493cdaf3cbcc768bd6099377d90 +checksum=4947bfcddfa0e9ec2aaa60882556d5a493207fb0333598e0e994c3560b665c0d pre_configure() { ./autogen.sh From d4b9b2c845d556cc50620d0f260786669d061ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 29 Jun 2018 04:00:21 +0200 Subject: [PATCH 254/759] libsearpc: remove obsolete(?) patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- .../libsearpc/patches/python3-support.patch | 176 ------------------ 1 file changed, 176 deletions(-) delete mode 100644 srcpkgs/libsearpc/patches/python3-support.patch diff --git a/srcpkgs/libsearpc/patches/python3-support.patch b/srcpkgs/libsearpc/patches/python3-support.patch deleted file mode 100644 index ae9e00d8109..00000000000 --- a/srcpkgs/libsearpc/patches/python3-support.patch +++ /dev/null @@ -1,176 +0,0 @@ -lib/searpc-codegen.py patch comes from upstream commits: - - https://github.com/haiwen/libsearpc/commit/672bb90032b9c226adee5e63a4dd273eaf8f8c12 - - https://github.com/haiwen/libsearpc/commit/0570df3f4a3c6ae4a5326722b34a9a9fda8cc8ea - ---- lib/searpc-codegen.py.ORIG -+++ lib/searpc-codegen.py -@@ -1,9 +1,10 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python - - """ - Generate function define macros. - """ - -+from __future__ import print_function - import string - import sys - import os -@@ -16,24 +17,24 @@ import os - # ) - type_table = { - "string": ("const char*", -- "char*", -+ "char*", - "json_array_get_string_or_null_element", - "searpc_set_string_to_ret_object", - "json_array_add_string_or_null_element", - "NULL"), -- "int": ("int", -- "int", -+ "int": ("int", -+ "int", - "json_array_get_int_element", - "searpc_set_int_to_ret_object", - "json_array_add_int_element", - "-1"), -- "int64": ("gint64", -- "gint64", -+ "int64": ("gint64", -+ "gint64", - "json_array_get_int_element", - "searpc_set_int_to_ret_object", - "json_array_add_int_element", - "-1"), -- "object": ("GObject*", -+ "object": ("GObject*", - "GObject*", - "", - "searpc_set_object_to_ret_object", -@@ -83,8 +84,8 @@ def generate_marshal(ret_type, arg_types): - stmt = " %s param%d = %s (param_array, %d);\n" %( - type_item[0], i+1, type_item[2], i+1) - get_parameters += stmt -- -- # func_prototype should be something like -+ -+ # func_prototype should be something like - # GList* (*)(const char*, int, GError **) - func_prototype = ret_type_in_c + " (*)(" - for arg_type in arg_types: -@@ -98,18 +99,21 @@ def generate_marshal(ret_type, arg_types): - - func_call = "%s ret = ((%s)func) (%s);" % (ret_type_in_c, func_prototype, - func_args) -- -+ - convert_ret = "%s (object, ret);" % ret_type_item[3] -- -+ - return template.substitute(marshal_name=marshal_name, - get_parameters=get_parameters, - func_call=func_call, - convert_ret=convert_ret) - -+def write_file(f, s): -+ f.write(s) -+ f.write('\n') -+ - def gen_marshal_functions(f): -- from rpc_table import func_table - for item in func_table: -- print >>f, generate_marshal(item[0], item[1]) -+ write_file(f, generate_marshal(item[0], item[1])) - - - marshal_register_item = r""" -@@ -135,12 +139,11 @@ def generate_marshal_register_item(ret_type, arg_types): - signature_name=signature_name) - - def gen_marshal_register_function(f): -- from rpc_table import func_table -- print >>f, "static void register_marshals()""" -- print >>f, "{" -+ write_file(f, "static void register_marshals()""") -+ write_file(f, "{") - for item in func_table: -- print >>f, generate_marshal_register_item(item[0], item[1]), -- print >>f, "}" -+ write_file(f, generate_marshal_register_item(item[0], item[1])) -+ write_file(f, "}") - - signature_template = r""" - inline static gchar * -@@ -159,20 +162,18 @@ def generate_signature(ret_type, arg_types): - else: - signature_name = "searpc_signature_" + ret_type + "__" + ( - '_'.join(arg_types)) -- -+ - args = "\"" + ret_type + "\"" + ", " + str(len(arg_types)) - for arg_type in arg_types: - args += ", " + "\"" + arg_type + "\"" -- -+ - template = string.Template(signature_template) - return template.substitute(signature_name=signature_name, args=args) - - def gen_signature_list(): -- f = open('searpc-signature.h', 'w') -- for item in func_table: -- print >>f,generate_signature(item[0], item[1]) -- f.close() -- -+ with open('searpc-signature.h', 'w') as f: -+ for item in func_table: -+ write_file(f, generate_signature(item[0], item[1])) - - if __name__ == "__main__": - sys.path.append(os.getcwd()) -@@ -180,20 +181,15 @@ if __name__ == "__main__": - # load function table - if len(sys.argv) == 2: - abspath = os.path.abspath(sys.argv[1]) -- d = os.path.dirname(abspath) -- f = os.path.basename(abspath) -- mod = f[:f.rfind('.')] -- sys.path.append(d) -- rpc_mod = __import__(mod, globals(), locals(), [], -1) -- print "loaded func_table from %s" % (rpc_mod.__file__) -- func_table = rpc_mod.func_table -+ with open(abspath, 'r') as fp: -+ exec(fp.read()) -+ print("loaded func_table from %s" % abspath) - else: - # load from default rpc_table.py - from rpc_table import func_table - - # gen code -- marshal = open('searpc-marshal.h', 'w') -- gen_marshal_functions(marshal) -- gen_marshal_register_function(marshal) -- marshal.close() -+ with open('searpc-marshal.h', 'w') as marshal: -+ gen_marshal_functions(marshal) -+ gen_marshal_register_function(marshal) - gen_signature_list() ---- pysearpc/server.py -+++ pysearpc/server.py -@@ -25,7 +25,7 @@ class SearpcServer(object): - """input str -> output str""" - try: - argv = json.loads(fcallstr) -- except Exception, e: -+ except Exception as e: - raise SearpcError('bad call str: ' + str(e)) - - service = self.services[svcname] -@@ -41,7 +41,7 @@ class SearpcServer(object): - def call_function(self, svcname, fcallstr): - try: - retVal = self._call_function(svcname, fcallstr) -- except Exception, e: -+ except Exception as e: - ret = {'err_code': 555, 'err_msg': str(e)} - else: - ret = {'ret': retVal} From c5e06652bdc353bdd1d025949169b379163909e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 29 Jun 2018 04:38:14 +0200 Subject: [PATCH 255/759] haproxy: fix armv[56]* and mips* build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/haproxy/template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 55191c1cb7a..e3acda01b06 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -21,9 +21,15 @@ haproxy_homedir="/var/lib/${pkgname}" case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-D__LINUX_NETFILTER_H";; esac +case "$XBPS_TARGET_MACHINE" in + armv[56]*|mips*) makedepends+=" libatomic-devel";; +esac do_build() { + case "$XBPS_TARGET_MACHINE" in + armv[56]*|mips*) sed -i Makefile -e's;$(LDOPTS);& -latomic;' ;; + esac make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \ ${make_build_args} } From a3acf17efa2db6590606577a582759205f1d3b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 29 Jun 2018 05:41:47 +0200 Subject: [PATCH 256/759] libgdal: update to 2.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add more dependencies on existing packages. Signed-off-by: Jürgen Buchmüller --- srcpkgs/libgdal/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index dfcea512ab3..fcd1d0cdf3c 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,19 +1,20 @@ # Template file for 'libgdal' pkgname=libgdal -version=2.3.0 +version=2.3.1 revision=1 wrksrc=gdal-${version} build_style=gnu-configure -hostmakedepends="gettext-devel pkg-config python python-numpy" -makedepends="expat-devel libxml2-devel giflib-devel libopenexr-devel libpng-devel - jasper-devel tiff-devel poppler-glib-devel liblzma-devel openjpeg2 opencl2-headers - pcre-devel sqlite-devel geos-devel" +configure_args="--with-liblzma --with-poppler" +hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel" +makedepends="freexl-devel geos-devel jasper-devel json-c-devel libcurl-devel + libopenexr-devel libopenjpeg2-devel libqhull-devel libwebp-devel libxml2-devel + libzstd-devel opencl-headers poppler-glib-devel sqlite-devel" short_desc="Geospatial Data Abstraction Library" maintainer="Jürgen Buchmüller " license="MIT" homepage="http://www.gdal.org/" distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2 +checksum=9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a post_install() { vinstall gdal.pc 644 usr/lib/pkgconfig From e57bfa8f94cfc36f399285b2c24db56fea18ea77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 29 Jun 2018 07:42:52 +0200 Subject: [PATCH 257/759] haproxy: use ADDLIB for armv[56]*|mips* -latomic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/haproxy/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index e3acda01b06..f9e727e3b03 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -22,16 +22,13 @@ case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-D__LINUX_NETFILTER_H";; esac case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) makedepends+=" libatomic-devel";; + armv[56]*|mips*) ADDLIB="-latomic"; makedepends+=" libatomic-devel";; esac do_build() { - case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) sed -i Makefile -e's;$(LDOPTS);& -latomic;' ;; - esac make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \ - ${make_build_args} + ADDLIB="${ADDLIB}" ${make_build_args} } post_install() { From 848f19376d9956f7586d699787ef607d252e0ad0 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 29 Jun 2018 08:24:08 +0200 Subject: [PATCH 258/759] anki: update to 2.0.52. (#510) --- srcpkgs/anki/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template index 293372c7463..b35d4f4643a 100644 --- a/srcpkgs/anki/template +++ b/srcpkgs/anki/template @@ -1,16 +1,16 @@ # Template file for 'anki' pkgname=anki -version=2.0.50 +version=2.0.52 revision=1 noarch=yes depends="python-PyQt4-webkit python-httplib2 python-SQLAlchemy" pycompile_dirs="/usr/share/anki/anki /usr/share/anki/aqt" short_desc="Spaced repetition flashcard program" maintainer="Steve Prybylski " -license="AGPL-3" -homepage="http://ankisrs.net" -distfiles="http://ankisrs.net/downloads/current/${pkgname}-${version}-source.tgz" -checksum=37b2c601762ea8bfc7b9fc3e3067b82b0ad48c27b58076f6fd636f52930b1816 +license="AGPL-3.0-or-later" +homepage="https://apps.ankiweb.net" +distfiles="https://apps.ankiweb.net/downloads/current/anki-${version}-source.tgz" +checksum=d4d8c0dd473b512faa63e167d7bb89592530699d2365f1d3a737a733efeb5e7a do_install() { vmkdir usr/share/anki From 95ac34c50c05ec284a0fb8d0beadd92257d5783d Mon Sep 17 00:00:00 2001 From: iaroki Date: Fri, 29 Jun 2018 09:37:59 +0300 Subject: [PATCH 259/759] ansible: update to 2.6.0 (#508) --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 6bd5d4234da..f63c7df3ce7 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.5.5 +version=2.6.0 revision=1 noarch=yes build_style=python2-module @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=d7e5aae60c0e76c824bf8a410fe247b5c4afcfaee272f6283b4f996d237e365a +checksum=3550bf16bf2c34cc88bf3870e91b836e44c1c288d148968c4d855dae2560faf5 post_install() { for f in examples/*; do From eb78da55e71da7f6bc8c3c40b2e6834b6eeaf617 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 29 Jun 2018 09:35:37 +0200 Subject: [PATCH 260/759] monocypher: update to 2.0.4. (#507) --- srcpkgs/monocypher/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/monocypher/template b/srcpkgs/monocypher/template index ff4f47c9dd3..66572f95364 100644 --- a/srcpkgs/monocypher/template +++ b/srcpkgs/monocypher/template @@ -1,6 +1,6 @@ # Template file for 'monocypher' pkgname=monocypher -version=2.0.3 +version=2.0.4 revision=1 build_style=gnu-makefile short_desc="Easy to use crypto library inspired by libsodium and TweetNaCl" @@ -8,7 +8,7 @@ maintainer="cr6git " license="BSD-2-Clause" homepage="https://monocypher.org" distfiles="https://monocypher.org/download/monocypher-${version}.tar.gz" -checksum=113bf15c82d4be3373974ebdfd1074c368486e174fc5175d6305d84a75c125c5 +checksum=a1e820c30abcc351dba5709ebf80a35a10c3cc97ffea0b0ece2a5834d2f88165 post_install() { vlicense LICENCE.md From 795d80a46ca2515a1ad39bda53cb984512bf3deb Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 29 Jun 2018 09:41:36 +0200 Subject: [PATCH 261/759] genius: update to 1.0.24. (#511) --- srcpkgs/genius/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template index 91deb6c7c32..919ab3d8230 100644 --- a/srcpkgs/genius/template +++ b/srcpkgs/genius/template @@ -1,16 +1,16 @@ # Template file for 'genius' pkgname=genius -version=1.0.23 -revision=3 +version=1.0.24 +revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" +hostmakedepends="intltool pkg-config" +makedepends="gtksourceview2-devel mpfr-devel readline-devel vte-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Advanced calculator including a mathematical programming language" maintainer="Samadi van Koten " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.jirka.org/genius.html" -distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.gz" -checksum="efdd082e8fb832f9dd08174ca03538aa46520ae81fdcb0044d93052bdd4c380a" -depends="desktop-file-utils hicolor-icon-theme" -hostmakedepends="intltool pkg-config gnome-doc-utils" -makedepends="gtksourceview2-devel mpfr-devel vte-devel ncurses-devel readline-devel" +distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.xz" +checksum=8dea7f386821f39a438c66d5201a741904555c878dc670b96b8a22a8a96dca50 nocross="https://travis-ci.org/voidlinux/void-packages/jobs/252374514" From a38b8fb8f179229a91a32a6d4ccd460b3166e71c Mon Sep 17 00:00:00 2001 From: jtalowell <39048262+jtalowell@users.noreply.github.com> Date: Fri, 29 Jun 2018 08:55:03 +0000 Subject: [PATCH 262/759] New package: arc-theme-20180114 (#453) --- srcpkgs/arc-theme/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/arc-theme/template diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template new file mode 100644 index 00000000000..1426205b5c2 --- /dev/null +++ b/srcpkgs/arc-theme/template @@ -0,0 +1,16 @@ +# Template file for 'arc-theme' +pkgname=arc-theme +version=20180114 +revision=1 +noarch=yes +build_style=gnu-configure +configure_script="./autogen.sh" +hostmakedepends="automake pkg-config sassc" +makedepends="gtk+3-devel" +depends="gnome-themes-standard gtk-engine-murrine" +short_desc="Flat theme with transparent elements for GTK 3, GTK 2 and GNOME Shell" +maintainer="jtalowell " +license="GPL-3.0-or-later" +homepage="https://github.com/NicoHood/arc-theme" +distfiles="https://github.com/NicoHood/arc-theme/archive/${version}.tar.gz" +checksum="74179ad6a8f0b297e74eeabb26586584f76615eccdf90afb065a90623802e7bc" From 5f7e72a7eb539f7eeb6345e357aaa093216afa4a Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 29 Jun 2018 11:03:50 +0200 Subject: [PATCH 263/759] ristretto: update to 0.8.3. (#493) --- srcpkgs/ristretto/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template index fe23f4df458..feb96b78b6c 100644 --- a/srcpkgs/ristretto/template +++ b/srcpkgs/ristretto/template @@ -1,14 +1,14 @@ # Template file for 'ristretto' pkgname=ristretto -version=0.8.2 -revision=2 +version=0.8.3 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool" -makedepends="libexif-devel dbus-glib-devel libxfce4ui-devel exo-devel file-devel" -depends="hicolor-icon-theme desktop-file-utils" +hostmakedepends="intltool pkg-config" +makedepends="exo-devel file-devel libexif-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Picture-viewer for the Xfce desktop environment" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://docs.xfce.org/apps/ristretto/start" -distfiles="https://archive.xfce.org/src/apps/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=f8f3b77ca6fc77ddf8cff1bb52e5c5802c462663f72f324393b3a0360f6901b8 +distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" +checksum=8c9c11760816dfd9ed57fb8b9df86c6a98a2604ab551be3133996a1c32ca2665 From fc39e99826b470cf88fc2217b2d29eecc7c41c16 Mon Sep 17 00:00:00 2001 From: Lon Willett Date: Fri, 29 Jun 2018 11:11:18 +0200 Subject: [PATCH 264/759] skype: update to 8.25.76.3 (#512) --- srcpkgs/skype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index fc706119be1..a423fbc63d9 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,7 +1,7 @@ # Template file for 'skype' # This just repackages the debian package. pkgname=skype -version=8.25.76.1 +version=8.25.76.3 revision=1 only_for_archs="x86_64" repository="nonfree" @@ -12,7 +12,7 @@ maintainer="Lon Willett " license="skype" homepage="https://www.skype.com" distfiles="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" -checksum=e93bc67180ed4934bf8bfd23f23917e68e00668078b35fc25497ebc1374de2e1 +checksum=fc99e6c51f5b0895242a099819645dfd69a8c3c645bbff8ce48917591795c331 do_extract() { ar p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/skypeforlinux_${version}_amd64.deb data.tar.xz | tar xJpf - ./usr From 08d510ab872400b9f621e9a2d9c41d9499fc25bf Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 29 Jun 2018 11:26:27 +0200 Subject: [PATCH 265/759] common/shutils: fix configuration loading during setup_pkgs --- common/xbps-src/shutils/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 58194a86241..486b8311cca 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -286,7 +286,7 @@ setup_pkg() { unset_package_funcs - ( . $XBPS_CONFIG_FILE 2>/dev/null ) + . $XBPS_CONFIG_FILE 2>/dev/null if [ -n "$cross" ]; then source_file $XBPS_CROSSPFDIR/${cross}.sh From 6ce7b082493add4f3a96945f3c4ac36ffe5bdaae Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 29 Jun 2018 01:27:27 -0300 Subject: [PATCH 266/759] neovim-remote: update to 2.0.10. --- srcpkgs/neovim-remote/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template index 07a1afe27bc..43cb23d1751 100644 --- a/srcpkgs/neovim-remote/template +++ b/srcpkgs/neovim-remote/template @@ -1,6 +1,6 @@ # Template file for 'neovim-remote' pkgname=neovim-remote -version=2.0.8 +version=2.0.10 revision=1 noarch=yes build_style=python3-module @@ -13,7 +13,7 @@ maintainer="dleeram " license="MIT" homepage="https://github.com/mhinz/neovim-remote" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=cd1faf8e0ce6e2b65f7d70b4d27177843497917273187e4f1e3685a602b04638 +checksum=07710d2a9da08962d5b0d0946f376aaf691e3329356a2a2221c29af2921ae464 do_check() { python3 -m pytest From bca233fa9d680098707cf1fac6cdb08e5042f6c7 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 21:35:51 -0300 Subject: [PATCH 267/759] pass-otp: update to 1.1.1. --- srcpkgs/pass-otp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pass-otp/template b/srcpkgs/pass-otp/template index 8a988fd9bd1..448575f8ae3 100644 --- a/srcpkgs/pass-otp/template +++ b/srcpkgs/pass-otp/template @@ -1,13 +1,13 @@ # Template file for 'pass-otp' pkgname=pass-otp -version=1.1.0 +version=1.1.1 revision=1 noarch=yes build_style=gnu-makefile depends="pass oath-toolkit qrencode" short_desc="A pass extension for managing one-time-password (OTP) tokens" maintainer="Alif Rachmawadi " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/tadfisher/pass-otp" distfiles="https://github.com/tadfisher/pass-otp/archive/v${version}.tar.gz" -checksum=3971467475f8ed573eb860c7a44bd268d464d169dddbc0a4da89232d5beee144 +checksum=edb3142ab81d70af4e6d1c7f13abebd7c349be474a3f9293d9648ee91b75b458 From 1e4433cb147406b58cd415e6d9757a4e29e29506 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 17:24:19 -0300 Subject: [PATCH 268/759] fwupdate: update to 12. --- srcpkgs/fwupdate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwupdate/template b/srcpkgs/fwupdate/template index 053828fdad5..b857267380a 100644 --- a/srcpkgs/fwupdate/template +++ b/srcpkgs/fwupdate/template @@ -1,6 +1,6 @@ # Template file for 'fwupdate' pkgname=fwupdate -version=11 +version=12 revision=1 build_style=gnu-makefile hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="maxice8 " license="GPL-2.0-or-later" homepage="https://github.com/rhboot/fwupdate" distfiles="https://github.com/rhboot/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2" -checksum=d350eae66215c90fdc70f46ea734dedbfe6006ec21b7e764114b7d9e283e4abe +checksum=4167d569f14e00ecf620c369ab34709e4bb1574ed588ef2e2398667e9e968703 make_build_args="EFIDIR=void GNUEFIDIR=/usr/lib" make_install_args="EFIDIR=void LIBDIR=/usr/lib" nocross="fails to find efi.h" From 760f83d6ac2e6255f5cbac7362e85a2f8817a4b2 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:26:25 -0300 Subject: [PATCH 269/759] gopass: update to 1.8.2. --- srcpkgs/gopass/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index f2c4da0a369..e6c0299c575 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,6 +1,6 @@ # Template file for 'gopass' pkgname=gopass -version=1.8.1 +version=1.8.2 revision=1 build_style=go go_import_path=github.com/gopasspw/gopass @@ -10,9 +10,9 @@ short_desc="The slightly more awesome standard unix password manager for teams" maintainer="Dominic Monroe " license="MIT" homepage="https://www.justwatch.com/gopass/" -#changelog="https://raw.githubusercontent.com/justwatchcom/gopass/master/CHANGELOG.md" +changelog="https://raw.githubusercontent.com/justwatchcom/gopass/master/CHANGELOG.md" distfiles="https://github.com/gopasspw/gopass/archive/v${version}.tar.gz" -checksum=14b016112abaf18427d58009e61999a7d2aff2d49df9a4458ab572532d4b05e8 +checksum=6dc423448c0672fd5087ab75e4c3d8584fb75c93789c9fd68bf14576ab46d1ed nocross=yes post_build() { From 2735a0d3c37171674f8ee017b33fe85e47cd8dd5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:33:15 -0300 Subject: [PATCH 270/759] python-ruamel.yaml: update to 0.15.41. --- srcpkgs/python-ruamel.yaml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-ruamel.yaml/template b/srcpkgs/python-ruamel.yaml/template index f9a88deae89..547ea4cc3e1 100644 --- a/srcpkgs/python-ruamel.yaml/template +++ b/srcpkgs/python-ruamel.yaml/template @@ -1,6 +1,6 @@ # Template file for 'python-ruamel.yaml' pkgname=python-ruamel.yaml -version=0.15.40 +version=0.15.41 revision=1 wrksrc="ruamel.yaml-${version}" build_style=python-module @@ -13,7 +13,7 @@ license="MIT" homepage="https://bitbucket.org/ruamel/yaml" changelog="https://pypi.org/project/ruamel.yaml/" distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz" -checksum=974e91b23273eb6c32aef979a32c20ed0f6c6e4d9c1523611ea10c5fda9b8928 +checksum=4576b346e86deeebb80eb1b89753f805d9781cfe6111ba4d268f45d2693c8270 post_install() { vlicense LICENSE From 656594003a7596e461b5fa1d1bb2a29034c0be1f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 16:02:49 -0300 Subject: [PATCH 271/759] xfsprogs: update to 4.17.0. --- srcpkgs/xfsprogs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index 18ff32c9618..d7067f42d3b 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -1,6 +1,6 @@ # Template file for 'xfsprogs' pkgname=xfsprogs -version=4.16.1 +version=4.17.0 revision=1 build_style=gnu-configure configure_args="--enable-readline=yes --enable-lib64=no" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1-or-later" homepage="http://xfs.org/index.php/Main_Page" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" -checksum=3d5c2da46112b86cbd967fee43cea731d38a1b2aaf601b57674ed34e808652df +checksum=f53f5169cb98cfca471ddea30092738c427ba284c5356e01b45dd1ae3b297e0d do_install() { make install install-dev DIST_ROOT=${DESTDIR} \ From 9b0b0b56eb6f316dc98aabbb8d326534f986cb67 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 14:47:39 -0300 Subject: [PATCH 272/759] yq-go: update to 2.0.1. --- srcpkgs/yq-go/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template index a6ba6a11291..ecd1f1890d3 100644 --- a/srcpkgs/yq-go/template +++ b/srcpkgs/yq-go/template @@ -1,6 +1,6 @@ # Template file for 'yq-go' pkgname=yq-go -version=2.0.0 +version=2.0.1 revision=1 wrksrc="yq-${version}" build_style=go @@ -11,7 +11,7 @@ maintainer="maxice8 " license="MIT" homepage="https://github.com/mikefarah/yq" distfiles="https://github.com/mikefarah/yq/archive/${version}.tar.gz" -checksum=4a433a8881c6edc43be871f01e493b179e85404c26c91e4980a0010cae407815 +checksum=5ef118f6d75fe84b5c24b2f9250edbbe4a5c14f1a70a978eabd80e4f91047497 do_check() { go test -v From 72a7895b9255f3a18be24ca5993d597158ecaefc Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 29 Jun 2018 12:49:20 +0200 Subject: [PATCH 273/759] xorg-fonts: rebuild (missing aarch64* packages) --- srcpkgs/xorg-fonts/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xorg-fonts/template b/srcpkgs/xorg-fonts/template index 09f9bb7bdb2..fcd23f971b8 100644 --- a/srcpkgs/xorg-fonts/template +++ b/srcpkgs/xorg-fonts/template @@ -1,7 +1,7 @@ # Template file for 'xorg-fonts' pkgname=xorg-fonts version=7.6 -revision=4 +revision=5 build_style=meta depends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3 font-adobe-utopia-100dpi>=1.0.4 font-adobe-utopia-75dpi>=1.0.4 From 7e15578a68211a686da48a4e35bce92a6600e131 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 29 Jun 2018 12:05:54 +0200 Subject: [PATCH 274/759] gtkwave: update to 3.3.91. --- srcpkgs/gtkwave/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gtkwave/template b/srcpkgs/gtkwave/template index 393a92e38a3..61db9f3a00b 100644 --- a/srcpkgs/gtkwave/template +++ b/srcpkgs/gtkwave/template @@ -1,17 +1,17 @@ # Template file for 'gtkwave' pkgname=gtkwave -version=3.3.89 +version=3.3.91 revision=1 build_style=gnu-configure +configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="gperf pkg-config" makedepends="gtk+-devel tk-devel" short_desc="Fully featured GTK+ based wave viewer" maintainer="allan " license="GPL-2.0-or-later, MIT" homepage="http://gtkwave.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=af10558beed7cec6758fcd4bca989cec117589def29d709b31eaaa3a81f7ebc8 -configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib --with-tk=${XBPS_CROSS_BASE}/usr/lib" +distfiles="http://gtkwave.sourceforge.net/gtkwave-${version}.tar.gz" +checksum=82a42fba9fd6e8e5e07da40d9759a881ed9e40dc52dd31a519953bcf87c4e9ee post_install() { # MIT license From 181033f4046cf3842669da9c645a65a63eebe5f7 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:19:38 -0400 Subject: [PATCH 275/759] xbps: update distfiles url, add vlicense, revbump --- srcpkgs/xbps/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index a3b46363b36..2fd4cc660f4 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,14 +1,14 @@ # Template file for 'xbps' pkgname=xbps version=0.52 -revision=6 +revision=7 bootstrap=yes build_style=configure short_desc="The XBPS package system utilities" maintainer="Juan RP " -homepage="https://github.com/voidlinux/xbps" -license="2-clause-BSD" -distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz" +homepage="https://github.com/void-linux/xbps" +license="BSD-2-Clause" +distfiles="https://github.com/void-linux/xbps/archive/$version.tar.gz" checksum=f9a584d286c28eaf5a00f2e0ea9a8124b2200d50ecb62d26adcabe51f328b551 CFLAGS='-Wno-error' @@ -54,6 +54,8 @@ post_install() { esac vmkdir etc/xbps.d touch ${DESTDIR}/etc/xbps.d/.empty + vlicense COPYING + vlicense COPYING.3RDPARTY } libxbps_package() { From b5bc664eaaa2dfdf9dc9399d9a84417c21a8830a Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:20:13 -0400 Subject: [PATCH 276/759] xbps-static: update distfiles url, add vlicense, revbump --- srcpkgs/xbps-static/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xbps-static/template b/srcpkgs/xbps-static/template index d15668b52c8..42ebf846312 100644 --- a/srcpkgs/xbps-static/template +++ b/srcpkgs/xbps-static/template @@ -2,7 +2,7 @@ # NOTE: keep this package synchronized with "srcpkgs/xbps". pkgname=xbps-static version=0.52 -revision=1 +revision=2 wrksrc="xbps-${version}" build_style=configure hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ short_desc="The XBPS package system utilities - static binaries" maintainer="Juan RP " license="BSD-2-Clause" homepage="https://www.voidlinux.eu/xbps" -distfiles="https://github.com/voidlinux/xbps/archive/$version.tar.gz" +distfiles="https://github.com/void-linux/xbps/archive/$version.tar.gz" checksum=f9a584d286c28eaf5a00f2e0ea9a8124b2200d50ecb62d26adcabe51f328b551 case "$XBPS_TARGET_MACHINE" in @@ -31,3 +31,8 @@ do_install() { vmkdir usr/bin mv ${wrksrc}/static-install/usr/bin/*.static ${DESTDIR}/usr/bin } + +post_install() { + vlicense COPYING + vlicense COPYING.3RDPARTY +} From 71c292c472a3dfed4723bb7906803f13fb8f55a3 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:20:56 -0400 Subject: [PATCH 277/759] socklog-void: update distfiles url, maintainer --- srcpkgs/socklog-void/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/socklog-void/template b/srcpkgs/socklog-void/template index c606adb5c89..f8812893190 100644 --- a/srcpkgs/socklog-void/template +++ b/srcpkgs/socklog-void/template @@ -23,8 +23,8 @@ conf_files=" hostmakedepends="git" depends="socklog runit libcap-progs" short_desc="Void Linux socklog configuration" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" -homepage="https://github.com/voidlinux/socklog-void" -distfiles="https://github.com/voidlinux/${pkgname}/archive/${version}.tar.gz" +homepage="https://github.com/void-linux/socklog-void" +distfiles="https://github.com/void-linux/${pkgname}/archive/${version}.tar.gz" checksum=47ea42aa468f5fceea402ee67e3ebb7e54ba7c33ab580212749bcf893ce56c9e From e44ecb441e0e8f9882dd8104cf0acbac33903067 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:21:56 -0400 Subject: [PATCH 278/759] libglob: update distfiles url, license name, revbump --- srcpkgs/libglob/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libglob/template b/srcpkgs/libglob/template index 929555942e4..2f873d6f31f 100644 --- a/srcpkgs/libglob/template +++ b/srcpkgs/libglob/template @@ -1,14 +1,14 @@ # Template file for 'libglob' pkgname=libglob version=1.0 -revision=1 +revision=2 build_style=gnu-makefile only_for_archs="aarch64-musl armv6l-musl armv7l-musl i686-musl mips-musl mipshf-musl mipsel-musl mipselhf-musl x86_64-musl" short_desc="BSD glob(3) implementation for the musl C library" maintainer="Juan RP " -license="3-clause-BSD" -homepage="https://github.com/voidlinux/libglob" -distfiles="https://github.com/voidlinux/${pkgname}/archive/${version}.tar.gz" +license="BSD-3-clause" +homepage="https://github.com/void-linux/libglob" +distfiles="https://github.com/void-linux/${pkgname}/archive/${version}.tar.gz" checksum=4f1b204dad065689941c64828a92441fb316c9c7539b39525fa728125da65e22 post_install() { From 8b8f14f6b9d219b2409c0fb0ab925652b243cdc0 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:22:29 -0400 Subject: [PATCH 279/759] netbsd-wtf: update homepage url --- srcpkgs/netbsd-wtf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index d4c1a5074fb..ca016f60464 100644 --- a/srcpkgs/netbsd-wtf/template +++ b/srcpkgs/netbsd-wtf/template @@ -8,7 +8,7 @@ build_style=gnu-makefile short_desc="The NetBSD's wtf(6) utility" maintainer="Juan RP " license="Public domain" -homepage="http://www.NetBSD.org" +homepage="https://www.netbsd.org" distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz" checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7 From 327c8d49e7e925274d66a77744caf900eea2f185 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:22:53 -0400 Subject: [PATCH 280/759] jbigkit: update distfiles url --- srcpkgs/jbigkit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/jbigkit/template b/srcpkgs/jbigkit/template index 17882cd7511..66a4846cd1e 100644 --- a/srcpkgs/jbigkit/template +++ b/srcpkgs/jbigkit/template @@ -9,7 +9,7 @@ short_desc="Data compression library/utilities for bi-level high-resolution imag maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.cl.cam.ac.uk/~mgk25/jbigkit" -distfiles="https://github.com/voidlinux/jbigkit-shared/archive/v${version}.tar.gz" +distfiles="https://github.com/void-linux/jbigkit-shared/archive/v${version}.tar.gz" checksum=bce256a39735145ecfc10d3e446e0b55fed1f7c80cffb6e2601a9090faae92e6 disable_parallel_build=yes From 5039d435ae5aa57fc78a70e60944b2bbca00897f Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 17 Jun 2018 23:23:39 -0400 Subject: [PATCH 281/759] void-updates: add vlicense, revbump --- srcpkgs/void-updates/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/void-updates/template b/srcpkgs/void-updates/template index b3c3a13c223..db66692c211 100644 --- a/srcpkgs/void-updates/template +++ b/srcpkgs/void-updates/template @@ -1,7 +1,7 @@ # Template file for 'void-updates' pkgname=void-updates version=20180616 -revision=1 +revision=2 noarch=yes build_style=gnu-makefile depends="git curl" @@ -15,3 +15,7 @@ license="ISC" homepage="https://github.com/void-linux/void-updates" distfiles="${homepage}/archive/${version}.tar.gz" checksum=d885cb1e378aa3315dd5293a58be5729b98a2e1fb5f024105a8d8662e4f591cd + +post_install() { + vlicense LICENSE +} From 5471577f8b763041f91bbeb6d1e152a71146e0ab Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Sun, 24 Jun 2018 14:18:25 -0400 Subject: [PATCH 282/759] runit-void: update homepage --- srcpkgs/runit-void/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index cd3b794349d..1af98b892a5 100644 --- a/srcpkgs/runit-void/template +++ b/srcpkgs/runit-void/template @@ -4,7 +4,7 @@ version=20180623 revision=1 wrksrc="void-runit-${version}" build_style=gnu-makefile -homepage="http://www.voidlinux.eu" +homepage="https://github.com/void-linux/void-runit" short_desc="Void Linux runit scripts" maintainer="Juan RP " license="Public Domain" From 807474927b893f647de8a369ea410c3d9a873a9b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 29 Jun 2018 13:34:34 +0200 Subject: [PATCH 283/759] sbcl: update to 1.4.9. --- srcpkgs/sbcl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 7b7e5657c3f..1de57b537db 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.4.8 +version=1.4.9 revision=1 only_for_archs="i686 x86_64 x86_64-musl armv7l aarch64" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="custom" homepage="http://www.sbcl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=ce24b62b88482621c228a4fd6c802350330b6263e1b1b98460eeb4a81d7fb335 +checksum=8f679eba0a5a8d86feced6776e389cc791a26998e4b43185a5e02bebb76620c5 nocross=yes nopie=yes @@ -20,7 +20,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" f0612bbf37de07c4d1213de1cdd108315da1f2251789d0278592b434fa82b044" + checksum+=" e71935d6fcb563d93f1ac8df1adfe7bcd2cbe9fe1a2d1bc46ac30fda17d11f72" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2" From f25d05be7c6f4ab1de4fe9ce7f0c5633aa887f37 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 28 Jun 2018 14:21:08 +0200 Subject: [PATCH 284/759] hopper: update to 4.3.25. --- srcpkgs/hopper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template index 352a47e2494..924239294ed 100644 --- a/srcpkgs/hopper/template +++ b/srcpkgs/hopper/template @@ -1,6 +1,6 @@ # Template file for 'hopper' pkgname=hopper -version=4.3.24 +version=4.3.25 revision=1 _build=1 create_wrksrc=yes @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="EULA" homepage="https://www.hopperapp.com" distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux.pkg.tar.xz" -checksum=7fec505b744d06adc19d55a6e03a00bd661f55324d65ee33d32c8a1425920332 +checksum=c7c84970948adee93af3605d12685b94fa67a9e8a42ae0da38e353186ae7e898 only_for_archs="x86_64" restricted=yes From c85aa5310a670fecb1327d427b9aa0e6d801046e Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 29 Jun 2018 15:26:48 +0200 Subject: [PATCH 285/759] hugo: update to 0.42.2. --- srcpkgs/hugo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 515c417ca25..76e759ba3ae 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.42.1 +version=0.42.2 revision=1 build_style=go hostmakedepends="git" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=4450c9434269dac75f4a6cb702d8704a49c73e17f974dc2fa15e699c03b9774b +checksum=3e834b71c3aab605db0fa7ae54a98161119a9a5758991dd03fcb55151c6de122 build_options="pygments" desc_option_pygments="Alternative syntax highlighter" From 3fd324d69225312c78aaaa1e28e4a1cee0873d47 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 29 Jun 2018 15:34:00 +0200 Subject: [PATCH 286/759] kubernetes: update to 1.11.0. --- srcpkgs/kubernetes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 511a4f5e4d6..e21447d23b3 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.10.5 +version=1.11.0 revision=1 build_style=go nocross=yes @@ -13,7 +13,7 @@ license="Apache-2.0" go_import_path="github.com/kubernetes/kubernetes" homepage="http://kubernetes.io" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=efa27452ca77366f5e0c31e8db36df338593e3c24bd86be7e95b2e1a04672321 +checksum=b264dec72bb383fe6fc9063a1e270c00e734005e7af578bd0b33091fd8451349 system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" From 262fd4a3a1fa54840ebd0f5dc2381d3f3022afd1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 29 Jun 2018 10:09:58 -0300 Subject: [PATCH 287/759] slit: add missing binary. resolves void-linux/void-packages#519 --- srcpkgs/slit/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template index 63bd2c634c4..d8a2ab206b8 100644 --- a/srcpkgs/slit/template +++ b/srcpkgs/slit/template @@ -1,9 +1,10 @@ # Template file for 'slit' pkgname=slit version=1.2.0 -revision=1 +revision=2 build_style=go -go_import_path="github.com/tigrawap/slit" +go_import_path=github.com/tigrawap/slit +go_package="${go_import_path}/cmd/slit" short_desc="A modern PAGER for viewing logs" maintainer="Michael Gehring " license="MIT" From 6968042f9c6a5e7d2f2db0c45d268a87af61f018 Mon Sep 17 00:00:00 2001 From: jtalowell Date: Fri, 29 Jun 2018 11:48:27 +1000 Subject: [PATCH 288/759] New package: i3lock-color-2.11 --- srcpkgs/i3lock-color/patches/fix-musl.patch | 20 +++++++++++++++++ srcpkgs/i3lock-color/template | 25 +++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 srcpkgs/i3lock-color/patches/fix-musl.patch create mode 100644 srcpkgs/i3lock-color/template diff --git a/srcpkgs/i3lock-color/patches/fix-musl.patch b/srcpkgs/i3lock-color/patches/fix-musl.patch new file mode 100644 index 00000000000..18c4aa9bda4 --- /dev/null +++ b/srcpkgs/i3lock-color/patches/fix-musl.patch @@ -0,0 +1,20 @@ +From c265fea7039300ff2283446ce6e7bc03439e2860 Mon Sep 17 00:00:00 2001 +From: maxice8 +Date: Wed, 27 Jun 2018 21:55:47 -0300 +Subject: [PATCH] jpg.h: add include for sys/types.h and define _GNU_SOURCE. + +this allows us to use uint on musl libc systems like Void Linux and +Alpine. +--- +--- jpg.h ++++ jpg.h +@@ -1,6 +1,9 @@ + #ifndef _JPG_H + #define _JPG_H + ++#include ++ ++#define _GNU_SOURCE 1 + typedef struct { + uint height; + uint width; diff --git a/srcpkgs/i3lock-color/template b/srcpkgs/i3lock-color/template new file mode 100644 index 00000000000..817af76528e --- /dev/null +++ b/srcpkgs/i3lock-color/template @@ -0,0 +1,25 @@ +# Template file for 'i3lock-color' +pkgname=i3lock-color +version=2.11 +revision=1 +wrksrc="${pkgname}-${version}-c" +build_style=gnu-configure +hostmakedepends="pkg-config automake" +makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel xcb-util-devel + xcb-util-image-devel libjpeg-turbo-devel" +short_desc="Screenlocker forked from i3lock with more features" +maintainer="jtalowell " +license="MIT" +homepage="https://github.com/PandorasFox/i3lock-color" +distfiles="https://github.com/PandorasFox/i3lock-color/archive/${version}-c.tar.gz" +checksum=376122e9dd6fd4e3572cb5114ca59417a9da4a8c3d65c347f5bf36e3058d077e +conf_files="/etc/pam.d/i3lock" +conflicts="i3lock" + +pre_configure() { + autoreconf -i +} + +post_install() { + vlicense LICENSE +} From fbd1580f40a8f8920d0e621f7fe57193215eac68 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 29 Jun 2018 00:00:42 -0300 Subject: [PATCH 289/759] python-simplejson: update to 3.16.0. --- srcpkgs/python-simplejson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python-simplejson/template index f1eb4072dd6..6db615cdc84 100644 --- a/srcpkgs/python-simplejson/template +++ b/srcpkgs/python-simplejson/template @@ -1,6 +1,6 @@ # Template file for 'python-simplejson' pkgname=python-simplejson -version=3.15.0 +version=3.16.0 revision=1 wrksrc="simplejson-${version}" build_style=python-module @@ -13,7 +13,7 @@ license="MIT, AFL-2.1" homepage="https://github.com/simplejson/simplejson" #changelog="https://raw.githubusercontent.com/simplejson/simplejson/master/CHANGES.txt" distfiles="${PYPI_SITE}/s/simplejson/simplejson-${version}.tar.gz" -checksum=ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb +checksum=b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5 do_check() { python3 setup.py test From 83ef462a31d34c057686afc37b5192e4536cde24 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 29 Jun 2018 00:05:02 -0300 Subject: [PATCH 290/759] python-fishnet: update to 1.15.11. --- srcpkgs/python-fishnet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-fishnet/template b/srcpkgs/python-fishnet/template index 5152b78ca0c..b76b4eb9561 100644 --- a/srcpkgs/python-fishnet/template +++ b/srcpkgs/python-fishnet/template @@ -1,6 +1,6 @@ # Template file for 'python-fishnet' pkgname=python-fishnet -version=1.15.10 +version=1.15.11 revision=1 noarch=yes wrksrc="fishnet-${version}" @@ -13,7 +13,7 @@ maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://github.com/niklasf/fishnet" distfiles="https://github.com/niklasf/fishnet/archive/v${version}.tar.gz" -checksum=7eee9c58dab32b1d482ea9898e297c6a5d3a99717ff5cd85921b013bd042e11e +checksum=33da1211d84b5832d7c9a92f9ed4427011ebdadf33b26e366d9d9698e6be420e python3-fishnet_package() { noarch=yes From 26573d0ebd5fbf6a4b15fa9b475d19dfb217ede8 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:50:45 -0300 Subject: [PATCH 291/759] python-py: update to 1.5.4. --- srcpkgs/python-py/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python-py/template b/srcpkgs/python-py/template index 5642b08a1c5..f468c8724a7 100644 --- a/srcpkgs/python-py/template +++ b/srcpkgs/python-py/template @@ -1,7 +1,7 @@ # Template file for 'python-py' pkgname=python-py -version=1.5.3 -revision=2 +version=1.5.4 +revision=1 noarch=yes wrksrc="py-${version}" build_style=python-module @@ -10,11 +10,11 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python" checkdepends="python3-pytest" short_desc="Python2 development support library" -maintainer="maxice8 " +maintainer="Orpahend " license="MIT" homepage="https://github.com/pytest-dev/py" -distfiles="https://github.com/pytest-dev/py/archive/${version}.tar.gz" -checksum=c0698a6f71e9ea2a44e5bdf81f1ec8d5b5e9646e990c75fadeb133149aeb8440 +distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz" +checksum=3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7 do_check() { python3 -m pytest From 47a5c849500fc38da3be8d52d38778eb5be915c2 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Fri, 29 Jun 2018 16:43:13 -0300 Subject: [PATCH 292/759] orca: update to 3.28.2. (#500) --- srcpkgs/orca/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index d1692e0db13..239bbf6c026 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,7 +1,8 @@ # Template file for 'orca' pkgname=orca -version=3.28.1 +version=3.28.2 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="intltool itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python-gobject-devel" @@ -12,6 +13,5 @@ short_desc="Screen reader for individuals who are blind or visually impaired" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org/projects/orca" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=4f14144a722d26c6e5492298600df0161ce841bf8eae81fd2b27387e2c638512 -noarch=yes +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=188d168a135a3fad1c73ae4b51a426e0717b78ee591e2b78b6e50164a2343023 From 14238da08a27b13e8057336bdfce0234e937a8fb Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Fri, 29 Jun 2018 21:49:13 +0200 Subject: [PATCH 293/759] abGate: update to 1.1.9. (#457) --- srcpkgs/abGate/patches/Makefile.patch | 26 ++++++++++++++++++++++++++ srcpkgs/abGate/template | 16 ++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/abGate/patches/Makefile.patch diff --git a/srcpkgs/abGate/patches/Makefile.patch b/srcpkgs/abGate/patches/Makefile.patch new file mode 100644 index 00000000000..eb30dae273c --- /dev/null +++ b/srcpkgs/abGate/patches/Makefile.patch @@ -0,0 +1,26 @@ +--- Makefile 2018-06-27 09:47:49.602920765 +0000 ++++ - 2018-06-27 09:48:44.684191018 +0000 +@@ -10,7 +10,7 @@ + cp $^ $(BUNDLE) + + abGateQt/libabGateQt.so: +- cd abGateQt; qmake; make ++ cd abGateQt; qmake-qt5 QMAKE_CC=$(CC) QMAKE_CXX=$(CXX) QMAKE_LINK=$(CXX); make CC=$(CC) CXX=$(CXX) LINK=$(CXX) + + gate.so: gate.cpp + g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so +--- Makefile 2018-06-27 09:50:25.705750049 +0000 ++++ - 2018-06-27 09:50:52.610670910 +0000 +@@ -13,10 +13,10 @@ + cd abGateQt; qmake-qt5 QMAKE_CC="$(CC)" QMAKE_CXX="$(CXX)" QMAKE_LINK="$(CXX)"; make CC="$(CC)" CXX="$(CXX)" LINK="$(CXX)" + + gate.so: gate.cpp +- g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so ++ $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate.cpp `pkg-config --cflags --libs lv2` -o gate.so + + gate_gui.so: gate_gui.cpp main_window.cpp main_window.h knob.cpp knob.h toggle.cpp toggle.h preset_widget.cpp preset_widget.h presets.cpp presets.h preset.cpp preset.h gate_const.h plugin_configuration.h +- g++ $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate_gui.cpp main_window.cpp knob.cpp toggle.cpp preset_widget.cpp presets.cpp preset.cpp `pkg-config --cflags gtkmm-2.4 --libs lv2 gthread-2.0` -o gate_gui.so ++ $(CXX) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -g -O3 -shared -fPIC -DPIC -Wl,--as-needed gate_gui.cpp main_window.cpp knob.cpp toggle.cpp preset_widget.cpp presets.cpp preset.cpp `pkg-config --cflags gtkmm-2.4 --libs lv2 gthread-2.0` -o gate_gui.so + + all: $(BUNDLE) + diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template index 6b77d612276..6cd8e491840 100644 --- a/srcpkgs/abGate/template +++ b/srcpkgs/abGate/template @@ -1,18 +1,18 @@ # Template file for 'abGate' pkgname=abGate -version=1.1.8 +version=1.1.9 revision=1 build_style=gnu-makefile -hostmakedepends="pkg-config" -makedepends="qt-devel gtkmm2-devel lv2" +hostmakedepends="pkg-config qt5-qmake qt5-host-tools" +makedepends="qt5-devel gtkmm2-devel lv2" depends="lv2" short_desc="LV2 Noise Gate plugin" maintainer="Juan RP " -license="GPL-3" +license="LGPL-3.0-or-later" homepage="http://abgate.sourceforge.net/" distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz" -checksum=6313f60b3e137f68b24ce30612187101c63cbdbe6291361656472380b2b8f797 +checksum=898b50cce44dffedd82ec0e6d6d043a9d26534fbf07898d099575ea4c1057721 -pre_build() { - sed -e 's,qmake-qt4,qmake,g' -i Makefile -} +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-devel" +fi From c52ed4dbd08437cfeac04f53062e8cfd57b8d66a Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Fri, 29 Jun 2018 21:39:18 -0700 Subject: [PATCH 294/759] common/travis: change mirror to automatic selection --- common/travis/set_mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/travis/set_mirror.sh b/common/travis/set_mirror.sh index bb03b006ad4..ff1fb349bb2 100755 --- a/common/travis/set_mirror.sh +++ b/common/travis/set_mirror.sh @@ -1,7 +1,7 @@ #!/bin/sh TRAVIS_PROTO=http -TRAVIS_MIRROR=vm1.a-mci-us.m.voidlinux.org +TRAVIS_MIRROR=auto.voidlinux.org for _i in etc/repos-remote.conf etc/defaults.conf etc/repos-remote-x86_64.conf ; do printf '\x1b[32mUpdating %s...\x1b[0m\n' $_i From c85acace79ff70cf0d6452fd13325801e029dc52 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 03:01:09 -0300 Subject: [PATCH 295/759] elfutils: update to 0.173. --- srcpkgs/elfutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 3f4c6e84ebb..398496564c6 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.172 +version=0.173 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3.0-or-later" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=779c99e6344c4982bbab60b8d276cec3d468151c758905f9a44ba6b6edaa0e24 +checksum=b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff CFLAGS="-Wno-error" From 79f5bfb70c64d39ea1be825c6307785f299548e1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 02:56:40 -0300 Subject: [PATCH 296/759] gsoap: update to 2.8.68. --- srcpkgs/gsoap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index e41e416f8c4..030b69c74dc 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,6 +1,6 @@ # Template file for 'gsoap' pkgname=gsoap -version=2.8.67 +version=2.8.68 revision=1 wrksrc="gsoap-${version%.*}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="gSOAP-1.3b, GPL-2.0-only" homepage="http://www.cs.fsu.edu/~engelen/soap.html" distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip" -checksum=53c56fb365ed24195fffdad7c589d073f1e4e467901a6b60e1fd5158d61e47cf +checksum=2e470f54d89d03f0eba03bd60b7f345003177315043b6406e80e5883437cf649 disable_parallel_build=yes if [ "$CROSS_BUILD" ]; then From 1c5217c935d578413dfff4e00d434054ceae524b Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 29 Jun 2018 10:05:30 -0300 Subject: [PATCH 297/759] fuse-sshfs: update to 3.4.0. --- srcpkgs/fuse-sshfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fuse-sshfs/template b/srcpkgs/fuse-sshfs/template index bd7c0edc1d3..fbac3a1e834 100644 --- a/srcpkgs/fuse-sshfs/template +++ b/srcpkgs/fuse-sshfs/template @@ -1,6 +1,6 @@ # Template file for 'fuse-sshfs' pkgname=fuse-sshfs -version=3.3.2 +version=3.4.0 revision=1 wrksrc="sshfs-${version}" build_style=meson @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="https://github.com/libfuse/sshfs" distfiles="https://github.com/libfuse/sshfs/releases/download/sshfs-${version}/sshfs-${version}.tar.xz" -checksum=a4da6af0ac4f39606eefd0fd7ca09267fbb90e274081570a700f911fca387e4c +checksum=d27ccd35436d72755c40234cefa081e30fa529e092232a5b4abbff2178c2c22f case "${XBPS_TARGET_MACHINE}" in i686|armv6l|armv7l) From 4b95fc24e203ae4438437f20f5c9e3bffa4b51e0 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 16:05:41 -0300 Subject: [PATCH 298/759] zstd: update to 1.3.5. --- srcpkgs/zstd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template index cc73fdc6ef7..3eb61d1b2c9 100644 --- a/srcpkgs/zstd/template +++ b/srcpkgs/zstd/template @@ -1,15 +1,15 @@ # Template file for 'zstd' pkgname=zstd -version=1.3.4 -revision=3 +version=1.3.5 +revision=1 short_desc="Fast real-time compression algorithm - CLI tool" -maintainer="Michael Gehring " makedepends="zlib-devel liblzma-devel" checkdepends="gtest-devel" +maintainer="Michael Gehring " license="BSD-3-Clause, GPL-2.0-or-later" homepage="http://www.zstd.net" distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz" -checksum=92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9 +checksum=d6e1559e4cdb7c4226767d4ddc990bff5f9aab77085ff0d0490c828b025e2eea do_build() { make From 6925d018d474beee6576db98ba6955926e7a7ba7 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 30 Jun 2018 08:05:30 +0200 Subject: [PATCH 299/759] perl-Test-Time: update to 0.06 --- srcpkgs/perl-Test-Time/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Test-Time/template b/srcpkgs/perl-Test-Time/template index 500f6935940..8cad9c6dfca 100644 --- a/srcpkgs/perl-Test-Time/template +++ b/srcpkgs/perl-Test-Time/template @@ -1,6 +1,6 @@ # Template file for 'perl-Test-Time' pkgname=perl-Test-Time -version=0.05 +version=0.06 revision=1 noarch=yes wrksrc="${pkgname#perl-}-${version}" @@ -13,4 +13,4 @@ maintainer="newbluemoon " license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Test-Time" distfiles="${CPAN_SITE}/Test/${pkgname#perl-}-$version.tar.gz" -checksum=abef8885a811440114bfe067edc32f08500fbfd624902f8c3a81fc224ac4b410 +checksum=c99b373247748a2560a6e07b4eddea0bd90f8241a27ac096ee54e5aed1791754 From d2c314ca4a020b22d06d91457bf49f8fecd16a77 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 03:03:50 -0300 Subject: [PATCH 300/759] libraw: update to 0.18.13. --- srcpkgs/libraw/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template index 263bf61c9d0..35d69f69e9e 100644 --- a/srcpkgs/libraw/template +++ b/srcpkgs/libraw/template @@ -1,6 +1,6 @@ # Template file for 'libraw' pkgname=libraw -version=0.18.12 +version=0.18.13 revision=1 wrksrc="LibRaw-${version}" build_style=gnu-configure @@ -10,9 +10,9 @@ short_desc="Raw image decoder library" maintainer="Juan RP " license="LGPL-2.1-only, CDDL-1.0" homepage="https://www.libraw.org" -#changelog="https://raw.githubusercontent.com/LibRaw/LibRaw/0.18-stable/Changelog.txt" +changelog="https://raw.githubusercontent.com/LibRaw/LibRaw/0.18-stable/Changelog.txt" distfiles="https://www.libraw.org/data/LibRaw-${version}.tar.gz" -checksum=57754d75a857e16ba1c2a429e4b5b4d79160a59eadaec715351fc9c8448653d4 +checksum=cb1f9d0d1fabc8967d501d95c05d2b53d97a2b917345c66553b1abbea06757ca post_install() { vmkdir usr/share/licenses From 481a987e5be3b42adfa80c2f3f5ba687e511207e Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Fri, 29 Jun 2018 02:23:52 +0200 Subject: [PATCH 301/759] lf: update to r6. --- srcpkgs/lf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template index e04016f09b4..fb95f2282be 100644 --- a/srcpkgs/lf/template +++ b/srcpkgs/lf/template @@ -1,6 +1,6 @@ # Template file for 'lf' pkgname=lf -version=r5 +version=r6 revision=1 build_style=go go_import_path="github.com/gokcehan/${pkgname}" @@ -11,7 +11,7 @@ maintainer="Daniel Lewan " license="MIT" homepage="https://github.com/gokcehan/lf" distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz" -checksum=ade6c4cc750235a51d4fd6aeeabe8fa7adfcea90504804e739d492bd01e534bb +checksum=43298a4e391d97643ace9bcb96429a63f9b7a8d321da4b4d36151998abc5cd03 post_install() { vlicense LICENSE From 47a12eb4204f657e9642354f7930e6c533f94a98 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 10:49:08 -0300 Subject: [PATCH 302/759] streamlink: update to 0.14.2. --- srcpkgs/streamlink/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 16b8a34f929..8453e781747 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,7 +1,7 @@ # Template file for 'streamlink' pkgname=streamlink -version=0.13.0 -revision=2 +version=0.14.2 +revision=1 noarch=yes build_style=python3-module pycompile_module="streamlink streamlink_cli" @@ -13,10 +13,10 @@ checkdepends="python3-pycryptodome python3-pycountry python3-pysocks short_desc="Utility extracting streams from services, forked from livestreamer" maintainer="wkuipers " license="BSD-2-Clause" -#changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" homepage="https://streamlink.github.io/" +changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md" distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz" -checksum=4d91dbc8233e8737a9dcb629ac471373e903116b3a35c882205c95bdb14eac29 +checksum=a8c7f9a758ade056a35d439f78408e9e43ce1069dde9289d322702d35c214150 export STREAMLINK_USE_PYCOUNTRY=1 From b0e32a27cdb4e211715003a1fb9530b005e8ce5c Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Fri, 29 Jun 2018 02:02:49 +0200 Subject: [PATCH 303/759] python-peewee: update to 3.5.1. --- srcpkgs/python-peewee/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template index 6e29bffdf7a..f0410dccde2 100644 --- a/srcpkgs/python-peewee/template +++ b/srcpkgs/python-peewee/template @@ -1,6 +1,6 @@ # Template file for 'python-peewee' pkgname=python-peewee -version=3.5.0 +version=3.5.1 revision=1 wrksrc="peewee-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="johannes " license="MIT" homepage="https://github.com/coleifer/peewee" distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz" -checksum=1a910438c1394fa74c3ba4c926f19a48d02ae6223719181e2d866c5063edf547 +checksum=9b1ef00ce6e50507f1bf392d369e04d32c38510fc933b9bc90a24bca67105572 alternatives="peewee:pwiz:/usr/bin/pwiz.py2" post_install() { From fed79332fcf8facabe02d33933676f0b8c466f04 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 13 Jun 2018 11:37:11 -0500 Subject: [PATCH 304/759] New package: bro-2.5.4 --- srcpkgs/binpac | 1 + srcpkgs/binpac-devel | 1 + srcpkgs/bro/files/bro/run | 10 +++++ srcpkgs/bro/patches/musl.patch | 74 ++++++++++++++++++++++++++++++++++ srcpkgs/bro/template | 48 ++++++++++++++++++++++ 5 files changed, 134 insertions(+) create mode 120000 srcpkgs/binpac create mode 120000 srcpkgs/binpac-devel create mode 100644 srcpkgs/bro/files/bro/run create mode 100644 srcpkgs/bro/patches/musl.patch create mode 100644 srcpkgs/bro/template diff --git a/srcpkgs/binpac b/srcpkgs/binpac new file mode 120000 index 00000000000..52815503047 --- /dev/null +++ b/srcpkgs/binpac @@ -0,0 +1 @@ +bro \ No newline at end of file diff --git a/srcpkgs/binpac-devel b/srcpkgs/binpac-devel new file mode 120000 index 00000000000..52815503047 --- /dev/null +++ b/srcpkgs/binpac-devel @@ -0,0 +1 @@ +bro \ No newline at end of file diff --git a/srcpkgs/bro/files/bro/run b/srcpkgs/bro/files/bro/run new file mode 100644 index 00000000000..90eb6a59c0c --- /dev/null +++ b/srcpkgs/bro/files/bro/run @@ -0,0 +1,10 @@ +#!/bin/sh + +BROLOGDIR="/var/log/bro" + +[ -r conf ] && . ./conf + +[ -d ${BROLOGDIR} ] || mkdir -p ${BROLOGDIR} + +cd /var/log/bro +exec bro -i ${INTF:=eth0} ${BROPOLICY} diff --git a/srcpkgs/bro/patches/musl.patch b/srcpkgs/bro/patches/musl.patch new file mode 100644 index 00000000000..e8a2c6da9d5 --- /dev/null +++ b/srcpkgs/bro/patches/musl.patch @@ -0,0 +1,74 @@ +https://github.com/danielguerra69/docker-bro-1 + +--- aux/binpac/lib/binpac.h.in.orig ++++ aux/binpac/lib/binpac.h.in +@@ -4,6 +4,7 @@ + #define binpac_h + + #include ++#include + + #cmakedefine HOST_BIGENDIAN + #ifdef HOST_BIGENDIAN + +--- src/OSFinger.h.orig ++++ src/OSFinger.h +@@ -166,3 +166,57 @@ + #define MATCHFUZZY 0x2 + + #endif ++ ++// For musl-libc ++#ifndef TCPOPT_EOL ++# define TCPOPT_EOL 0 ++#endif ++ ++#ifndef TCPOPT_NOP ++# define TCPOPT_NOP 1 ++#endif ++ ++#ifndef TCPOPT_MAXSEG ++# define TCPOPT_MAXSEG 2 ++#endif ++ ++#ifndef TCPOLEN_MAXSEG ++# define TCPOLEN_MAXSEG 4 ++#endif ++ ++#ifndef TCPOPT_WINDOW ++# define TCPOPT_WINDOW 3 ++#endif ++ ++#ifndef TCPOLEN_WINDOW ++# define TCPOLEN_WINDOW 3 ++#endif ++ ++#ifndef TCPOPT_SACK_PERMITTED ++# define TCPOPT_SACK_PERMITTED 4 /* Experimental */ ++#endif ++ ++#ifndef TCPOLEN_SACK_PERMITTED ++# define TCPOLEN_SACK_PERMITTED 2 ++#endif ++ ++#ifndef TCPOPT_SACK ++# define TCPOPT_SACK 5 /* Experimental */ ++#endif ++ ++#ifndef TCPOPT_TIMESTAMP ++# define TCPOPT_TIMESTAMP 8 ++#endif ++ ++#ifndef TCPOLEN_TIMESTAMP ++# define TCPOLEN_TIMESTAMP 10 ++#endif ++ ++#ifndef TCPOLEN_TSTAMP_APPA ++# define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ ++#endif ++ ++#ifndef TCPOPT_TSTAMP_HDR ++# define TCPOPT_TSTAMP_HDR \ ++ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) ++#endif + diff --git a/srcpkgs/bro/template b/srcpkgs/bro/template new file mode 100644 index 00000000000..c5ff0445a5a --- /dev/null +++ b/srcpkgs/bro/template @@ -0,0 +1,48 @@ +# Template file for 'bro' +pkgname=bro +version=2.5.4 +revision=1 +build_style=cmake +nocross="Needs to build part of itself to run, can't be built separately yet." +hostmakedepends="flex pkg-config python3" +makedepends="bind-devel geoip-devel libpcap-devel libressl-devel jemalloc-devel" +short_desc="Advanced framework for network traffic analysis" +maintainer="Andrew Benson " +license="BSD-3-Clause" +homepage="https://www.bro.org" +distfiles="https://www.bro.org/downloads/bro-${version}.tar.gz" +checksum=80daea433fa654f2602cf67b19b9121ff6ad57761bad73cc29020c4f490c5f1f + +case "$XBPS_TARGET_MACHINE" in + *-musl) + makedepends+=" musl-fts-devel" + ;; +esac + +pre_configure() { + case "$XBPS_TARGET_MACHINE" in + *-musl) + sed -i '/set(broxygen/i link_libraries("-lfts")' src/broxygen/CMakeLists.txt + ;; + esac +} + +post_install() { + vsv bro + vlicense COPYING +} + +binpac_package() { + short_desc+=" - protocol parser compiler" + pkg_install() { + vmove /usr/bin/binpac + } +} + +binpac-devel_package() { + short_desc+=" - protocol parser compiler library" + pkg_install() { + vmove /usr/include + vmove "/usr/lib/*.a" + } +} From 33458029024d256c476ebcaa336db8b7a5b675cb Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 30 Jun 2018 11:55:11 +0200 Subject: [PATCH 305/759] po4a: update to 0.54 (#530) --- srcpkgs/po4a/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template index 74d511898b1..84a8dd10fc9 100644 --- a/srcpkgs/po4a/template +++ b/srcpkgs/po4a/template @@ -1,6 +1,6 @@ # Template file for 'po4a' pkgname=po4a -version=0.53 +version=0.54 revision=1 build_style="perl-ModuleBuild" noarch=yes @@ -10,7 +10,7 @@ makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build" depends="${_perldeps} opensp gettext" short_desc="PO for anything (po4a) project to ease translations using gettext tools" maintainer="newbluemoon " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://po4a.org/" distfiles="https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz" -checksum=c9005e816da220912f364766d39df5efd4cc28dcae9467a8dc5fca7f46cb780c +checksum=596f7621697f9dd12709958c229e256b56683d25997ac73c9625a2cc0c603d51 From 748ab8ee1ff60583789fd98c2031b103fc2cd4b2 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 30 Jun 2018 13:22:10 +0200 Subject: [PATCH 306/759] libguestfs: update to 1.39.6. --- srcpkgs/libguestfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 7ab8f4a7322..1fd8568ac6d 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.39.5 +version=1.39.6 revision=1 _version_short=${version%.*} build_style=gnu-configure @@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/$_version_short-development/$pkgname-$version.tar.gz" -checksum=84fe4045fb0e2bbddb9646313b86cf0271c3b92daa4aa955c61f07d1c9c17401 +checksum=2fc293964a57ea2f78d62c0fda5fd16bcdc4b850ae4ffe192b07a7612c7c38b0 conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf From bb6a455cc5269f83008e4a3f0e3fab5318921358 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 30 Jun 2018 13:25:42 +0200 Subject: [PATCH 307/759] apparmor: include every network device, including type-c subsystems --- srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd | 2 +- srcpkgs/apparmor/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd index 17bc96396b9..d34d6644918 100644 --- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd +++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd @@ -29,7 +29,7 @@ profile dhcpcd /{usr/,}bin/dhcpcd { /{var/,}run/dhcpcd.unpriv.sock rw, /{var/,}run/udev/data/* r, - /sys/devices/*/*/{*/,}net/*/uevent r, + /sys/devices/**/net/eth*/uevent r, /sys/devices/virtual/net/*/uevent r, /{usr/,}bin/dash ix, diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 6d625d2d222..1cce3572211 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # Template file for 'apparmor' pkgname=apparmor version=2.13.0 -revision=2 +revision=3 _short_ver=${version%\.*} wrksrc="${pkgname}-v${_short_ver}" configure_args="--prefix=/usr --with-perl --with-python" From 6c9c4eb7e372ed0ef5bbf1bf59492aea8feef220 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 15:36:36 +0200 Subject: [PATCH 308/759] python3: update to 3.6.6 --- srcpkgs/python3/patches/libressl-2.7.patch | 75 ---------------------- srcpkgs/python3/template | 6 +- 2 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 srcpkgs/python3/patches/libressl-2.7.patch diff --git a/srcpkgs/python3/patches/libressl-2.7.patch b/srcpkgs/python3/patches/libressl-2.7.patch deleted file mode 100644 index f4732e1f79a..00000000000 --- a/srcpkgs/python3/patches/libressl-2.7.patch +++ /dev/null @@ -1,75 +0,0 @@ -Based on https://github.com/python/cpython/pull/6210. - ---- Lib/test/test_ssl.py.orig -+++ Lib/test/test_ssl.py -@@ -1687,6 +1687,7 @@ def test_get_ca_certs_capath(self): - self.assertEqual(len(ctx.get_ca_certs()), 1) - - @needs_sni -+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2") - def test_context_setget(self): - # Check that the context of a connected socket can be replaced. - ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) ---- Modules/_ssl.c.orig -+++ Modules/_ssl.c -@@ -106,6 +106,12 @@ struct py_ssl_library_code { - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -152,16 +158,18 @@ struct py_ssl_library_code { - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - #define TLS_client_method SSLv23_client_method - #define TLS_server_method SSLv23_server_method -@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) - return s->tlsext_tick_lifetime_hint; - } - --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { ---- Tools/ssl/multissltests.py.orig -+++ Tools/ssl/multissltests.py -@@ -57,8 +57,9 @@ - ] - - LIBRESSL_RECENT_VERSIONS = [ -- "2.5.3", - "2.5.5", -+ "2.6.4", -+ "2.7.1", - ] - - # store files in ../multissl diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index be1b3c6d829..ba9ed8ae288 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -3,15 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter". # pkgname=python3 -version=3.6.5 -revision=4 +version=3.6.6 +revision=1 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)" maintainer="Juan RP " homepage="https://www.python.org" license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 +checksum=d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f pycompile_dirs="usr/lib/python${version%.*}" hostmakedepends="pkg-config" From b91827d3b0dc3ae6cb54e1a831d1909feec883d5 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 15:36:39 +0200 Subject: [PATCH 309/759] python3-tkinter: update to 3.6.6 --- srcpkgs/python3-tkinter/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index 452b22cfde1..6b5ca817268 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -7,7 +7,7 @@ _desc="Interpreted, interactive, object-oriented programming language" pkgname=python3-tkinter -version=3.6.5 +version=3.6.6 revision=1 wrksrc="Python-${version}" pycompile_dirs=" @@ -20,9 +20,9 @@ makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel short_desc="${_desc} - GUI toolkit for Python3" maintainer="Juan RP " homepage="https://www.python.org" -license="PSF-2" +license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 +checksum=d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f pre_configure() { # Ensure that internal copies of zlib, expat and libffi are not used. From 670c243ff1f65ace3bf5bf3ed32f8070a21b9134 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 30 Jun 2018 16:23:32 +0200 Subject: [PATCH 310/759] myrddin: update to 0.3.0. --- srcpkgs/myrddin/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/myrddin/template b/srcpkgs/myrddin/template index 76e99872e22..97c3c7b7ef3 100644 --- a/srcpkgs/myrddin/template +++ b/srcpkgs/myrddin/template @@ -1,18 +1,19 @@ # Template file for 'myrddin' pkgname=myrddin -version=0.2.2 +version=0.3.0 revision=1 wrksrc=mc only_for_archs="x86_64 x86_64-musl" build_style=configure configure_args="--prefix=/usr" +make_build_target="bootstrap" hostmakedepends="bison" short_desc="Myrddin systems programming language compiler and tools" maintainer="Duncaen " license="MIT" homepage="https://myrlang.org/" distfiles="https://myrlang.org/releases/myrddin-${version}.tar.xz" -checksum=b6692384c2863e9832f5966e7f6ce8d791fcbdcda50b68e3fb5fd29925baf6eb +checksum=e740265ba03968be4a5bc3d091b412565e27258c561cd68473d97d40a5d8d596 post_install() { vlicense LICENSE From dc8cc7d691c4dfccda3545311a41ff8c0617a6ab Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:19:21 +0200 Subject: [PATCH 311/759] python-SQLAlchemy: update to 1.2.9 --- srcpkgs/python-SQLAlchemy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template index 9e1617dc734..f24b8480e33 100644 --- a/srcpkgs/python-SQLAlchemy/template +++ b/srcpkgs/python-SQLAlchemy/template @@ -1,6 +1,6 @@ # Template file for 'python-SQLAlchemy' pkgname=python-SQLAlchemy -version=1.2.8 +version=1.2.9 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="http://www.sqlalchemy.org/" license="MIT" distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz" -checksum=2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c +checksum=e21e5561a85dcdf16b8520ae4daec7401c5c24558e0ce004f9b60be75c4b6957 post_install() { vlicense LICENSE From a210a7cf07e29e4a17f6dd8cd62cfec66cd6a4ad Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:24:37 +0200 Subject: [PATCH 312/759] python-ptyprocess: update to 0.6.0 --- srcpkgs/python-ptyprocess/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-ptyprocess/template b/srcpkgs/python-ptyprocess/template index 58cf3fb4a9c..452fa62c683 100644 --- a/srcpkgs/python-ptyprocess/template +++ b/srcpkgs/python-ptyprocess/template @@ -1,19 +1,23 @@ # Template file for 'python-ptyprocess' pkgname=python-ptyprocess -version=0.5.2 -revision=2 +version=0.6.0 +revision=1 noarch=yes wrksrc="ptyprocess-${version}" build_style=python-module +pycompile_module="ptyprocess" hostmakedepends="python-setuptools python3-setuptools" depends="python" -pycompile_module="ptyprocess" short_desc="Run a subprocess in a pseudo terminal (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/pexpect/ptyprocess" license="ISC" distfiles="${PYPI_SITE}/p/ptyprocess/ptyprocess-${version}.tar.gz" -checksum=e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365 +checksum=923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0 + +post_install() { + vlicense LICENSE +} python3-ptyprocess_package() { noarch=yes @@ -22,5 +26,6 @@ python3-ptyprocess_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } From 53cf63a29fd918bf769c56dcc018e6751f89282e Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:28:16 +0200 Subject: [PATCH 313/759] python-pytz: update to 2018.5 --- srcpkgs/python-pytz/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template index 5b229def066..e12ce2fea6e 100644 --- a/srcpkgs/python-pytz/template +++ b/srcpkgs/python-pytz/template @@ -1,19 +1,19 @@ # Template file for 'python-pytz' pkgname=python-pytz -version=2018.4 +version=2018.5 revision=1 noarch=yes wrksrc="pytz-${version}" build_style=python-module +pycompile_module="pytz" hostmakedepends="python-setuptools python3-setuptools" depends="python tzdata" -pycompile_module="pytz" short_desc="Python2 timezone library" maintainer="Alessio Sergi " homepage="https://pythonhosted.org/pytz/" license="MIT" distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz" -checksum=c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749 +checksum=ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277 post_install() { # use system tz database From 4310e355d86f319ff667f97a120acb7fbfa84390 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:37:39 +0200 Subject: [PATCH 314/759] python-mysqlclient: update to 1.3.13 --- srcpkgs/python-mysqlclient/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-mysqlclient/template b/srcpkgs/python-mysqlclient/template index e4b872c9b51..186dfd9d766 100644 --- a/srcpkgs/python-mysqlclient/template +++ b/srcpkgs/python-mysqlclient/template @@ -1,7 +1,7 @@ # Template file for 'python-mysqlclient' pkgname=python-mysqlclient -version=1.3.12 -revision=2 +version=1.3.13 +revision=1 wrksrc="mysqlclient-${version}" build_style=python-module pycompile_module="MySQLdb _mysql_exceptions.py" @@ -9,10 +9,10 @@ hostmakedepends="python-setuptools python3-setuptools" makedepends="libmysqlclient-devel python-devel python3-devel zlib-devel libressl-devel" short_desc="Python2 interface to MySQL/MariaDB" maintainer="Alin Dobre " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/PyMySQL/mysqlclient-python" distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz" -checksum=2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5 +checksum=ff8ee1be84215e6c30a746b728c41eb0701a46ca76e343af445b35ce6250644f python3-mysqlclient_package() { pycompile_module="MySQLdb _mysql_exceptions.py" From 1d98da4a15d7e1745f427975041cf42d5555cfac Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:38:11 +0200 Subject: [PATCH 315/759] python-pyasn1-modules: update to 0.2.2 --- srcpkgs/python-pyasn1-modules/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template index cebc0676bd5..dfcaff2a87f 100644 --- a/srcpkgs/python-pyasn1-modules/template +++ b/srcpkgs/python-pyasn1-modules/template @@ -1,6 +1,6 @@ # Template file for 'python-pyasn1-modules' pkgname=python-pyasn1-modules -version=0.2.1 +version=0.2.2 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -9,11 +9,11 @@ pycompile_module="pyasn1_modules" hostmakedepends="python-setuptools python3-setuptools" depends="python-pyasn1" short_desc="Collection of ASN.1-based protocols modules (Python2)" -maintainer="Peter Bui " -license="2-clause-BSD" +maintainer="Peter Bui " +license="BSD-2-Clause" homepage="https://github.com/etingof/pyasn1-modules" distfiles="${PYPI_SITE}/p/pyasn1-modules/pyasn1-modules-${version}.tar.gz" -checksum=af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc +checksum=a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547 post_install() { vlicense LICENSE.txt LICENSE From 32b6cd809a6c88b2d38391fa4e25414e16b1b0c1 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:39:39 +0200 Subject: [PATCH 316/759] python-pycryptodome: update to 3.6.3 --- srcpkgs/python-pycryptodome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template index c7f320656df..88e70c3b089 100644 --- a/srcpkgs/python-pycryptodome/template +++ b/srcpkgs/python-pycryptodome/template @@ -1,6 +1,6 @@ # Template file for 'python-pycryptodome' pkgname=python-pycryptodome -version=3.6.2 +version=3.6.3 revision=1 wrksrc="pycryptodome-${version}" build_style=python-module @@ -12,7 +12,7 @@ maintainer="Wietse Kuipers " homepage="https://www.pycryptodome.org/" license="Public Domain, BSD-2-Clause" distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz" -checksum=b19ed0f7752a0b1ec65834c9acb02ba64a812990854e318d32a619c709b14a69 +checksum=9b2e142322273ee88c96ade5cfc0ff99b759be32a06d49ce55cd39adeb1e4541 provides="python-crypto-${version}_1" replaces="python-crypto>=0" From 26333970b9e8de718f7fe3dd3c9b52ce2834b166 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:44:21 +0200 Subject: [PATCH 317/759] python-texttable: update to 1.4.0 --- srcpkgs/python-texttable/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-texttable/template b/srcpkgs/python-texttable/template index d398dbce139..34c284e0105 100644 --- a/srcpkgs/python-texttable/template +++ b/srcpkgs/python-texttable/template @@ -1,6 +1,6 @@ # Template file for 'python-texttable' pkgname=python-texttable -version=1.3.1 +version=1.4.0 revision=1 noarch=yes wrksrc="texttable-${version}" @@ -11,9 +11,9 @@ depends="python" short_desc="Python2 module for creating simple ASCII tables" maintainer="Sergi Alvarez " homepage="https://github.com/foutaise/texttable/" -license="LGPL-3" +license="LGPL-3.0-or-later" distfiles="${PYPI_SITE}/t/texttable/texttable-${version}.tar.gz" -checksum=0f75f5838b775bddc19f72c5bf50eb74be3815eb505ed3084e4666ce2e6c3259 +checksum=95e8cfe85f8395a7eacdfbc8f09d885b9ef3a6ac6ead0364ea721de1127aa36b python3-texttable_package() { noarch=yes From 3127d351bad6bb60c648bd63990c458c6458b919 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 16:53:59 +0200 Subject: [PATCH 318/759] python-numpy-stl: update to 2.7.0 --- srcpkgs/python-numpy-stl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-numpy-stl/template b/srcpkgs/python-numpy-stl/template index 0660c135894..2d4a8443e95 100644 --- a/srcpkgs/python-numpy-stl/template +++ b/srcpkgs/python-numpy-stl/template @@ -1,6 +1,6 @@ # Template file for 'python-numpy-stl' pkgname=python-numpy-stl -version=2.6.0 +version=2.7.0 revision=1 wrksrc="numpy-stl-v${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://github.com/WoLpH/numpy-stl/" distfiles="https://github.com/WoLpH/numpy-stl/releases/download/v${version}/numpy-stl-v${version}.tar.xz" -checksum=48d0f3c23cddec6975be5367d8eb4ce09508c2527101cf1c034da01ff702bf3d +checksum=d90d3ef004b8b6dfe28e295164cb883bf4650509ce231cd8e386af83e4e08f59 alternatives=" numpy-stl:stl:/usr/bin/stl2 From 01d295c4cc7b3b223d6c971185b210fbeab81dc0 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 17:02:46 +0200 Subject: [PATCH 319/759] python-icalendar: update to 4.0.2 Add missing alternatives: "Added rudimentary command line interface." - 4.0.1 (2018-02-11) --- srcpkgs/python-icalendar/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python-icalendar/template b/srcpkgs/python-icalendar/template index ddd1add0828..98045b7f733 100644 --- a/srcpkgs/python-icalendar/template +++ b/srcpkgs/python-icalendar/template @@ -1,19 +1,20 @@ # Template file for 'python-icalendar' pkgname=python-icalendar -version=4.0.1 +version=4.0.2 revision=1 wrksrc="icalendar-${version}" noarch=yes build_style=python-module pycompile_module="icalendar" hostmakedepends="python-setuptools python3-setuptools" -depends="python-dateutil python-pytz" +depends="python-setuptools python-dateutil python-pytz" short_desc="Parser/generator of iCalendar files for use with Python2" maintainer="Oliver Kiddle " license="BSD-2-Clause" -homepage="http://icalendar.readthedocs.org/" +homepage="https://github.com/collective/icalendar" distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz" -checksum=682a42023d3d43a3a83933b4e329d109aabb07c9e11cb94a4d83ca687c3a3e8d +checksum=80362a9f3c2686b88791fdb78c063f33bd96451f7b1b12140c5aad2df81c008c +alternatives="icalendar:icalendar:/usr/bin/icalendar2" post_install() { vlicense LICENSE.rst LICENSE @@ -22,9 +23,11 @@ post_install() { python3-icalendar_package() { noarch=yes pycompile_module="icalendar" - depends="python3-dateutil python3-pytz" + depends="python3-setuptools python3-dateutil python3-pytz" + alternatives="icalendar:icalendar:/usr/bin/icalendar3" short_desc="${short_desc/Python2/Python3}" pkg_install() { + vmove usr/bin/*3 vmove usr/lib/python3* vlicense LICENSE.rst LICENSE } From f3a5f376c4447fc4261a5ea957002b6d7111b56a Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 17:07:46 +0200 Subject: [PATCH 320/759] python-blessings: update to 1.7 --- srcpkgs/python-blessings/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-blessings/template b/srcpkgs/python-blessings/template index 5b2c754a175..0ae88d44809 100644 --- a/srcpkgs/python-blessings/template +++ b/srcpkgs/python-blessings/template @@ -1,19 +1,19 @@ # Template file for 'python-blessings' pkgname=python-blessings -version=1.6.1 +version=1.7 revision=1 noarch=yes wrksrc="blessings-${version}" build_style=python-module pycompile_module="blessings" hostmakedepends="python-setuptools python3-setuptools" -depends="python" +depends="python-six" short_desc="Wrapper around terminal coloring, styling, and positioning (Python2)" maintainer="Maurizio Porrato " homepage="https://github.com/erikrose/blessings" license="MIT" distfiles="${PYPI_SITE}/b/blessings/blessings-${version}.tar.gz" -checksum=74919575885552e14bc24a68f8b539690bd1b5629180faa830b1a25b8c7fb6ea +checksum=98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d post_install() { vlicense LICENSE @@ -21,8 +21,8 @@ post_install() { python3-blessings_package() { noarch=yes + depends="python3-six" pycompile_module="blessings" - depends="python3" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* From 5165121b3523f894533569f6bb6349254c49c130 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 17:51:17 +0200 Subject: [PATCH 321/759] python-lxml: update to 4.2.3 --- srcpkgs/python-lxml/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template index 15e713b57ba..2459017095a 100644 --- a/srcpkgs/python-lxml/template +++ b/srcpkgs/python-lxml/template @@ -1,6 +1,6 @@ # Template file for 'python-lxml' pkgname=python-lxml -version=4.2.2 +version=4.2.3 revision=1 wrksrc="lxml-lxml-${version}" build_style=python-module @@ -10,17 +10,19 @@ makedepends="libxslt-devel python-devel python3-devel" checkdepends="python3" short_desc="Python2 binding for the libxml2 and libxslt libraries" maintainer="Juan RP " -homepage="http://lxml.de/" -license="BSD-3-Clause, ElementTree, GPL-2.0-or-later, ZPL-2.0" # ElementTree isn't SPDX +homepage="https://lxml.de/" +license="BSD-3-Clause, ElementTree" distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=e77a760b5efcc81ddf9dad8b572dcde6d8fbad7307a6d4b8e616fda2293aec6f +checksum=b398434856f0f1399da8f8b48e72cb9075db195cb64ddbb05cb7725f0461d571 do_check() { python3 test.py } post_install() { - vlicense LICENSES.txt LICENSES + vlicense LICENSES.txt + vlicense doc/licenses/BSD.txt + vlicense doc/licenses/elementtree.txt } python3-lxml_package() { @@ -28,6 +30,8 @@ python3-lxml_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* - vlicense LICENSES.txt LICENSES + vlicense LICENSES.txt + vlicense doc/licenses/BSD.txt + vlicense doc/licenses/elementtree.txt } } From f5ceb36fb34c01e66ee5e7afdad3c1ccac2e0e6b Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 17:51:26 +0200 Subject: [PATCH 322/759] python-keyring: update to 13.1.0 --- srcpkgs/python-keyring/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-keyring/template b/srcpkgs/python-keyring/template index 0e0a4139d47..95ccd48c701 100644 --- a/srcpkgs/python-keyring/template +++ b/srcpkgs/python-keyring/template @@ -1,6 +1,6 @@ # Template file for 'python-keyring' pkgname=python-keyring -version=12.2.1 +version=13.1.0 revision=1 noarch=yes wrksrc="keyring-${version}" @@ -13,7 +13,7 @@ maintainer="Oliver Kiddle " license="MIT" homepage="https://github.com/jaraco/keyring" distfiles="https://github.com/jaraco/keyring/archive/${version}.tar.gz" -checksum=b004db75b6f1fb112f5cc09fa0f5bafba532e8ca80aa914a4f59fd8eb1134012 +checksum=dc48b7ab8df197912cf08b1648549bac1dbcd5af494a291a473d68fe104e8900 alternatives="keyring:keyring:/usr/bin/keyring2" pre_build() { From 015797af4bf3d11b822a7157a749af1a7850eaca Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 07:44:57 -0300 Subject: [PATCH 323/759] kapow: update to 1.5.7. --- srcpkgs/kapow/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kapow/template b/srcpkgs/kapow/template index 432de8ed07f..024867709b4 100644 --- a/srcpkgs/kapow/template +++ b/srcpkgs/kapow/template @@ -1,6 +1,6 @@ # Template file for 'kapow' pkgname=kapow -version=1.5.6 +version=1.5.7 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-tools-devel" @@ -9,5 +9,6 @@ short_desc="Simple punch-clock style time tracker" maintainer="Jakub Skrzypnik " license="GPL-3.0-or-later" homepage="https://gottcode.org/kapow/" +changelog="https://raw.githubusercontent.com/gottcode/kapow/master/NEWS" distfiles="https://gottcode.org/${pkgname}/${pkgname}-${version}-src.tar.bz2" -checksum=352a1629c0fd853d186d95a52da1af457d6995c32e63d657afbc5bb2d18c6ef8 +checksum=031d49ca9fe27591b0b6291bfcedbf7ac99938067b8a14812ddfecbbadf10caf From 13291e5ea0971442c22f29565d86dc566c521c49 Mon Sep 17 00:00:00 2001 From: iaroki Date: Sat, 30 Jun 2018 19:01:12 +0300 Subject: [PATCH 324/759] python-docker: update to 3.4.1 (#529) --- srcpkgs/python-docker/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-docker/template b/srcpkgs/python-docker/template index 93e356633a9..d6546bf859b 100644 --- a/srcpkgs/python-docker/template +++ b/srcpkgs/python-docker/template @@ -1,6 +1,6 @@ # Template file for 'python-docker' pkgname=python-docker -version=3.4.0 +version=3.4.1 revision=1 noarch=yes wrksrc="docker-${version}" @@ -14,7 +14,7 @@ maintainer="Sergi Alvarez " license="Apache-2.0" homepage="https://github.com/docker/docker-py" distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz" -checksum=e9cc39e24905e67ba9e2df14c94488f5cf030fb72ae1c60de505ce5ea90503f7 +checksum=ad077b49660b711d20f50f344f70cfae014d635ef094bf21b0d7df5f0aeedf99 python3-docker_package() { noarch=yes From 61a076685fc2987b36fe24c1d0b0badedca78f64 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 18:04:40 +0200 Subject: [PATCH 325/759] python-lz4: update to 2.0.1 --- srcpkgs/python-lz4/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-lz4/template b/srcpkgs/python-lz4/template index 1123a1ff47c..f20b43b3bb1 100644 --- a/srcpkgs/python-lz4/template +++ b/srcpkgs/python-lz4/template @@ -1,7 +1,7 @@ # Template file for 'python-lz4' pkgname=python-lz4 -version=1.1.0 -revision=2 +version=2.0.1 +revision=1 wrksrc="lz4-${version}" build_style=python-module pycompile_module="lz4" @@ -14,7 +14,7 @@ maintainer="Oliver Kiddle " license="BSD-3-Clause" homepage="https://github.com/python-lz4/python-lz4" distfiles="${PYPI_SITE}/l/lz4/lz4-${version}.tar.gz" -checksum=9ede632d668995d6148942022c025c0f7ea0d97c275c099f9ad156e02cc1711e +checksum=ad2829319cf151720724399cb5a14f6fb90abe5edfe2fabc1233e765d3e718b1 pre_build() { sed -i setup.py \ From a79202b79f250e88105e52225f9689da5b9696b5 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 18:20:47 +0200 Subject: [PATCH 326/759] gcovr: update to 4.0 (and use python3) --- srcpkgs/gcovr/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template index bb208a527a8..c32d6430f0f 100644 --- a/srcpkgs/gcovr/template +++ b/srcpkgs/gcovr/template @@ -1,18 +1,18 @@ # Template file for 'gcovr' pkgname=gcovr -version=3.4 +version=4.0 revision=1 noarch=yes -build_style=python2-module +build_style=python3-module pycompile_module="gcovr" -hostmakedepends="python-setuptools" -depends="python" +hostmakedepends="python3-setuptools" +depends="python3-setuptools python3-Jinja2" short_desc="Generates a simple report that summarizes the gcc code coverage" maintainer="Andre Klitzing " -homepage="http://gcovr.com/" -license="3-clause-BSD" +homepage="https://gcovr.com/" +license="BSD-3-Clause" distfiles="https://github.com/gcovr/gcovr/archive/${version}.tar.gz" -checksum=1c52a71f245adfe1b45e30fbe5015337fe66546f17f40038b3969b7b42acceed +checksum=f9731a0ea516f2087e13b3bc310dbd8edaec4ce6a56b2462f5603ee925f40377 post_install() { vlicense LICENSE.txt From ccccbb2ed41e346002ba42719ab504408c2c3c59 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 18:33:16 +0200 Subject: [PATCH 327/759] peframe: build_style=python2-module --- srcpkgs/peframe/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/peframe/template b/srcpkgs/peframe/template index 6b1684e0020..d6af0ea73e9 100644 --- a/srcpkgs/peframe/template +++ b/srcpkgs/peframe/template @@ -1,14 +1,14 @@ # Template file for 'peframe' pkgname=peframe version=5.0.1 -revision=1 +revision=2 noarch=yes _gitver=b8f46740d6870c4e3d60a1f157773af9221c2f67 wrksrc="${pkgname}-${_gitver}" -build_style=python-module +build_style=python2-module pycompile_module="peframe" hostmakedepends="python-setuptools" -depends="python-simplejson" +depends="python-setuptools python-simplejson" short_desc="Perform static analysis on Portable Executables" maintainer="Andrew Benson " license="MIT" From 751f1cc54c3ef33666a74e6d57dd8fb396318bf4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 18:36:30 +0200 Subject: [PATCH 328/759] python-pam: switch to maintained fork Also, python3-pam was missing noarch=yes and pycompile_module. --- srcpkgs/python-pam/template | 35 ++++++++++++++++++++++++----------- srcpkgs/python3-pam | 1 + srcpkgs/python3-pam/template | 19 ------------------- 3 files changed, 25 insertions(+), 30 deletions(-) create mode 120000 srcpkgs/python3-pam delete mode 100644 srcpkgs/python3-pam/template diff --git a/srcpkgs/python-pam/template b/srcpkgs/python-pam/template index d024e4f01ae..1a89d71323a 100644 --- a/srcpkgs/python-pam/template +++ b/srcpkgs/python-pam/template @@ -1,17 +1,30 @@ # Template file for 'python-pam' pkgname=python-pam -version=0.1.4 -revision=6 +version=1.8.4 +revision=2 noarch=yes -wrksrc="${pkgname/python-}-${version}" -build_style=python2-module -hostmakedepends="python-setuptools" -makedepends="python-devel pam-devel" -depends="python pam" +build_style=python-module pycompile_module="pam.py" +hostmakedepends="python-setuptools python3-setuptools" +depends="python pam" short_desc="Python2 module for PAM authentication" -maintainer="Juan RP " -homepage="http://atlee.ca/software/pam/" +maintainer="John " license="MIT" -distfiles="${PYPI_SITE}/p/pam/${pkgname/python-/}-${version}.tar.gz" -checksum=35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b +homepage="https://github.com/FirefighterBlu3/python-pam" +distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz" +checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3 + +post_install() { + vlicense LICENSE +} + +python3-pam_package() { + noarch=yes + depends="python3 pam" + pycompile_module="pam.py" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE + } +} diff --git a/srcpkgs/python3-pam b/srcpkgs/python3-pam new file mode 120000 index 00000000000..8fd44a7dbee --- /dev/null +++ b/srcpkgs/python3-pam @@ -0,0 +1 @@ +python-pam \ No newline at end of file diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template deleted file mode 100644 index 6a08e60ee53..00000000000 --- a/srcpkgs/python3-pam/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'python3-pam' -pkgname=python3-pam -version=1.8.4 -revision=1 -wrksrc="${pkgname/3}-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -makedepends="python3-devel pam-devel" -depends="python3 pam" -short_desc="Python pam module supporting py3" -maintainer="John " -license="MIT" -homepage="https://github.com/FirefighterBlu3/python-pam" -distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz" -checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3 - -post_install() { - vlicense LICENSE -} From 17507c93d96173d1076e227547b697321ee0f187 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 24 Jun 2018 11:34:36 -0300 Subject: [PATCH 329/759] pulseaudio: update to 12.0. --- common/shlibs | 4 ++-- srcpkgs/pulseaudio/template | 37 +++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/common/shlibs b/common/shlibs index ab35a5f4d4f..d47028287cc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -749,8 +749,8 @@ libasyncns.so.0 libasyncns-0.8_1 libpulse.so.0 libpulseaudio-1.0_1 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1 libpulse-simple.so.0 libpulseaudio-1.0_1 -libpulsecommon-11.1.so libpulseaudio-11.1_1 -libpulsecore-11.1.so libpulseaudio-11.1_1 +libpulsecommon-12.0.so libpulseaudio-12.0_1 +libpulsecore-12.0.so libpulseaudio-12.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 7761bd9cc7f..e607d4d9ce3 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,42 +1,42 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=11.1 -revision=4 +version=12.0 +revision=1 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-bluez4 --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset - --disable-systemd --disable-systemd-journal --enable-webrtc-aec - --with-bash-completion-dir=/usr/share/bash-completion/completions" -hostmakedepends="automake libtool pkg-config intltool gettext-devel orc-devel" -makedepends=" - zlib-devel libltdl-devel libglib-devel eudev-libudev-devel speex-devel libXi-devel - libXtst-devel xcb-util-devel libsoxr-devel libsndfile-devel libasyncns-devel - dbus-devel tdb-devel libcap-devel avahi-libs-devel libressl-devel - webrtc-audio-processing-devel orc-devel jack-devel fftw-devel - libcap-progs sbc-devel libxcb-devel libXtst-devel libSM-devel" + --disable-systemd-login --disable-system-daemon --disable-systemd-journal + --enable-webrtc-aec --with-bash-completion-dir=/usr/share/bash-completion/completions" +hostmakedepends="automake gettext-devel intltool libtool orc-devel pkg-config" +makedepends="avahi-libs-devel eudev-libudev-devel fftw-devel jack-devel + libSM-devel libXtst-devel libasyncns-devel libcap-devel libcap-progs + libglib-devel libltdl-devel libressl-devel libsndfile-devel libsoxr-devel + orc-devel sbc-devel speex-devel tdb-devel webrtc-audio-processing-devel + xcb-util-devel" depends="rtkit" conf_files="/etc/pulse/*" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " -homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" -license="LGPL-2" +license="LGPL-2.1-or-later" +homepage="https://www.freedesktop.org/wiki/Software/PulseAudio" +distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" +checksum=6e422dbdc9fd11c0cb6af869e5eda73dc24a8be3c14725440edd51ce6b464444 system_groups="pulse-access" system_accounts="pulse" pulse_groups="audio" pulse_homedir="/var/run/pulse" -distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" -checksum=f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" glib" +fi case "$XBPS_TARGET_MACHINE" in # Disable neon optimizations for the arm* architectures arm*) configure_args+=" --disable-neon-opt" ;; esac -pre_configure() { - NOCONFIGURE=1 ./bootstrap.sh -} post_install() { rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf vsv pulseaudio @@ -52,6 +52,7 @@ libpulseaudio_package() { vmove usr/lib/pulseaudio } } + pulseaudio-devel_package() { depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=${version}_${revision}" short_desc+=" - development files" From ffa2d9e79c40f259fff8872116a52dd8a2b23f2d Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 18:56:59 +0200 Subject: [PATCH 330/759] cinnamon: add missing pycompile_version --- srcpkgs/cinnamon/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index acca8acc824..114e1918185 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon' pkgname=cinnamon version=3.8.6 -revision=1 +revision=2 wrksrc="Cinnamon-${version}" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" build_style=gnu-configure @@ -30,6 +30,7 @@ distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" checksum=b4d4a50713a9e373e987c25c9f9ffa8ba63b0673cfedf6aa93dd394359a094cc nocross="gobject-introspection" +pycompile_version="$py3_ver" pycompile_dirs=" /usr/share/cinnamon/cinnamon-slideshow /usr/share/cinnamon/cinnamon-settings-users From 92043690b2f029f2a7834464ac08e544800dbb38 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 20:22:13 +0200 Subject: [PATCH 331/759] Revert "Seafile client stack: switch to python3 (#138)" This reverts commit b5559b7bf11bd7c55552bd0148ac7b7339869072. Broken. --- srcpkgs/ccnet/patches/python3-syntax.patch | 22 ---------------------- srcpkgs/ccnet/template | 6 +++--- srcpkgs/libsearpc/template | 11 ++++------- srcpkgs/seafile-libclient/template | 9 ++++----- 4 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/ccnet/patches/python3-syntax.patch diff --git a/srcpkgs/ccnet/patches/python3-syntax.patch b/srcpkgs/ccnet/patches/python3-syntax.patch deleted file mode 100644 index 91bb0f5fd36..00000000000 --- a/srcpkgs/ccnet/patches/python3-syntax.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- python/ccnet/packet.py.ORIG -+++ python/ccnet/packet.py -@@ -72,7 +72,7 @@ - def parse_header(buf): - try: - ver, ptype, length, id = struct.unpack(CCNET_HEADER_FORMAT, buf) -- except struct.error, e: -+ except struct.error as e: - raise NetworkError('error when unpack packet header: %s' % e) - - return PacketHeader(ver, ptype, length, id) ---- python/ccnet/async/async_client.py.ORIG -+++ python/ccnet/async/async_client.py -@@ -26,7 +26,7 @@ - ] - - def debug_print(msg): -- print msg -+ print(msg) - - class AsyncClient(Client): - '''Async mode client''' diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template index c47660a37fa..cf05bbcc4c9 100644 --- a/srcpkgs/ccnet/template +++ b/srcpkgs/ccnet/template @@ -1,7 +1,7 @@ # Template file for 'ccnet' pkgname=ccnet version=6.1.8 -revision=2 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libsearpc-codegen libtool pkg-config vala" @@ -37,8 +37,8 @@ ccnet-python_package() { noarch=yes pycompile_module="ccnet" depends="ccnet" - short_desc="Python3 bindings" + short_desc="Python2 bindings" pkg_install() { - vmove ${py3_lib} + vmove usr/lib/python2.7 } } diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 15d8db00272..76a3764d84c 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,15 +1,12 @@ # Template file for 'libsearpc' pkgname=libsearpc -version=3.0.8 +version=3.0.7 revision=1 -_tagversion=3.1-latest -wrksrc="${pkgname}-${_tagversion}" build_style=gnu-configure configure_args="--disable-static --disable-compile-demo" -hostmakedepends="automake libtool pkg-config python3" +hostmakedepends="automake libtool pkg-config python" makedepends="glib-devel jansson-devel" -python_version=3 -pycompile_module="pysearpc" + short_desc="Seafile RPC library" maintainer="yopito " license="GPL-3" @@ -38,7 +35,7 @@ libsearpc-devel_package() { libsearpc-codegen_package() { short_desc+=" - code generator" - depends="python3" + depends="python" noarch=yes pkg_install() { vdoc "AUTHORS" diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index e0e0620ecea..bdee5ee804a 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,15 +1,14 @@ # Template file for 'seafile-libclient' pkgname=seafile-libclient version=6.1.8 -revision=2 +revision=1 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake intltool libsearpc-codegen libtool pkg-config vala" makedepends="ccnet-devel libcurl-devel" -depends="python3" -pycompile_module="seafile" +depends="python" short_desc="Cloud storage system - client command-line and libraries" maintainer="yopito " license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX @@ -22,8 +21,8 @@ pre_configure() { } post_install() { - # remove server stuff - rm -rf ${DESTDIR}${py3_sitelib}/searserv + # remove server files + rm -rf "${DESTDIR}/usr/lib/python2.7/site-packages/seaserv" vdoc README.markdown } From 64af3d61dca63ac44ae2c75c6e9178c7fc469cd8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 20:30:03 +0200 Subject: [PATCH 332/759] libsearpc: revert to 3.0.7 --- srcpkgs/libsearpc/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 76a3764d84c..dcad06ab972 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -1,7 +1,8 @@ # Template file for 'libsearpc' pkgname=libsearpc +reverts="3.0.8_1" version=3.0.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-compile-demo" hostmakedepends="automake libtool pkg-config python" From 323dfc442dc0a6914a3e95b1a85cab94291a55bd Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 20:36:15 +0200 Subject: [PATCH 333/759] ccnet: rebuild against fixed libsearpc --- srcpkgs/ccnet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template index cf05bbcc4c9..e8c0fee2c16 100644 --- a/srcpkgs/ccnet/template +++ b/srcpkgs/ccnet/template @@ -1,7 +1,7 @@ # Template file for 'ccnet' pkgname=ccnet version=6.1.8 -revision=1 +revision=3 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libsearpc-codegen libtool pkg-config vala" From b02f804b918f09472657de7d4a3838c3232875ae Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 20:36:40 +0200 Subject: [PATCH 334/759] seafile-libclient: rebuild against fixed libsearpc --- srcpkgs/seafile-libclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index bdee5ee804a..baba0e2988e 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,7 +1,7 @@ # Template file for 'seafile-libclient' pkgname=seafile-libclient version=6.1.8 -revision=1 +revision=3 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure From 395302d20ab6270791cece3b4d9c347d0e8939c8 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Sat, 30 Jun 2018 16:40:38 -0300 Subject: [PATCH 335/759] acpica-utils: update to 20180629. (#538) --- srcpkgs/acpica-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index ebf53aeaa55..c7d48818db4 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -1,6 +1,6 @@ # Template file for 'acpica-utils' pkgname=acpica-utils -version=20180531 +version=20180629 revision=1 wrksrc="acpica-unix-${version}" hostmakedepends="flex" @@ -9,7 +9,7 @@ license="GPL-2.0-only, BSD-3-Clause" maintainer="Juan RP " homepage="https://www.acpica.org/" distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz" -checksum=8f6cdcaa4039c2b3db141117ec8223f0e1297684b8ab47839e211bddad027665 +checksum=70d11f3f2adbdc64a5b33753e1889918af811ec8050722fbee0fdfc3bfd29a4f only_for_archs="i686 i686-musl x86_64 x86_64-musl" do_build() { From 5105c93faf3e0ddd0f4870788e8b5230cf9261d8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 30 Jun 2018 22:25:12 +0200 Subject: [PATCH 336/759] libsearpc: fix revert to 3.0.7 --- srcpkgs/libsearpc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index dcad06ab972..832a90eb0b3 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -12,8 +12,8 @@ short_desc="Seafile RPC library" maintainer="yopito " license="GPL-3" homepage="https://github.com/haiwen/${pkgname}" -distfiles="https://github.com/haiwen/${pkgname}/archive/v${_tagversion}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=4947bfcddfa0e9ec2aaa60882556d5a493207fb0333598e0e994c3560b665c0d +distfiles="https://github.com/haiwen/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=efee6b495f93e70101c87849c78b135014dfd2f0e5c08dcfed9834def47cb939 pre_configure() { ./autogen.sh From 0a756468d7ccdab232a9ad4e0edd73111e6b3534 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sat, 30 Jun 2018 23:09:39 +0200 Subject: [PATCH 337/759] shotcut: update to 18.05.08. (#513) --- srcpkgs/shotcut/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/shotcut/template b/srcpkgs/shotcut/template index 8f28609d072..677e0d58233 100644 --- a/srcpkgs/shotcut/template +++ b/srcpkgs/shotcut/template @@ -1,6 +1,6 @@ # Template file for 'shotcut' pkgname=shotcut -version=18.03 +version=18.05.08 revision=1 build_style=qmake hostmakedepends="qt5-tools pkg-config" @@ -15,10 +15,12 @@ makedepends=" depends="frei0r-plugins qt5-quickcontrols" short_desc="Free, open source, cross-platform video editor" maintainer="Linux CompITech " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://www.shotcut.org" distfiles="https://github.com/mltframework/shotcut/archive/v${version}.tar.gz" -checksum=d1bbd9df4a58c084ac059f56b02737ead5e37c197fabaedc965260c377a0f6ab +checksum=a78ba95bc6fbb7de82ba2ac0ea65beb9a0b6e5bbcb48b5026f26399c6033272f + +CXXFLAGS="-DHAVE_LOCALE_H=1" nocross="https://travis-ci.org/voidlinux/void-packages/jobs/292589547#L1332 https://travis-ci.org/voidlinux/void-packages/jobs/292589548#L1337" From d286ac1106788cacb5287d325b934b77cbddf362 Mon Sep 17 00:00:00 2001 From: Leandro Vital Date: Sat, 30 Jun 2018 18:19:38 -0300 Subject: [PATCH 338/759] New package: textosaurus-0.9.7 (#523) * New package: textosaurus-0.9.7 * textosaurus: removed redundancy qt5-svg-devel on hostmakedepends, modified SPDX compatible license identifier * textosaurus: indent with tabs * Changing sources files to support checksum validation --- srcpkgs/textosaurus/template | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/textosaurus/template diff --git a/srcpkgs/textosaurus/template b/srcpkgs/textosaurus/template new file mode 100644 index 00000000000..27f8f2eff7c --- /dev/null +++ b/srcpkgs/textosaurus/template @@ -0,0 +1,26 @@ +# Template file for 'textosaurus' + +pkgname=textosaurus +version=0.9.7 +revision=1 +_scommit=24d3deb8bea74458224a2cdfc384a6971822448e +build_style=qmake +hostmakedepends="pkg-config qt5-tools" +makedepends="qt5-svg-devel" +depends="qt5-svg" +short_desc="Simple cross-platform text editor based on Qt and Scintilla" +maintainer="Leandro Vital " +license="GPL-3.0-only" +homepage="https://github.com/martinrotter/textosaurus" +distfiles="${homepage}/archive/${version}.tar.gz + https://github.com/martinrotter/scintilla/archive/${_scommit}.tar.gz" +checksum="73778d2e9de4cc4cf233f3b2832d9323e6586563746c7a2352813da62253ce18 + f9d3e1716417eacbe8128df2140a303a75734e9bf53731763d9c7be264249e75" + +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-svg-devel" +fi + +post_extract() { + cp -Trp ${XBPS_BUILDDIR}/scintilla-${_scommit} ${wrksrc}/src/libtextosaurus/3rd-party/scintilla +} From 679ab547c7db06dfac7a85677c102d99a53beef6 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sat, 30 Jun 2018 15:11:15 +0200 Subject: [PATCH 339/759] New package: perl-File-DesktopEntry-0.22 --- srcpkgs/perl-File-DesktopEntry/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-File-DesktopEntry/template diff --git a/srcpkgs/perl-File-DesktopEntry/template b/srcpkgs/perl-File-DesktopEntry/template new file mode 100644 index 00000000000..abc994b8dd0 --- /dev/null +++ b/srcpkgs/perl-File-DesktopEntry/template @@ -0,0 +1,16 @@ +# Template file for 'perl-File-DesktopEntry' +pkgname=perl-File-DesktopEntry +version=0.22 +revision=1 +noarch=yes +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends} perl-File-BaseDir perl-URI" +depends="${makedepends}" +short_desc="Perl module to handle .desktop files" +maintainer="Frank Steinborn " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/release/File-DesktopEntry" +distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz" +checksum=169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8 From adbf135cd5afcdb14e9e10641aa758324e5f226f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 18:05:37 -0300 Subject: [PATCH 340/759] salt: update to 2018.3.2. --- srcpkgs/salt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template index cc770a82c4c..11889ad884a 100644 --- a/srcpkgs/salt/template +++ b/srcpkgs/salt/template @@ -1,6 +1,6 @@ # Template file for 'salt' pkgname=salt -version=2018.3.1 +version=2018.3.2 revision=1 noarch=yes build_style=python2-module @@ -15,7 +15,7 @@ license="Apache-2.0" homepage="http://saltstack.org/" changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html" distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz" -checksum=7b1d59067b8eb61a23884078e0b8afc02ed8800c5c00f09405ae9e03491ed3db +checksum=d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd conf_files="/etc/salt/*" post_install() { From 3c629cdfb4a786a952be3f33fda159e123ed36cf Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 27 Jun 2018 15:51:37 -0300 Subject: [PATCH 341/759] New package: libaom-1.0.0. --- common/shlibs | 1 + srcpkgs/libaom-devel | 1 + srcpkgs/libaom-tools | 1 + srcpkgs/libaom/template | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 120000 srcpkgs/libaom-devel create mode 120000 srcpkgs/libaom-tools create mode 100644 srcpkgs/libaom/template diff --git a/common/shlibs b/common/shlibs index d47028287cc..ed5e7646035 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3382,3 +3382,4 @@ libticalcs2.so.12 libticalcs2-1.1.9_1 libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 +libaom.so.0 libaom-1.0.0_1 diff --git a/srcpkgs/libaom-devel b/srcpkgs/libaom-devel new file mode 120000 index 00000000000..000d89f76fc --- /dev/null +++ b/srcpkgs/libaom-devel @@ -0,0 +1 @@ +libaom \ No newline at end of file diff --git a/srcpkgs/libaom-tools b/srcpkgs/libaom-tools new file mode 120000 index 00000000000..000d89f76fc --- /dev/null +++ b/srcpkgs/libaom-tools @@ -0,0 +1 @@ +libaom \ No newline at end of file diff --git a/srcpkgs/libaom/template b/srcpkgs/libaom/template new file mode 100644 index 00000000000..4863f56d28a --- /dev/null +++ b/srcpkgs/libaom/template @@ -0,0 +1,37 @@ +# Template file for 'libaom' +pkgname=libaom +version=1.0.0 +revision=1 +create_wrksrc=yes +build_style=cmake +configure_args="-DENABLE_DOCS=ON -DBUILD_SHARED_LIBS=ON" +hostmakedepends="yasm doxygen perl python" +short_desc="AV1 Codec library implementation" +maintainer="maxice8 " +license="BSD-2-Clause" +homepage="https://aomedia.org/" +changelog="https://aomedia.googlesource.com/aom/+/master/CHANGELOG" +distfiles="https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz" +checksum=@8a85b841d98dcebf0d74f1c61c11308746bcc1509c03a6f82e28fb688fb61124 + +post_install() { + vlicense LICENSE +} + +libaom-devel_package() { + depends="libaom-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} + +libaom-tools_package() { + short_desc+=" - utilities for enconding and decoding AV1" + pkg_install() { + vmove usr/bin/aomdec + vmove usr/bin/aomenc + } +} From e8ebf507dd381dcb55d149b4e74670e2cb05100a Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 1 Jul 2018 00:02:04 +0200 Subject: [PATCH 342/759] hunspell-pl_PL: update to 20180630. --- srcpkgs/hunspell-pl_PL/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template index 7884706d5b6..650f9764876 100644 --- a/srcpkgs/hunspell-pl_PL/template +++ b/srcpkgs/hunspell-pl_PL/template @@ -1,6 +1,6 @@ # Template file for 'hunspell-pl_PL' pkgname=hunspell-pl_PL -version=20180621 +version=20180630 revision=1 create_wrksrc=yes noarch=yes @@ -10,7 +10,7 @@ maintainer="m-cz " license="GPL-2.0-or-later, LGPL-3.0-or-later, CC-BY-SA-1.0, MPL-1.1, Apache-2.0, CC-BY-4.0" homepage="https://sjp.pl/slownik/ort/" distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip" -checksum=46edba671d430e0b808c9d761a8f323978c5f9e0265f1966d1af8a1e370a43ae +checksum=232f9cb4ffc2d371867ad306a3002cecffdcd4869ad85831b75f31d7e0ad6ccb post_extract() { unzip pl_PL.zip From 076c04587423ad7e125bfb192b509b00eb79dd0f Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sat, 30 Jun 2018 23:41:40 +0200 Subject: [PATCH 343/759] perl-File-MimeInfo: add missing dependency (perl-File-DesktopEntry) --- srcpkgs/perl-File-MimeInfo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-File-MimeInfo/template b/srcpkgs/perl-File-MimeInfo/template index 7a7dbea280c..acc468b71ff 100644 --- a/srcpkgs/perl-File-MimeInfo/template +++ b/srcpkgs/perl-File-MimeInfo/template @@ -1,12 +1,12 @@ # Template file for 'perl-File-MimeInfo' pkgname=perl-File-MimeInfo version=0.28 -revision=1 +revision=2 noarch=yes wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="${hostmakedepends} perl-File-BaseDir" +makedepends="${hostmakedepends} perl-File-BaseDir perl-File-DesktopEntry" depends="${makedepends}" short_desc="Perl utility to detect file mimetypes and open them accordingly" maintainer="crater2150 " From e0f77822b3e3d99c5d35241c88dc8a5866844b63 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 1 Jul 2018 00:05:18 +0200 Subject: [PATCH 344/759] annie: update to 0.7.5. --- srcpkgs/annie/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/annie/template b/srcpkgs/annie/template index 2c095f04880..e654e73d95a 100644 --- a/srcpkgs/annie/template +++ b/srcpkgs/annie/template @@ -1,6 +1,6 @@ # Template file for 'annie' pkgname=annie -version=0.7.4 +version=0.7.5 revision=1 build_style=go go_import_path="github.com/iawia002/annie" @@ -10,7 +10,7 @@ maintainer="cr6git " license="MIT" homepage="https://github.com/iawia002/annie" distfiles="https://github.com/iawia002/annie/archive/${version}.tar.gz" -checksum=0b2125a21e7ffa51ebae5c4c6e1b28e0d20a5aeba588ad3d0ab6875c72c348a1 +checksum=bf74a5e626ec0319fea990fc5665a2710232c069b8fcbc5ea136433076eade57 post_install() { vlicense LICENSE From 918abfb28e8b2c76f3c55418bdd4862ea7412b77 Mon Sep 17 00:00:00 2001 From: Adam B Date: Sat, 30 Jun 2018 18:07:07 -0400 Subject: [PATCH 345/759] julia: update to 0.6.3. (#315) --- srcpkgs/julia/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 6380b60ffb9..af40bb84595 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,7 +1,8 @@ # Template file for 'julia' pkgname=julia -version=0.6.2 +version=0.6.3 revision=1 +wrksrc=julia nocross=yes build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=1 @@ -23,7 +24,7 @@ maintainer="Francisco Gómez " license="MIT" homepage="https://julialang.org" distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}.tar.gz" -checksum=19d15b07a7609e163420a13f4f9ca885cf61adcd1d970a8d9273919e2c9b74eb +checksum=f18dd3fb67ce65137c9cb56b1b338bca4eeb13832a85de9dd3ec5717e68f69ff case "$XBPS_TARGET_MACHINE" in i686-musl) From 4c718c9f180a4715e6f8e27709d4ea8378fb21ef Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 03:25:09 -0300 Subject: [PATCH 346/759] shared-mime-info: update to 1.10. --- srcpkgs/shared-mime-info/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template index 9afe3533fd3..c70117cb9ba 100644 --- a/srcpkgs/shared-mime-info/template +++ b/srcpkgs/shared-mime-info/template @@ -1,6 +1,6 @@ -# Template build file for 'shared-mime-info'. +# Template file for 'shared-mime-info' pkgname=shared-mime-info -version=1.9 +version=1.10 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" @@ -8,8 +8,8 @@ hostmakedepends="pkg-config intltool" makedepends="libglib-devel libxml2-devel" short_desc="Core database of common types" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://freedesktop.org/Software/shared-mime-info" distfiles="http://freedesktop.org/~hadess/${pkgname}-${version}.tar.xz" -checksum=5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83 +checksum=c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf disable_parallel_build=yes From 98595c7173231544ab16e1d72105764d834c00c8 Mon Sep 17 00:00:00 2001 From: Anatoly Kamchatnov Date: Sun, 1 Jul 2018 02:51:56 +0300 Subject: [PATCH 347/759] cabal-install: update to 2.2.0.0 (#185) --- srcpkgs/cabal-install/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index caf5dc23cc7..903392d2737 100644 --- a/srcpkgs/cabal-install/template +++ b/srcpkgs/cabal-install/template @@ -1,16 +1,16 @@ # Template file for 'cabal-install' pkgname=cabal-install -version=2.0.0.1 +version=2.2.0.0 revision=1 hostmakedepends="ghc curl" makedepends="gmp-devel libffi-devel zlib-devel" depends="ghc" short_desc="Command-line interface for Cabal and Hackage" maintainer="Leah Neukirchen " -license="3-clause-BSD" -homepage="http://hackage.haskell.org/package/cabal-install" -distfiles="http://hackage.haskell.org/packages/archive/${pkgname}/${version}/${pkgname}-${version}.tar.gz" -checksum=f991e36f3adaa1c7e2f0c422a2f2a4ab21b7041c82a8896f72afc9843a0d5d99 +license="BSD-3-Clause" +homepage="https://hackage.haskell.org/package/cabal-install" +distfiles="https://hackage.haskell.org/packages/archive/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=c856a2dd93c5a7b909597c066b9f9ca27fbda1a502b3f96077b7918c0f64a3d9 nopie_files="/usr/bin/cabal" do_build() { From 2eb5f2a0b206339b5f9536285d4c93e0bcd40d5d Mon Sep 17 00:00:00 2001 From: Leandro Vital Date: Sat, 30 Jun 2018 17:42:15 -0300 Subject: [PATCH 348/759] New package: gputils-1.5.0 --- srcpkgs/gputils/template | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/gputils/template diff --git a/srcpkgs/gputils/template b/srcpkgs/gputils/template new file mode 100644 index 00000000000..3791ba4557c --- /dev/null +++ b/srcpkgs/gputils/template @@ -0,0 +1,11 @@ +# Template file for 'gputils' +pkgname=gputils +version=1.5.0 +revision=1 +build_style=gnu-configure +short_desc="PIC Programming Utilities" +maintainer="Leandro Vital " +license="GPL-2.0-or-later" +homepage="http://gputils.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=f6a517c186b991f504be5e4585316871d5950568257885d37487bb368dc76227 From ee1395c059a9d10fb8c07235265b6ae06503d3fc Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 30 Jun 2018 21:01:15 -0300 Subject: [PATCH 349/759] fswatch: update to 1.12.0. --- srcpkgs/fswatch/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template index e18653afcad..49515b3813c 100644 --- a/srcpkgs/fswatch/template +++ b/srcpkgs/fswatch/template @@ -1,7 +1,7 @@ # Template file for 'fswatch' pkgname=fswatch -version=1.11.3 -revision=2 +version=1.12.0 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="doxygen" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://emcrisostomo.github.io/fswatch/" distfiles="https://github.com/emcrisostomo/fswatch/releases/download/${version}/fswatch-${version}.tar.gz" -checksum=21f60ff255bd8dac72c8eb917b08c10ef2a040b380876a35357f6a860282ac83 +checksum=8042da283b34dc383ff6321254163e378d4f3cd5d8df87ff608f811ea33e6a83 case "$XBPS_TARGET_MACHINE" in armv[56]*) From f49f16a0048c46160cfc87c1399fba0911f4952a Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:56:33 -0300 Subject: [PATCH 350/759] libnfs: update to 3.0.0. --- common/shlibs | 2 +- srcpkgs/libnfs/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index ed5e7646035..6a7e02c10f6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1220,7 +1220,7 @@ librlog.so.5 librlog-1.4_1 libtinyxml.so.0 tinyxml-2.6.2_1 libtinyxml2.so.6 tinyxml2-6.0.0_1 libbluray.so.2 libbluray-1.0.0_1 -libnfs.so.11 libnfs-2.0.0_1 +libnfs.so.12 libnfs-3.0.0_1 libzip.so.5 libzip-1.2_1 libapp.so.0 libapp-20110513_1 libluajit-5.1.so.2 LuaJIT-2.0.0_1 diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template index 840922317ec..ef19425a9ed 100644 --- a/srcpkgs/libnfs/template +++ b/srcpkgs/libnfs/template @@ -1,16 +1,16 @@ # Template file for 'libnfs' pkgname=libnfs -version=2.0.0 +version=3.0.0 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="libtool pkg-config automake" short_desc="Client library for accessing NFS shares" maintainer="Juan RP " +license="LGPL-2.1-or-later" homepage="https://github.com/sahlberg/libnfs" -license="GPL-2" -distfiles="https://github.com/sahlberg/libnfs/archive/$pkgname-${version}.tar.gz" -checksum=7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e +distfiles="https://github.com/sahlberg/libnfs/archive/${pkgname}-${version}.tar.gz" +checksum=445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5 pre_configure() { autoreconf -fi From 3b5d36e283e3514cc46171326e5fe0b796a54803 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:57:25 -0300 Subject: [PATCH 351/759] gvfs: rebuild against libnfs.so.12 --- srcpkgs/gvfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 9287121aa00..05f6e696f1c 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.36.2 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false" hostmakedepends="docbook-xsl glib-devel intltool libxslt openssh pkg-config" From 3d466bb0ba25a3ffe5c1521b93321deb3646f6aa Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:57:25 -0300 Subject: [PATCH 352/759] mpd: rebuild against libnfs.so.12 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index da6266ce496..e30f8fcc83e 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.20.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder From 93a861127cd73c5b8c51d39ea858e03a5cee83de Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 28 Jun 2018 23:57:26 -0300 Subject: [PATCH 353/759] qemu: rebuild against libnfs.so.12 --- srcpkgs/qemu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 7e839603d8a..3012de3e487 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,14 +1,14 @@ # Template file for 'qemu' pkgname=qemu version=2.12.0 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" license="GPL-2, LGPL-2.1" distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" checksum=c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c -nocross="https://api.travis-ci.org/jobs/210268003/log.txt" +nocross=https://api.travis-ci.org/jobs/210268003/log.txt nostrip=yes hostmakedepends="pkg-config perl python automake libtool flex" From ca0224513d46899e82def4c05784357497cf9efb Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 1 Jul 2018 01:20:08 -0300 Subject: [PATCH 354/759] libnfs: fix build. add missing #include sys/time.h. --- srcpkgs/libnfs/patches/fix-musl.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/libnfs/patches/fix-musl.patch diff --git a/srcpkgs/libnfs/patches/fix-musl.patch b/srcpkgs/libnfs/patches/fix-musl.patch new file mode 100644 index 00000000000..fe6de52594c --- /dev/null +++ b/srcpkgs/libnfs/patches/fix-musl.patch @@ -0,0 +1,10 @@ +--- include/nfsc/libnfs.h ++++ include/nfsc/libnfs.h +@@ -24,6 +24,7 @@ + #define _LIBNFS_H_ + + #include ++#include + #if defined(__ANDROID__) || defined(AROS) \ + || ( defined(__APPLE__) && defined(__MACH__) ) + #include From 2c595b8d29c29974f5203dd9b317c287c1aa12c1 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 1 Jul 2018 06:29:45 +0200 Subject: [PATCH 355/759] vim: update to 8.1.0133. (#546) --- srcpkgs/vim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 9919569641a..360393ea919 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,6 @@ # Template file for 'vim' pkgname=vim -version=8.1.0026 +version=8.1.0133 revision=1 hostmakedepends="glib-devel pkg-config" makedepends="acl-devel gtk+-devel libXt-devel lua-devel ncurses-devel @@ -11,7 +11,7 @@ maintainer="Juan RP " license="Vim" homepage="https://www.vim.org" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" -checksum=a2f8b06fceb6ab5117e3bd13e0639e353ca37e38970c2944b99f8d106c4b0993 +checksum=a6dab137949097fbe0b67aafedf4c24a3b0d9c41716db35f5beb4834924d7b00 subpackages="xxd vim-common vim-x11 gvim" # XXX vim-huge cannot be cross compiled for now. From e84bc5912695a8f41f5253da587850e9ac6d9470 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sun, 1 Jul 2018 00:49:27 +0200 Subject: [PATCH 356/759] corebird: add missing dependency (dconf) --- srcpkgs/corebird/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/corebird/template b/srcpkgs/corebird/template index ebb696b5e90..e926a9eadfa 100644 --- a/srcpkgs/corebird/template +++ b/srcpkgs/corebird/template @@ -1,11 +1,12 @@ # Template build for 'corebird'. pkgname=corebird version=1.7.4 -revision=3 +revision=4 build_style=meson hostmakedepends="pkg-config vala" makedepends="gtk+3-devel libgee08-devel sqlite-devel gspell-devel libsoup-devel json-glib-devel gettext-devel gst-plugins-base1-devel" +depends="dconf" short_desc="Native Gtk+ Twitter Client" maintainer="Enno Boland " license="GPL-3.0-or-later" From fc5b1d34b42dc6d7765b5e478cecfcc3f95d9ab0 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sun, 1 Jul 2018 11:09:38 +0200 Subject: [PATCH 357/759] radeontop: update to 1.1. --- srcpkgs/radeontop/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/radeontop/template b/srcpkgs/radeontop/template index aacdc895e11..40b4fd17fdc 100644 --- a/srcpkgs/radeontop/template +++ b/srcpkgs/radeontop/template @@ -1,21 +1,22 @@ # Template file for 'radeontop' pkgname=radeontop -version=v1.0 +version=1.1 revision=1 only_for_archs="i686 i686-musl x86_64 x86_64-musl" -wrksrc="${pkgname}-${version#?}" hostmakedepends="pkg-config" makedepends="ncurses-devel libdrm-devel libxcb-devel" short_desc="View radeon GPU utilization" maintainer="Logen K " license="GPL-3" homepage="https://github.com/clbr/radeontop" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=a997ea92f38a53d59db4d8e846aec4cc04cee8b79939e89d5eb9e31c57b468fc +distfiles="https://github.com/clbr/radeontop/archive/v${version}.tar.gz" +checksum=8685ea42a44b24b92974ce5b774e14ab64281f05440ea6e6df35a6c48a3460bb do_build() { - make CC="$CC" + make CC="$CC" amdgpu=1 } + do_install() { vbin radeontop + vman radeontop.1 } From fbb7c3c199312942432471939d2390c756c3fd5a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 1 Jul 2018 11:42:44 +0200 Subject: [PATCH 358/759] protobuf: fix armv6 --- srcpkgs/protobuf/template | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index cd1087d954a..697d0c2521a 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -21,6 +21,13 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" --with-protoc=/usr/bin/protoc" fi +case "$XBPS_TARGET_MACHINE" in + armv6l*) + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" + ;; +esac + pre_configure() { autoreconf -fi } From e81fc4745ba3ae04300601ff61997b804298765d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 1 Jul 2018 12:02:51 +0200 Subject: [PATCH 359/759] protobuf-c: fix compiling with newwer g++ --- .../patches/fix-compile-error.patch | 52 +++++++++++++++++++ srcpkgs/protobuf-c/template | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/protobuf-c/patches/fix-compile-error.patch diff --git a/srcpkgs/protobuf-c/patches/fix-compile-error.patch b/srcpkgs/protobuf-c/patches/fix-compile-error.patch new file mode 100644 index 00000000000..4ef0e80dc8b --- /dev/null +++ b/srcpkgs/protobuf-c/patches/fix-compile-error.patch @@ -0,0 +1,52 @@ +--- protoc-c/c_file.h.orig 2018-07-01 11:52:24.135863225 +0200 ++++ protoc-c/c_file.h 2018-07-01 11:54:02.117755492 +0200 +@@ -67,6 +67,10 @@ + #include + #include + #include ++#include ++#include ++using namespace boost; ++using namespace std; + + namespace google { + namespace protobuf { +--- protoc-c/c_helpers.cc.orig 2018-07-01 11:52:24.137863243 +0200 ++++ protoc-c/c_helpers.cc 2018-07-01 11:54:05.424785612 +0200 +@@ -67,6 +67,10 @@ + + #include + #include ++#include ++#include ++using namespace boost; ++using namespace std; + + namespace google { + namespace protobuf { +--- protoc-c/c_message.h.orig 2018-07-01 11:52:24.138863253 +0200 ++++ protoc-c/c_message.h 2018-07-01 11:54:08.375812485 +0200 +@@ -66,6 +66,10 @@ + #include + #include + #include ++#include ++#include ++using namespace boost; ++using namespace std; + + namespace google { + namespace protobuf { +--- protoc-c/c_field.h.orig 2018-07-01 11:52:24.142863289 +0200 ++++ protoc-c/c_field.h 2018-07-01 11:54:11.010836479 +0200 +@@ -65,6 +65,10 @@ + + #include + #include ++#include ++#include ++using namespace boost; ++using namespace std; + + namespace google { + namespace protobuf { diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index d8530462f7a..ec148eb92ed 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -4,7 +4,7 @@ version=1.3.0 revision=5 build_style=gnu-configure hostmakedepends="pkg-config protobuf" -makedepends="protobuf-devel" +makedepends="protobuf-devel boost-devel" short_desc="C implementation of the Google Protocol Buffers" maintainer="Enno Boland " license="BSD-2-Clause" From f752326aa356425cab73b6bb62a5c51f34c4cced Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 1 Jul 2018 12:04:38 +0200 Subject: [PATCH 360/759] protobuf-c: revbump --- srcpkgs/protobuf-c/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index ec148eb92ed..7867b3efe2e 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,7 +1,7 @@ # Template file for 'protobuf-c' pkgname=protobuf-c version=1.3.0 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="protobuf-devel boost-devel" From 623093bf51d276d2227f931a7680fa025d94e191 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 1 Jul 2018 12:51:34 +0200 Subject: [PATCH 361/759] protobuf: import alpine patch musl provides byteswap.h (and so does android apparently). so we assume its there if we are on linux. --- srcpkgs/protobuf/patches/musl-fix.patch | 22 ++++++++++++++++++++++ srcpkgs/protobuf/template | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/protobuf/patches/musl-fix.patch diff --git a/srcpkgs/protobuf/patches/musl-fix.patch b/srcpkgs/protobuf/patches/musl-fix.patch new file mode 100644 index 00000000000..09343ed0715 --- /dev/null +++ b/srcpkgs/protobuf/patches/musl-fix.patch @@ -0,0 +1,22 @@ +seems like both musl libc and android has byteswap.h + +--- ./src/google/protobuf/stubs/port.h.orig 2018-07-01 12:46:31.204740205 +0200 ++++ ./src/google/protobuf/stubs/port.h 2018-07-01 12:46:00.245986923 +0200 +@@ -94,7 +94,7 @@ + #include + #elif defined(__APPLE__) + #include +-#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__) ++#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__) + #include // IWYU pragma: export + #endif + +@@ -380,7 +380,7 @@ inline void GOOGLE_UNALIGNED_STORE64(voi + #define bswap_32(x) OSSwapInt32(x) + #define bswap_64(x) OSSwapInt64(x) + +-#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__) ++#elif !defined(__linux__) && !defined(__BIONIC__) && !defined(__CYGWIN__) + + static inline uint16 bswap_16(uint16 x) { + return static_cast(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 697d0c2521a..e46a9f7c3d7 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,7 +1,7 @@ # Template file for 'protobuf' pkgname=protobuf version=3.6.0.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" From d2845307b50dd38ec7b2e7903c6acf1f0ea02b49 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 1 Jul 2018 15:35:47 +0200 Subject: [PATCH 362/759] nsjail: fix 32bit builds --- srcpkgs/nsjail/patches/fix-format-error.patch | 11 +++++++++++ srcpkgs/nsjail/template | 6 +----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/nsjail/patches/fix-format-error.patch diff --git a/srcpkgs/nsjail/patches/fix-format-error.patch b/srcpkgs/nsjail/patches/fix-format-error.patch new file mode 100644 index 00000000000..54365b45f9c --- /dev/null +++ b/srcpkgs/nsjail/patches/fix-format-error.patch @@ -0,0 +1,11 @@ +--- subproc.cc.orig 2018-07-01 15:34:05.381551578 +0200 ++++ subproc.cc 2018-07-01 15:34:10.523598404 +0200 +@@ -343,7 +343,7 @@ int reapProc(nsjconf_t* nsjconf) { + if ((uint64_t)diff >= nsjconf->tlimit) { + LOG_I("PID: %d run time >= time limit (%ld >= %" PRId64 + ") (%s). Killing it", +- pid, (long)diff, (long)nsjconf->tlimit, p.remote_txt.c_str()); ++ pid, (long)diff, nsjconf->tlimit, p.remote_txt.c_str()); + /* + * Probably a kernel bug - some processes cannot be killed with KILL if + * they're namespaced, and in a stopped state diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index cd0bdab0bcb..123f7e5cb20 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=2.7 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf-devel" makedepends="libnl3-devel protobuf-devel" @@ -16,10 +16,6 @@ bfebebaf501f9dbd0d0c374797d3c07ee0dd3537b5a6bc70e80408f081d051fe" only_for_archs="aarch64 aarch64-musl armv5tel armv5tel-musl armv6l armv6l-musl armv7l armv7l-musl x86_64 x86_64-musl" -case "$XBPS_TARGET_MACHINE" in - armv[67]*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/9674/steps/shell_3/logs/stdio";; -esac - post_extract() { rmdir kafel ln -s ../kafel-* kafel From 05f39acdfdc7be76b98d584569484b6b1b32e23b Mon Sep 17 00:00:00 2001 From: cr6git Date: Sun, 1 Jul 2018 18:59:49 +0200 Subject: [PATCH 363/759] electrum: update to 3.2.0, add missing dep. (#554) --- srcpkgs/electrum/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template index d15a5ab53cd..6ed8e57193e 100644 --- a/srcpkgs/electrum/template +++ b/srcpkgs/electrum/template @@ -1,15 +1,15 @@ # Template file for 'electrum' pkgname=electrum -version=3.1.3 -revision=2 +version=3.2.0 +revision=1 noarch=yes wrksrc="Electrum-${version}" build_style=python3-module pycompile_module="electrum electrum_gui electrum_plugins" hostmakedepends="python3-setuptools" depends="python3-PyQt5 python3-dnspython python3-ecdsa python3-jsonrpclib - python3-pbkdf2 python3-protobuf python3-pyaes python3-pysocks python3-qrcode - python3-requests" + python3-pbkdf2 python3-protobuf python3-pyaes python3-pycryptodome python3-pysocks + python3-qrcode python3-requests" # Missing optional dependencies: # btchip - BTChip hardware wallet support # trezor - TREZOR hardware wallet support @@ -19,7 +19,7 @@ maintainer="Charles E. Lehner " license="MIT" homepage="https://electrum.org/" distfiles="https://download.electrum.org/${version}/Electrum-${version}.tar.gz" -checksum=3e5aedb52184f2237eb81194539f27b148045e266e46aca0e42ae53f9a47a216 +checksum=244a889c397abdb4d4259ff83bfff389ddef341313f2ba265128c78adfb2a9f9 post_install() { vlicense LICENCE From 371a93c97ada9b0f8137052e84dc2f66ee4dc3a9 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 1 Jul 2018 14:07:34 -0300 Subject: [PATCH 364/759] pdd: update to 1.3. --- srcpkgs/pdd/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pdd/template b/srcpkgs/pdd/template index 279e93e0cc3..642d0082724 100644 --- a/srcpkgs/pdd/template +++ b/srcpkgs/pdd/template @@ -1,7 +1,8 @@ # Template file for 'pdd' pkgname=pdd -version=1.2 +version=1.3 revision=1 +noarch=yes build_style=gnu-makefile depends="python3-dateutil" checkdepends="python3-dateutil python3-pytest" @@ -9,6 +10,6 @@ short_desc="Tiny date, time diff calculator" maintainer="maxice8 " license="GPL-3.0-or-later" homepage="https://github.com/jarun/pdd" -#changelog="https://raw.githubusercontent.com/jarun/pdd/master/CHANGELOG" +changelog="https://raw.githubusercontent.com/jarun/pdd/master/CHANGELOG" distfiles="https://github.com/jarun/pdd/archive/v${version}.tar.gz" -checksum=89821804026815be80ad2ae84b0afcb7203e34a49f0654e78852d0394950cdbc +checksum=d1cb1cf2c10a6daf4e7b64318329964f47e38ad3fba0f94325b9eed62ff76402 From 9968c7dfa45565ecaa172ace42057212c310bfb0 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 23 Apr 2018 12:57:24 +0200 Subject: [PATCH 365/759] ffmpeg: update to 4.0.1. --- common/shlibs | 18 +++++++++--------- srcpkgs/ffmpeg/template | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index 82f5a36a156..1b613feb40c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -386,15 +386,15 @@ libid3tag.so.0 libid3tag-0.15.1b_1 libgif.so.7 giflib-5.1.0_1 libImlib2.so.1 imlib2-1.4.2_1 libmp3lame.so.0 lame-3.98.2_1 -libavdevice.so.57 libavdevice-3.1.3_1 -libavformat.so.57 libavformat-3.1.3_1 -libswscale.so.4 libswscale-3.1.3_1 -libswresample.so.2 libswresample-3.1.3_1 -libavresample.so.3 libavresample-3.1.3_1 -libpostproc.so.54 libpostproc-3.1.3_1 -libavcodec.so.57 libavcodec-3.1.3_1 -libavutil.so.55 libavutil-3.1.3_1 -libavfilter.so.6 libavfilter-3.1.3_1 +libavdevice.so.58 libavdevice-4.0_1 +libavformat.so.58 libavformat-4.0_1 +libswscale.so.5 libswscale-4.0_1 +libswresample.so.3 libswresample-4.0_1 +libavresample.so.4 libavresample-4.0_1 +libpostproc.so.55 libpostproc-4.0_1 +libavcodec.so.58 libavcodec-4.0_1 +libavutil.so.56 libavutil-4.0_1 +libavfilter.so.7 libavfilter-4.0_1 libSDL-1.2.so.0 SDL-1.2.14_1 libSDL_image-1.2.so.0 SDL_image-1.2.10_1 libx264.so.152 x264-20180119.2245_1 diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 30b4314c04b..f6337b565ad 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,13 +1,13 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=3.4.2 -revision=5 +version=4.0.1 +revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 +checksum=605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel @@ -69,7 +69,7 @@ do_configure() { do_build() { rm ${XBPS_WRAPPERDIR}/strip make ${makejobs} - make doc/ff{mpeg,play,server}.1 + make doc/ff{mpeg,play}.1 } do_install() { make DESTDIR=${DESTDIR} install install-man From c310fad26e30a122094ef05cc9de19a5f76f13d8 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 02:46:19 +0200 Subject: [PATCH 366/759] alsa-plugins: rebuild for ffmpeg-4.0.1. --- srcpkgs/alsa-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 8ec3a54d087..3031dd380d2 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,7 +1,7 @@ # Template build file for 'alsa-plugins'. pkgname=alsa-plugins version=1.1.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-maemo-plugin" hostmakedepends="pkg-config" From 0d98ed8e725d87a9019712a9219d0f073a487aff Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 09:43:58 +0200 Subject: [PATCH 367/759] libopenal: rebuild for ffmpeg-4.0.1. --- srcpkgs/libopenal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index 36d30257b73..e6ccf40578a 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -1,7 +1,7 @@ # Template file for 'libopenal' pkgname=libopenal version=1.18.2 -revision=1 +revision=2 build_style=cmake wrksrc="openal-soft-${version}" hostmakedepends="pkg-config" From 3fcb08706cd82c7eb255c5bcfaa2e2c8f414c5b4 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 18:33:20 +0200 Subject: [PATCH 368/759] mlt: rebuild for ffmpeg-4.0.1. --- srcpkgs/mlt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 01957726732..350830fa47d 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,7 +1,7 @@ # Template file for 'mlt' pkgname=mlt version=6.8.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde --swig-languages=python" From ba5c3ace7924445b09757ec811377cb1b6da993d Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 18:54:10 +0200 Subject: [PATCH 369/759] ffmpegthumbnailer: rebuild for ffmpeg-4.0.1. --- srcpkgs/ffmpegthumbnailer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template index 4f3b6e61caf..46c5ad737e8 100644 --- a/srcpkgs/ffmpegthumbnailer/template +++ b/srcpkgs/ffmpegthumbnailer/template @@ -1,7 +1,7 @@ # Template file for 'ffmpegthumbnailer' pkgname=ffmpegthumbnailer version=2.2.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config" makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel" From 31d954ccf976ec2a2967b4182b2c0081bb8a4014 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 18:59:37 +0200 Subject: [PATCH 370/759] unpaper: rebuild for ffmpeg-4.0.1. --- srcpkgs/unpaper/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unpaper/template b/srcpkgs/unpaper/template index 3a33d690369..dd0247c9101 100644 --- a/srcpkgs/unpaper/template +++ b/srcpkgs/unpaper/template @@ -1,7 +1,7 @@ # Template file for 'unpaper' pkgname=unpaper version=6.1 -revision=2 +revision=3 build_style=gnu-configure maintainer="Orphaned " hostmakedepends="pkg-config libxslt" From c84ab50b7514dd277b537227430a97ede4fc21e8 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 19:06:48 +0200 Subject: [PATCH 371/759] pipewire: rebuild for ffmpeg-4.0.1. --- srcpkgs/pipewire/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 9abfb0ceac1..d3c0c92e3cc 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire version=0.1.9 -revision=2 +revision=3 configure_args="-Denable_man=true -Denable_gstreamer=true -Denable_docs=true" build_style=meson hostmakedepends="doxygen graphviz pkg-config xmltoman" From 6c55a5ac2010d2a6d3930d202cbdc4b7c54a2602 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 19:39:49 +0200 Subject: [PATCH 372/759] mpv: rebuild for ffmpeg-4.0.1. --- srcpkgs/mpv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 246ccf53fd0..c3d733858d0 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.27.2 -revision=1 +revision=2 build_options="smb vapoursynth" short_desc="Video player based on MPlayer/mplayer2" maintainer="Juan RP " From cb31f785a49f17faa063e84ea8b46eb783a2f975 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 20:46:07 +0200 Subject: [PATCH 373/759] osg: rebuild for ffmpeg-4.0.1. --- srcpkgs/osg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 388e4a922dc..fbbc81c2dc3 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -2,7 +2,7 @@ pkgname=osg reverts=3.6.0_1 version=3.4.1 -revision=2 +revision=3 wrksrc=OpenSceneGraph-OpenSceneGraph-${version} build_style=cmake # don't use /usr/lib64 on 64bit platforms @@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev depends="xrandr" short_desc="OpenSceneGraph: high performance real-time graphics toolkit" maintainer="Jürgen Buchmüller " -license="OSGPL" +license="OSGPL-2.0-or-later" homepage="http://www.openscenegraph.org" distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz" checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 From 132f6f6fd2d0162fb99d5f3a34adf6018deb85af Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 21:10:44 +0200 Subject: [PATCH 374/759] idjc: rebuild for ffmpeg-4.0.1. --- srcpkgs/idjc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template index 1c642428682..f9ec9b7cbd9 100644 --- a/srcpkgs/idjc/template +++ b/srcpkgs/idjc/template @@ -1,7 +1,7 @@ # Template file for 'idjc' pkgname=idjc version=0.8.17 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python-devel" makedepends=" From 7379875a2aee64f18d70e235e836928453c8d3b9 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 21:22:02 +0200 Subject: [PATCH 375/759] minidlna: rebuild for ffmpeg-4.0.1. --- srcpkgs/minidlna/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template index 2b6c11a8083..db1c3e8cbfb 100644 --- a/srcpkgs/minidlna/template +++ b/srcpkgs/minidlna/template @@ -1,7 +1,7 @@ # Template file for 'minidlna' pkgname=minidlna version=1.2.1 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --sbindir=/usr/bin From fbf129ced97a6b5e1f7e883f3be1ad6ec5531ed0 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 21:55:03 +0200 Subject: [PATCH 376/759] deadbeef: rebuild for ffmpeg-4.0.1. --- srcpkgs/deadbeef/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index c829e25758e..dde00cb190a 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,7 +1,7 @@ # Template file for 'deadbeef'. pkgname=deadbeef version=0.7.2 -revision=6 +revision=7 build_style=gnu-configure build_options="gtk3" build_options_default="gtk3" From c81d5427a510a5f81dcd9380e8c1b50cd0d5dffe Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 22:02:20 +0200 Subject: [PATCH 377/759] ffms2: rebuild for ffmpeg-4.0.1. --- srcpkgs/ffms2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffms2/template b/srcpkgs/ffms2/template index ef44c763f77..52464b677c5 100644 --- a/srcpkgs/ffms2/template +++ b/srcpkgs/ffms2/template @@ -1,7 +1,7 @@ # Template file for 'ffms2' pkgname=ffms2 version=2.23.1 -revision=1 +revision=2 _version=2.23 wrksrc="${pkgname}-${_version}" build_style=gnu-configure From e34dc4eb4668aaf9e6b855f4d769c51f29dcefd1 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 22:09:34 +0200 Subject: [PATCH 378/759] ccextractor: rebuild for ffmpeg-4.0.1. --- srcpkgs/ccextractor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template index ec71ac4d4c3..d4e2f8581e6 100644 --- a/srcpkgs/ccextractor/template +++ b/srcpkgs/ccextractor/template @@ -1,7 +1,7 @@ # Template file for 'ccextractor' pkgname=ccextractor version=0.86 -revision=1 +revision=2 build_wrksrc="linux" build_style=gnu-configure configure_args="--enable-ocr --enable-hardsubx" From 2cd2504ad35b7256d2d4ed9aebb7d1769ffc1acd Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 22:18:22 +0200 Subject: [PATCH 379/759] chromaprint: rebuild for ffmpeg-4.0.1. --- srcpkgs/chromaprint/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template index 0cab52b9dcb..9976dd51520 100644 --- a/srcpkgs/chromaprint/template +++ b/srcpkgs/chromaprint/template @@ -1,7 +1,7 @@ # Template file for 'chromaprint' pkgname=chromaprint version=1.4.3 -revision=1 +revision=2 wrksrc="chromaprint-v${version}" build_style=cmake configure_args="-DBUILD_TOOLS=ON" From ac06a57356d64ba55bcb099db94e529440771130 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 22:24:59 +0200 Subject: [PATCH 380/759] hedgewars: rebuild for ffmpeg-4.0.1. --- srcpkgs/hedgewars/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template index 3f8206c54df..2c12adb2c0d 100644 --- a/srcpkgs/hedgewars/template +++ b/srcpkgs/hedgewars/template @@ -1,7 +1,7 @@ # Template file for 'hedgewars' pkgname=hedgewars version=0.9.24.1 -revision=1 +revision=2 wrksrc="${pkgname}-src-${version}" build_style=cmake configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname} From 2c6bf44edf5c214e63c2c06d957a3fd16bc4f551 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 22:32:39 +0200 Subject: [PATCH 381/759] audacious-plugins: rebuild for ffmpeg-4.0.1. --- srcpkgs/audacious-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index 26f6945be98..c09bce68f99 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,7 +1,7 @@ # Template file for 'audacious-plugins' pkgname=audacious-plugins version=3.9 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="audacious-devel alsa-lib-devel pulseaudio-devel jack-devel From b20fa21fae8f81423cfa303068c21aba14522398 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 2 May 2018 22:57:27 +0200 Subject: [PATCH 382/759] openmw: rebuild for ffmpeg-4.0.1. --- srcpkgs/openmw/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 43301582834..31bc263bfd3 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -1,7 +1,7 @@ # Template file for 'openmw' pkgname=openmw version=0.43.0 -revision=3 +revision=4 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake configure_args="-DDESIRED_QT_VERSION=5" From 88f3c6849795d762932e9b7d69286c6f1d2b15aa Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 3 May 2018 01:03:09 +0200 Subject: [PATCH 383/759] xine-lib: rebuild for ffmpeg-4.0.1. --- srcpkgs/xine-lib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index 61950f6b1f5..84b27a474a0 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,7 +1,7 @@ # Template file for 'xine-lib' pkgname=xine-lib version=1.2.9 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss --disable-optimizations" From ea662567b2d323aa4066af83670d0f281a7ac647 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 3 May 2018 16:33:02 +0200 Subject: [PATCH 384/759] bs1770gain: add patch for ffmpeg-4.0.1. --- srcpkgs/bs1770gain/patches/ffmpeg4.patch | 33 ++++++++++++++++++++++++ srcpkgs/bs1770gain/template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bs1770gain/patches/ffmpeg4.patch diff --git a/srcpkgs/bs1770gain/patches/ffmpeg4.patch b/srcpkgs/bs1770gain/patches/ffmpeg4.patch new file mode 100644 index 00000000000..89deff65f2f --- /dev/null +++ b/srcpkgs/bs1770gain/patches/ffmpeg4.patch @@ -0,0 +1,33 @@ +--- libffsox-2/ffsox_frame.c.orig 2018-05-03 16:26:40.651562783 +0200 ++++ libffsox-2/ffsox_frame.c 2018-05-03 16:27:43.450930824 +0200 +@@ -48,7 +48,7 @@ + goto frame; + } + +- if (NULL!=codec&&(codec->capabilities&CODEC_CAP_VARIABLE_FRAME_SIZE)) ++ if (NULL!=codec&&(codec->capabilities&AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) + nb_samples=10000; + else + nb_samples=cc->frame_size; +--- libffsox-2/ffsox_frame_writer.c.orig 2018-05-03 16:27:03.067335575 +0200 ++++ libffsox-2/ffsox_frame_writer.c 2018-05-03 16:28:05.418712077 +0200 +@@ -66,7 +66,7 @@ + goto open; + + if (fw->so.fc->oformat->flags&AVFMT_GLOBALHEADER) +- fw->so.cc->flags|=CODEC_FLAG_GLOBAL_HEADER; ++ fw->so.cc->flags|=AV_CODEC_FLAG_GLOBAL_HEADER; + + fw->so.st->time_base=fw->so.cc->time_base; + //fw->so.st->time_base=fr->si.st->time_base; +--- libffsox-2/ffsox_packet_writer.c.orig 2018-05-03 16:27:24.836116183 +0200 ++++ libffsox-2/ffsox_packet_writer.c 2018-05-03 16:28:19.530571557 +0200 +@@ -65,7 +65,7 @@ + pw->so.cc->codec_tag=0; + + if (pw->so.fc->oformat->flags&AVFMT_GLOBALHEADER) +- pw->so.cc->flags|=CODEC_FLAG_GLOBAL_HEADER; ++ pw->so.cc->flags|=AV_CODEC_FLAG_GLOBAL_HEADER; + + if (ffsox_sink_append(so,&pw->si,&pw->so)<0) { + DMESSAGE("appending output stream"); diff --git a/srcpkgs/bs1770gain/template b/srcpkgs/bs1770gain/template index 88456603276..92ed366691d 100644 --- a/srcpkgs/bs1770gain/template +++ b/srcpkgs/bs1770gain/template @@ -1,7 +1,7 @@ # Template file for 'bs1770gain' pkgname=bs1770gain version=0.4.12 -revision=1 +revision=2 build_style=gnu-configure makedepends="ffmpeg-devel sox-devel" short_desc="A loudness scanner compliant with ITU-R BS.1770" From f44ca7cdad1c9e2a44292243e7b5b9e6c5b90182 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 3 May 2018 17:07:56 +0200 Subject: [PATCH 385/759] handbrake: update to 1.1.1. --- srcpkgs/handbrake/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index f049c89b13e..ff0c7ff1d7b 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -2,8 +2,8 @@ only_for_archs="i686 i686-musl x86_64 x86_64-musl" pkgname=handbrake -version=1.0.7 -revision=6 +version=1.1.1 +revision=1 wrksrc="HandBrake-${version}" build_options="fdk_aac" hostmakedepends="automake libtool cmake pkg-config intltool @@ -17,10 +17,10 @@ makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel depends="gst-plugins-good1 desktop-file-utils hicolor-icon-theme" short_desc="Multithreaded video transcoder" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-only" homepage="https://handbrake.fr/" -distfiles="https://download.handbrake.fr/releases/1.0.7/HandBrake-${version}.tar.bz2" -checksum=ffdee112f0288f0146b965107956cd718408406b75db71c44d2188f5296e677f +distfiles="https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2" +checksum=e3390c5fd901fb06d72e29c62a63d373d5fb5b3467295d114d815ae7b78a9d7a CFLAGS="-msse" From f52fd14c07dab5d9b8bb953f51cbfdc2b08a11b7 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 3 May 2018 21:47:03 +0200 Subject: [PATCH 386/759] pianobar: rebuild for ffmpeg-4.0.1. --- srcpkgs/pianobar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index c0d1ad5d3d4..7613cc0a32d 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,7 +1,7 @@ # Template file for 'pianobar' pkgname=pianobar version=2018.06.22 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="V=1" hostmakedepends="pkg-config" From 7ee17e0b0ab9ef462a2dfbdd54bf12176c3b30a9 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 3 May 2018 21:57:34 +0200 Subject: [PATCH 387/759] motion: add patch for ffmpeg-4.0.1. --- srcpkgs/motion/patches/ffmpeg4.patch | 21 +++++++++++++++++++++ srcpkgs/motion/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/motion/patches/ffmpeg4.patch diff --git a/srcpkgs/motion/patches/ffmpeg4.patch b/srcpkgs/motion/patches/ffmpeg4.patch new file mode 100644 index 00000000000..c78ea117a48 --- /dev/null +++ b/srcpkgs/motion/patches/ffmpeg4.patch @@ -0,0 +1,21 @@ +--- ffmpeg.c 2017-12-10 02:05:49.000000000 +0100 ++++ ffmpeg.c 2018-05-03 21:53:50.044464387 +0200 +@@ -538,7 +538,7 @@ + /* The selection of 8000 in the else is a subjective number based upon viewing output files */ + if (ffmpeg->vbr > 0){ + ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1; +- ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE; ++ ffmpeg->ctx_codec->flags |= AV_CODEC_FLAG_QSCALE; + ffmpeg->ctx_codec->global_quality=ffmpeg->vbr; + } + } +@@ -663,7 +663,7 @@ + ffmpeg->ctx_codec->strict_std_compliance = -2; + ffmpeg->ctx_codec->level = 3; + } +- ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ ffmpeg->ctx_codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + retcd = ffmpeg_set_quality(ffmpeg); + if (retcd < 0){ + diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template index 15bf39a4d26..9d84afa38fe 100644 --- a/srcpkgs/motion/template +++ b/srcpkgs/motion/template @@ -1,7 +1,7 @@ # Template file for 'motion' pkgname=motion version=4.1.1 -revision=1 +revision=2 wrksrc="motion-release-${version}" build_style=gnu-configure hostmakedepends="automake pkg-config" From 72d6e20c0e40c6f72718ade7e9df06707d679ef9 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 3 May 2018 22:12:12 +0200 Subject: [PATCH 388/759] freshplayerplugin: add patch for ffmpeg-4.0.1. --- srcpkgs/freshplayerplugin/patches/ffmpeg4.patch | 16 ++++++++++++++++ srcpkgs/freshplayerplugin/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/freshplayerplugin/patches/ffmpeg4.patch diff --git a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch new file mode 100644 index 00000000000..5c4c99cee6a --- /dev/null +++ b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch @@ -0,0 +1,16 @@ +--- src/ppb_video_decoder.c.orig 2018-05-03 22:08:33.026677145 +0200 ++++ src/ppb_video_decoder.c 2018-05-03 22:09:26.176206079 +0200 +@@ -542,9 +542,9 @@ + goto err; + } + +- if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) { +- trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__); +- vd->avctx->flags |= CODEC_FLAG_TRUNCATED; ++ if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) { ++ trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__); ++ vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED; + } + + vd->avctx->opaque = vd; + diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index d78f62b0bca..4a4b7f92c29 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -1,7 +1,7 @@ # Template file for 'freshplayerplugin' pkgname=freshplayerplugin version=0.3.7 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config ragel" makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel From 20e3cb67f514bc96f5996cfd9e7f518c5479de99 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 17:30:29 +0200 Subject: [PATCH 389/759] qt5: add patch for ffmpeg-4.0.1. --- srcpkgs/qt5/patches/qtwebengine-ffmpeg4.patch | 86 +++++++++++++++++++ srcpkgs/qt5/template | 2 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qt5/patches/qtwebengine-ffmpeg4.patch diff --git a/srcpkgs/qt5/patches/qtwebengine-ffmpeg4.patch b/srcpkgs/qt5/patches/qtwebengine-ffmpeg4.patch new file mode 100644 index 00000000000..868b7bdb1af --- /dev/null +++ b/srcpkgs/qt5/patches/qtwebengine-ffmpeg4.patch @@ -0,0 +1,86 @@ +source: https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtwebengine-ffmpeg4.patch?h=packages/qt5-webengine&id=421103a8798335f7788498e56b5eef3f33ecba26 + +--- qtwebengine/src/3rdparty/chromium/media/base/decoder_buffer.h ++++ qtwebengine/src/3rdparty/chromium/media/base/decoder_buffer.h +@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer + : public base::RefCountedThreadSafe { + public: + enum { +- kPaddingSize = 32, ++ kPaddingSize = 64, + #if defined(ARCH_CPU_ARM_FAMILY) + kAlignmentSize = 16 + #else + +--- qtwebengine/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc ++++ qtwebengine/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc +@@ -30,10 +30,10 @@ EncryptionScheme GetEncryptionScheme(const AVStream* stream) { + + } // namespace + +-// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are ++// Why AV_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are + // padded. Check here to ensure FFmpeg only receives data padded to its + // specifications. +-static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE, ++static_assert(DecoderBuffer::kPaddingSize >= AV_INPUT_BUFFER_PADDING_SIZE, + "DecoderBuffer padding size does not fit ffmpeg requirement"); + + // Alignment requirement by FFmpeg for input and output buffers. This need to +@@ -444,11 +444,11 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, + } else { + codec_context->extradata_size = config.extra_data().size(); + codec_context->extradata = reinterpret_cast( +- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE)); ++ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE)); + memcpy(codec_context->extradata, &config.extra_data()[0], + config.extra_data().size()); + memset(codec_context->extradata + config.extra_data().size(), '\0', +- FF_INPUT_BUFFER_PADDING_SIZE); ++ AV_INPUT_BUFFER_PADDING_SIZE); + } + } + +@@ -585,11 +585,11 @@ void VideoDecoderConfigToAVCodecContext( + } else { + codec_context->extradata_size = config.extra_data().size(); + codec_context->extradata = reinterpret_cast( +- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE)); ++ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE)); + memcpy(codec_context->extradata, &config.extra_data()[0], + config.extra_data().size()); + memset(codec_context->extradata + config.extra_data().size(), '\0', +- FF_INPUT_BUFFER_PADDING_SIZE); ++ AV_INPUT_BUFFER_PADDING_SIZE); + } + } + +--- qtwebengine/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc ++++ qtwebengine/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc +@@ -368,7 +368,7 @@ void FFmpegAudioDecoder::ResetTimestampState(const AudioDecoderConfig& config) { + int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + AVFrame* frame, + int flags) { +- DCHECK(s->codec->capabilities & CODEC_CAP_DR1); ++ DCHECK(s->codec->capabilities & AV_CODEC_CAP_DR1); + DCHECK_EQ(s->codec_type, AVMEDIA_TYPE_AUDIO); + + // Since this routine is called by FFmpeg when a buffer is required for audio + +--- qtwebengine/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc ++++ qtwebengine/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc +@@ -427,12 +427,11 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config, + codec_context_->thread_type = + FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME); + codec_context_->opaque = this; +- codec_context_->flags |= CODEC_FLAG_EMU_EDGE; + codec_context_->get_buffer2 = GetVideoBufferImpl; + codec_context_->refcounted_frames = 1; + + if (decode_nalus_) +- codec_context_->flags2 |= CODEC_FLAG2_CHUNKS; ++ codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS; + + AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id); + if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) { + diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index b58eddc260a..4d5959a63eb 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.10.1 -revision=8 +revision=9 wrksrc="qt-everywhere-src-${version}" build_style=gnu-configure hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja" From d5606e6c08130a7f997c983e67e53e217593c9c1 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 20:29:21 +0200 Subject: [PATCH 390/759] kfilemetadata5: rebuild for ffmpeg-4.0.1. --- srcpkgs/kfilemetadata5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index ce7880a95b4..e287ac9594d 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,7 +1,7 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 version=5.43.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" wrksrc="${pkgname%5}-${version}" @@ -11,7 +11,7 @@ short_desc="Simple library for extracting the text and metadata" maintainer="Denis Revin " license="LGPL-2" homepage="https://projects.kde.org/projects/frameworks/kfilemetadata5" -distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" +distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz" checksum=d866f80e8c8799d0640b9c76085b05b418162d0ed060fffaf2da38651d92abd3 if [ -n "$CROSS_BUILD" ]; then From 3d4c734332ef18c1f183d2e0bf85c74e3e2647e1 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 20:39:02 +0200 Subject: [PATCH 391/759] k3b: rebuild for ffmpeg-4.0.1. --- srcpkgs/k3b/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index a356bd350a8..c540a100466 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,7 +1,7 @@ # Template file for 'k3b' pkgname=k3b version=18.04.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake" makedepends="kcmutils-devel kfilemetadata5-devel knewstuff-devel From 5b9d4803f6995d153b76ac27aa465a3ec12fc1b5 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 21:12:25 +0200 Subject: [PATCH 392/759] ffmpegthumbs: rebuild for ffmpeg-4.0.1. --- srcpkgs/ffmpegthumbs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template index ce1f66863d7..0a057f854e0 100644 --- a/srcpkgs/ffmpegthumbs/template +++ b/srcpkgs/ffmpegthumbs/template @@ -1,7 +1,7 @@ # Template file for 'ffmpegthumbs' pkgname=ffmpegthumbs version=17.12.2 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules pkg-config" @@ -10,7 +10,7 @@ short_desc="FFmpeg-based thumbnail creator for video files" maintainer="Michael Straube " license="GPL-2" homepage="https://download.kde.org/stable/applications" -distfiles="https://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz" +distfiles="${KDE_SITE}/applications/${version}/src/${pkgname}-${version}.tar.xz" checksum=c2d54af7adc83432c9415526b2ac032d2400280fefc6d5634c7862b9a1301c25 if [ -n "$CROSS_BUILD" ]; then From 48b9e6d758b0fed1a68e639288b69ac842078e30 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 21:25:34 +0200 Subject: [PATCH 393/759] kid3: rebuild for ffmpeg-4.0.1. --- srcpkgs/kid3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template index 71622b21eb5..8c56d933f2a 100644 --- a/srcpkgs/kid3/template +++ b/srcpkgs/kid3/template @@ -1,7 +1,7 @@ # Template file for 'kid3' pkgname=kid3 version=3.6.0 -revision=1 +revision=2 build_style=cmake build_options="KDE mp3 mp4 flac vorbis taglib chromaprint" build_options_default="mp3 mp4 flac vorbis taglib chromaprint" From 0dfae106b2653f7552c32fc41ab6596117a05d21 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 21:58:24 +0200 Subject: [PATCH 394/759] qtox: rebuild for ffmpeg-4.0.1. removed libopencv-devel from makedepends, not used --- srcpkgs/qtox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index 17c567ac0f6..eb93df23a2e 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,12 +1,12 @@ # Template file for 'qtox' pkgname=qtox version=1.15.0 -revision=1 +revision=2 wrksrc="qTox-${version}" build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake qt5-tools" makedepends="ffmpeg-devel filter_audio-devel gtk+-devel libXScrnSaver-devel - libexif-devel libopenal-devel libopencv-devel libsodium-devel libvpx-devel + libexif-devel libopenal-devel libsodium-devel libvpx-devel opus-devel qrencode-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-svg-devel qt5-tools-devel sqlcipher-devel toxcore-devel" From 331902ebfc7ff082f6e44dc7f2644e0f5a14e093 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 22:36:19 +0200 Subject: [PATCH 395/759] telegram-desktop: rebuild for ffmpeg-4.0.1. --- srcpkgs/telegram-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index ba5a501591d..5c5adae1327 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=1.3.7 -revision=1 +revision=2 _libtgvoip_commit=6ba1241cfef6c3ddf4e50e82f67afde0abc02285 _GSL_commit=9d65e74400976b3509833f49b16d401600c7317d _variant_commit=550ac2f159ca883d360c196149b466955c77a573 From 18986a6755ff3648f6ee3d8bb2dbd59f7badb69f Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 22:44:30 +0200 Subject: [PATCH 396/759] qmmp: rebuild for ffmpeg-4.0.1. --- srcpkgs/qmmp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template index a18a67034bb..66a8ebf93c7 100644 --- a/srcpkgs/qmmp/template +++ b/srcpkgs/qmmp/template @@ -1,7 +1,7 @@ # Template file for 'qmmp' pkgname=qmmp version=1.2.2 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" From 7ab5b3a1e5056cea26410ac00935a010ebf97456 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Mon, 7 May 2018 23:40:59 +0200 Subject: [PATCH 397/759] pqiv: rebuild for ffmpeg-4.0.1. --- srcpkgs/pqiv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pqiv/template b/srcpkgs/pqiv/template index f054a1907ff..0965ca81310 100644 --- a/srcpkgs/pqiv/template +++ b/srcpkgs/pqiv/template @@ -1,7 +1,7 @@ # Template file for 'pqiv' pkgname=pqiv version=2.10.4 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="ffmpeg-devel glib-devel gtk+3-devel gvfs-devel libarchive-devel From ef38878c2663e0f0b9874d7e2cd5cd42eee71f9a Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Tue, 8 May 2018 21:43:09 +0200 Subject: [PATCH 398/759] arcan: add patch for ffmpeg-4.0.1. --- srcpkgs/arcan/patches/ffmpeg4.patch | 62 +++++++++++++++++++++++++++++ srcpkgs/arcan/template | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/arcan/patches/ffmpeg4.patch diff --git a/srcpkgs/arcan/patches/ffmpeg4.patch b/srcpkgs/arcan/patches/ffmpeg4.patch new file mode 100644 index 00000000000..27b94424f92 --- /dev/null +++ b/srcpkgs/arcan/patches/ffmpeg4.patch @@ -0,0 +1,62 @@ +--- src/frameserver/encode/default/encode.c 2018-04-15 11:19:51.000000000 +0200 ++++ src/frameserver/encode/default/encode.c 2018-04-15 11:19:51.000000000 +0200 +@@ -285,8 +285,8 @@ + /* + * for the flush case, we may have a little bit of buffers left, both in the + * encoder and the resampler, +- * CODEC_CAP_DELAY = pframe can be NULL and encode audio is used to flush +- * CODEC_CAP_SMALL_LAST_FRAME or CODEC_CAP_VARIABLE_FRAME_SIZE = ++ * AV_CODEC_CAP_DELAY = pframe can be NULL and encode audio is used to flush ++ * AV_CODEC_CAP_SMALL_LAST_FRAME or AV_CODEC_CAP_VARIABLE_FRAME_SIZE = + * we can the last few buffer bytes can be stored as well otherwise those + * will be discarded + */ +@@ -298,8 +298,8 @@ + * and then re-use the encode / conversion code + */ + if (!forcetog && +- ((ctx->flags & CODEC_CAP_SMALL_LAST_FRAME) > 0 || +- (ctx->flags & CODEC_CAP_VARIABLE_FRAME_SIZE) > 0)){ ++ ((ctx->flags & AV_CODEC_CAP_SMALL_LAST_FRAME) > 0 || ++ (ctx->flags & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) > 0)){ + recctx.aframe_insz = recctx.encabuf_ofs; + recctx.aframe_smplcnt = recctx.aframe_insz >> 2; + frame = av_frame_alloc(); +@@ -309,7 +309,7 @@ + goto forceencode; + } + +- if ( (ctx->flags & CODEC_CAP_DELAY) > 0 ){ ++ if ( (ctx->flags & AV_CODEC_CAP_DELAY) > 0 ){ + int gotpkt; + do { + AVPacket flushpkt = {0}; +@@ -638,7 +638,7 @@ + * for float conversion, we need to double afterwards + */ + +- if ( (recctx.acodec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) > 0){ ++ if ( (recctx.acodec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) > 0){ + recctx.aframe_smplcnt = recctx.acontext->frame_size ? + recctx.acontext->frame_size : round( samplerate / fps ); + } +--- src/frameserver/encode/default/encode_presets.c 2018-04-15 11:19:51.000000000 +0200 ++++ src/frameserver/encode/default/encode_presets.c 2018-04-15 11:19:51.000000000 +0200 +@@ -379,7 +379,7 @@ + + a.storage.video.context = avcodec_alloc_context3( a.storage.video.codec ); + if (flags & AVFMT_GLOBALHEADER) +- a.storage.video.context->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ a.storage.video.context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return a; + } +@@ -397,7 +397,7 @@ + + res.storage.audio.context = avcodec_alloc_context3( res.storage.audio.codec); + if ( (flags & AVFMT_GLOBALHEADER) > 0){ +- res.storage.audio.context->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ res.storage.audio.context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + return res; diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index d8b7394b62f..323b61d8575 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,7 +1,7 @@ # Template file for 'arcan' pkgname=arcan version=0.5.4.6 -revision=2 +revision=3 build_style=cmake build_wrksrc=src short_desc="Combined display server, multimedia framework and game engine" From c7d3f493c6cd53c7217b1e0565eafebfa0a1e198 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Tue, 8 May 2018 22:06:19 +0200 Subject: [PATCH 399/759] cantata: rebuild for ffmpeg-4.0.1. --- srcpkgs/cantata/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index 4b80427ae05..b69799d6940 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,7 +1,7 @@ # Template file for 'cantata' pkgname=cantata version=2.3.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel From 09b36fd721177b4dd3c0f1ef1bf0dedab1b8be09 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Tue, 8 May 2018 22:51:04 +0200 Subject: [PATCH 400/759] attract: add patch for ffmpeg-4.0.1. --- srcpkgs/attract/patches/ffmpeg4.patch | 26 ++++++++++++++++++++++++++ srcpkgs/attract/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/attract/patches/ffmpeg4.patch diff --git a/srcpkgs/attract/patches/ffmpeg4.patch b/srcpkgs/attract/patches/ffmpeg4.patch new file mode 100644 index 00000000000..ebb5eb3ec01 --- /dev/null +++ b/srcpkgs/attract/patches/ffmpeg4.patch @@ -0,0 +1,26 @@ +--- src/media.cpp 2017-11-19 00:08:04.000000000 +0100 ++++ src/media.cpp 2018-05-08 22:32:36.387186528 +0200 +@@ -970,11 +970,11 @@ + + size_t avio_ctx_buffer_size = 4096; + uint8_t *avio_ctx_buffer = (uint8_t *)av_malloc( avio_ctx_buffer_size +- + FF_INPUT_BUFFER_PADDING_SIZE ); ++ + AV_INPUT_BUFFER_PADDING_SIZE ); + + memset( avio_ctx_buffer + avio_ctx_buffer_size, + 0, +- FF_INPUT_BUFFER_PADDING_SIZE ); ++ AV_INPUT_BUFFER_PADDING_SIZE ); + + m_imp->m_io_ctx = avio_alloc_context( avio_ctx_buffer, + avio_ctx_buffer_size, 0, z, &fe_zip_read, +@@ -1030,7 +1030,7 @@ + // + m_audio->buffer = (sf::Int16 *)av_malloc( + MAX_AUDIO_FRAME_SIZE +- + FF_INPUT_BUFFER_PADDING_SIZE ++ + AV_INPUT_BUFFER_PADDING_SIZE + + codec_ctx->sample_rate ); + + sf::SoundStream::initialize( + diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template index 4e303bda652..1279f6b1def 100644 --- a/srcpkgs/attract/template +++ b/srcpkgs/attract/template @@ -1,7 +1,7 @@ # Template file for 'attract' pkgname=attract version=2.3.0 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="pkg-config" make_build_args="VERBOSE=1" From 4a1720f83460253c32d43c5db2e97f5605fded39 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 14:23:04 +0200 Subject: [PATCH 401/759] retroarch: rebuild for ffmpeg-4.0.1. --- srcpkgs/retroarch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 6cf70d754b5..0ad23fb3543 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,7 +1,7 @@ # Template file for 'retroarch' pkgname=retroarch version=1.7.3 -revision=1 +revision=2 wrksrc="RetroArch-$version" conf_files="/etc/retroarch.cfg" build_style=configure From fdc21ed4d1995575c592f78ef7b8f50d4738f86b Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 14:44:16 +0200 Subject: [PATCH 402/759] ppsspp: rebuild for ffmpeg-4.0.1. --- srcpkgs/ppsspp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index d247f9fb102..d1870765171 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,7 +1,7 @@ # Template file for 'ppsspp' pkgname=ppsspp version=1.6.3 -revision=1 +revision=2 build_wrksrc="ppsspp-${version}" build_style=cmake configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON" From 8b182f0e76be82a8169e63208fb39e83f6b593ec Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 15:09:33 +0200 Subject: [PATCH 403/759] ssr: rebuild for ffmpeg-4.0.1. --- srcpkgs/ssr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ssr/template b/srcpkgs/ssr/template index 12dc8033b7b..13f160f66a1 100644 --- a/srcpkgs/ssr/template +++ b/srcpkgs/ssr/template @@ -1,7 +1,7 @@ # Template file for 'ssr' pkgname=ssr version=0.3.11 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_QT5=ON" hostmakedepends="pkg-config" From db732e8a3863dcba93aa71cde70c899c9c439bdf Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 16:47:37 +0200 Subject: [PATCH 404/759] vba-m: add patch for ffmpeg-4.0.1. --- srcpkgs/vba-m/patches/ffmpeg4.patch | 55 +++++++++++++++++++++++++++++ srcpkgs/vba-m/template | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/vba-m/patches/ffmpeg4.patch diff --git a/srcpkgs/vba-m/patches/ffmpeg4.patch b/srcpkgs/vba-m/patches/ffmpeg4.patch new file mode 100644 index 00000000000..5f5cdc3ee6f --- /dev/null +++ b/srcpkgs/vba-m/patches/ffmpeg4.patch @@ -0,0 +1,55 @@ +source: https://github.com/visualboyadvance-m/visualboyadvance-m/commit/f3f6ee7b1c9f95cc1e8df368652034b9da84c130 + +--- src/common/ffmpeg.cpp.orig 2016-12-14 22:52:45.000000000 +0100 ++++ src/common/ffmpeg.cpp 2018-05-09 16:41:18.048068182 +0200 +@@ -84,11 +84,22 @@ + // I have no idea what size to make these buffers + // I don't see any ffmpeg functions to guess the size, either + +-// use frame size, or FF_MIN_BUFFER_SIZE (that seems to be what it wants) ++#ifdef AV_INPUT_BUFFER_MIN_SIZE ++ ++ // use frame size, or AV_INPUT_BUFFER_MIN_SIZE (that seems to be what it wants) ++#define AUDIO_BUF_LEN (frame_len > AV_INPUT_BUFFER_MIN_SIZE ? frame_len : AV_INPUT_BUFFER_MIN_SIZE) ++ // use maximum frame size * 32 bpp * 2 for good measure ++#define VIDEO_BUF_LEN (AV_INPUT_BUFFER_MIN_SIZE + 256 * 244 * 4 * 2) ++ ++#else ++ ++ // use frame size, or FF_MIN_BUFFER_SIZE (that seems to be what it wants) + #define AUDIO_BUF_LEN (frame_len > FF_MIN_BUFFER_SIZE ? frame_len : FF_MIN_BUFFER_SIZE) +-// use maximum frame size * 32 bpp * 2 for good measure ++ // use maximum frame size * 32 bpp * 2 for good measure + #define VIDEO_BUF_LEN (FF_MIN_BUFFER_SIZE + 256 * 244 * 4 * 2) + ++#endif ++ + bool MediaRecorder::did_init = false; + + MediaRecorder::MediaRecorder() : oc(0), vid_st(0), aud_st(0), video_buf(0), +@@ -435,6 +446,7 @@ + } + av_init_packet(&pkt); + pkt.stream_index = vid_st->index; ++#ifdef AVFMT_RAWPICTURE + if(oc->oformat->flags & AVFMT_RAWPICTURE) { + // this won't work due to border + // not sure what formats set this, anyway +@@ -442,6 +454,7 @@ + pkt.data = f->data[0]; + pkt.size = linesize * ctx->height; + } else { ++#endif + #if LIBAVCODEC_VERSION_MAJOR > 56 + pkt.data = video_buf; + pkt.size = VIDEO_BUF_LEN; +@@ -468,7 +481,9 @@ + if(ctx->coded_frame->key_frame) + pkt.flags |= AV_PKT_FLAG_KEY; + pkt.data = video_buf; ++#ifdef AVFMT_RAWPICTURE + } ++#endif + if(av_interleaved_write_frame(oc, &pkt) < 0) { + avformat_free_context(oc); + oc = NULL; diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template index 4f843eb0c88..e60e3471de3 100644 --- a/srcpkgs/vba-m/template +++ b/srcpkgs/vba-m/template @@ -2,7 +2,7 @@ pkgname=vba-m reverts=1292_2 version=2.0.2 -revision=2 +revision=3 _subversion=Beta-3 wrksrc="visualboyadvance-m-${_subversion}" build_style=cmake From cd96f0eba31c672bae9785302154a104d454214c Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 21:21:53 +0200 Subject: [PATCH 405/759] qtav: add upstream patch for ffmpeg-4.0.1. --- srcpkgs/qtav/patches/ffmpeg4.patch | 157 +++++++++++++++++++++++++++++ srcpkgs/qtav/template | 3 +- 2 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qtav/patches/ffmpeg4.patch diff --git a/srcpkgs/qtav/patches/ffmpeg4.patch b/srcpkgs/qtav/patches/ffmpeg4.patch new file mode 100644 index 00000000000..bc9ec59db4e --- /dev/null +++ b/srcpkgs/qtav/patches/ffmpeg4.patch @@ -0,0 +1,157 @@ +From 7f6929b49c25ca475a08f87e8b52aa1642d109dd Mon Sep 17 00:00:00 2001 +From: Felix Matouschek +Date: Sat, 11 Nov 2017 10:13:06 +0100 +Subject: [PATCH] Make QtAV build with newer versions of FFmpeg + +Some defines changed their name in newer versions of FFmpeg, this +patch uses preprocessor instructions in AVCompat.h to use the +correct define names. Also filter names retrieved by +'avfilter_get_by_name' should be used as const variables in +libavfilter versions starting at 7.0.0. +--- + src/AVMuxer.cpp | 2 +- + src/QtAV/private/AVCompat.h | 12 ++++++++++++ + src/codec/audio/AudioEncoderFFmpeg.cpp | 4 ++-- + src/codec/video/VideoEncoderFFmpeg.cpp | 2 +- + src/filter/LibAVFilter.cpp | 8 +++++++- + src/subtitle/SubtitleProcessorFFmpeg.cpp | 2 +- + 6 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/src/AVMuxer.cpp b/src/AVMuxer.cpp +index 2f0b40d05..d2eb3dde8 100644 +--- a/src/AVMuxer.cpp ++++ b/src/AVMuxer.cpp +@@ -124,7 +124,7 @@ AVStream *AVMuxer::Private::addStream(AVFormatContext* ctx, const QString &codec + c->time_base = s->time_base; + /* Some formats want stream headers to be separate. */ + if (ctx->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + // expose avctx to encoder and set properties in encoder? + // list codecs for a given format in ui + return s; +diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h +index e387868a8..6c38596d1 100644 +--- a/src/QtAV/private/AVCompat.h ++++ b/src/QtAV/private/AVCompat.h +@@ -456,3 +456,15 @@ const char *get_codec_long_name(AVCodecID id); + } } while(0) + + #endif //QTAV_COMPAT_H ++ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,33,0) ++#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER ++#endif ++ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100) ++#define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE ++#endif ++ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100) ++#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE ++#endif +diff --git a/src/codec/audio/AudioEncoderFFmpeg.cpp b/src/codec/audio/AudioEncoderFFmpeg.cpp +index a74f4f31d..3811e11a6 100644 +--- a/src/codec/audio/AudioEncoderFFmpeg.cpp ++++ b/src/codec/audio/AudioEncoderFFmpeg.cpp +@@ -151,8 +151,8 @@ bool AudioEncoderFFmpegPrivate::open() + } else { + buffer_size = frame_size*format_used.bytesPerSample()*format_used.channels()*2+200; + } +- if (buffer_size < FF_MIN_BUFFER_SIZE) +- buffer_size = FF_MIN_BUFFER_SIZE; ++ if (buffer_size < AV_INPUT_BUFFER_MIN_SIZE) ++ buffer_size = AV_INPUT_BUFFER_MIN_SIZE; + buffer.resize(buffer_size); + return true; + } +diff --git a/src/codec/video/VideoEncoderFFmpeg.cpp b/src/codec/video/VideoEncoderFFmpeg.cpp +index 7c5ed42d0..671efa7d3 100644 +--- a/src/codec/video/VideoEncoderFFmpeg.cpp ++++ b/src/codec/video/VideoEncoderFFmpeg.cpp +@@ -245,7 +245,7 @@ bool VideoEncoderFFmpegPrivate::open() + applyOptionsForContext(); + AV_ENSURE_OK(avcodec_open2(avctx, codec, &dict), false); + // from mpv ao_lavc +- const int buffer_size = qMax(qMax(width*height*6+200, FF_MIN_BUFFER_SIZE), sizeof(AVPicture));//?? ++ const int buffer_size = qMax(qMax(width*height*6+200, AV_INPUT_BUFFER_MIN_SIZE), sizeof(AVPicture));//?? + buffer.resize(buffer_size); + return true; + } +diff --git a/src/filter/LibAVFilter.cpp b/src/filter/LibAVFilter.cpp +index 191512040..8993a91f7 100644 +--- a/src/filter/LibAVFilter.cpp ++++ b/src/filter/LibAVFilter.cpp +@@ -120,7 +120,10 @@ class LibAVFilter::Private + // pixel_aspect==sar, pixel_aspect is more compatible + QString buffersrc_args = args; + qDebug("buffersrc_args=%s", buffersrc_args.toUtf8().constData()); +- AVFilter *buffersrc = avfilter_get_by_name(video ? "buffer" : "abuffer"); ++#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0) ++ const ++#endif ++ AVFilter *buffersrc = avfilter_get_by_name(video ? "buffer" : "abuffer"); + Q_ASSERT(buffersrc); + AV_ENSURE_OK(avfilter_graph_create_filter(&in_filter_ctx, + buffersrc, +@@ -128,6 +131,9 @@ class LibAVFilter::Private + filter_graph) + , false); + /* buffer video sink: to terminate the filter chain. */ ++#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0) ++ const ++#endif + AVFilter *buffersink = avfilter_get_by_name(video ? "buffersink" : "abuffersink"); + Q_ASSERT(buffersink); + AV_ENSURE_OK(avfilter_graph_create_filter(&out_filter_ctx, buffersink, "out", +diff --git a/src/subtitle/SubtitleProcessorFFmpeg.cpp b/src/subtitle/SubtitleProcessorFFmpeg.cpp +index 30ee9367c..1755c3816 100644 +--- a/src/subtitle/SubtitleProcessorFFmpeg.cpp ++++ b/src/subtitle/SubtitleProcessorFFmpeg.cpp +@@ -249,7 +249,7 @@ bool SubtitleProcessorFFmpeg::processHeader(const QByteArray &codec, const QByte + codec_ctx->time_base.den = 1000; + if (!data.isEmpty()) { + av_free(codec_ctx->extradata); +- codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + FF_INPUT_BUFFER_PADDING_SIZE); ++ codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + AV_INPUT_BUFFER_PADDING_SIZE); + if (!codec_ctx->extradata) + return false; + codec_ctx->extradata_size = data.size(); + +From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001 +From: 0xFelix +Date: Tue, 12 Dec 2017 13:24:34 +0100 +Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header + +avfiltergraph.h was replaced by avfilter.h in libavfilter version +3.8.0+ so only include it when the used libavfilter version +is older than 3.8.0 +--- + src/QtAV/private/AVCompat.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h +index 6c38596d1..944cfd7de 100644 +--- a/src/QtAV/private/AVCompat.h ++++ b/src/QtAV/private/AVCompat.h +@@ -59,6 +59,7 @@ extern "C" + #include + #include + #include ++#include + + #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101) + #include +@@ -79,8 +80,11 @@ extern "C" + #endif //QTAV_HAVE(AVRESAMPLE) + + #if QTAV_HAVE(AVFILTER) ++#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0) + #include /*code is here for old version*/ ++#else + #include ++#endif + #include + #include + #endif //QTAV_HAVE(AVFILTER) + diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template index fcbf0f05958..4a31f515cb7 100644 --- a/srcpkgs/qtav/template +++ b/srcpkgs/qtav/template @@ -1,9 +1,10 @@ # Template file for 'qtav' pkgname=qtav version=1.12.0 -revision=1 +revision=2 wrksrc="QtAV-${version}" build_style=qmake +patch_args="-Np1" makedepends="ffmpeg-devel libass-devel libopenal-devel libva-glx-devel libXv-devel pulseaudio-devel qt5-declarative-devel qt5-svg-devel From f1f6a57950a4906a0b219731d7468f2afc4f2a20 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 22:03:16 +0200 Subject: [PATCH 406/759] cmus: patch for ffmpeg-4.0.1. --- .../patches/{ffmpeg3.diff => ffmpeg4.patch} | 41 +++++++++---------- srcpkgs/cmus/template | 2 +- 2 files changed, 20 insertions(+), 23 deletions(-) rename srcpkgs/cmus/patches/{ffmpeg3.diff => ffmpeg4.patch} (80%) diff --git a/srcpkgs/cmus/patches/ffmpeg3.diff b/srcpkgs/cmus/patches/ffmpeg4.patch similarity index 80% rename from srcpkgs/cmus/patches/ffmpeg3.diff rename to srcpkgs/cmus/patches/ffmpeg4.patch index 1c8b08c4c33..1d7d21f0c4b 100644 --- a/srcpkgs/cmus/patches/ffmpeg3.diff +++ b/srcpkgs/cmus/patches/ffmpeg4.patch @@ -1,18 +1,5 @@ -https://trac.macports.org/ticket/51212 - ---- configure.orig 2015-07-13 03:00:56.000000000 -0700 -+++ configure 2016-04-22 15:22:53.000000000 -0700 -@@ -387,7 +387,7 @@ - fi - # ffmpeg api changes so frequently that it is best to compile the module - libs="$LDDLFLAGS $FFMPEG_LIBS" -- cflags="$SOFLAGS $FFMPEG_CFLAGS" -+ cflags="-std=gnu99 $SOFLAGS $FFMPEG_CFLAGS" - if test "$HAVE_FFMPEG_AVCODEC_H" = y - then - cflags="$cflags -DHAVE_FFMPEG_AVCODEC_H" ---- ffmpeg.c.orig 2015-07-13 03:00:56.000000000 -0700 -+++ ffmpeg.c 2016-04-22 15:22:53.000000000 -0700 +--- ffmpeg.c.orig 2018-05-09 21:56:02.949627655 +0200 ++++ ffmpeg.c 2018-05-09 21:58:59.749022102 +0200 @@ -39,7 +39,11 @@ #include #include @@ -37,7 +24,7 @@ https://trac.macports.org/ticket/51212 free(input); } -@@ -235,7 +243,11 @@ +@@ -235,20 +243,33 @@ codec = avcodec_find_decoder(cc->codec_id); if (!codec) { @@ -49,7 +36,17 @@ https://trac.macports.org/ticket/51212 err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; break; } -@@ -248,7 +260,11 @@ + ++#if LIBAVCODEC_VERSION_MAJOR >= 58 ++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ cc->flags |= AV_CODEC_FLAG_TRUNCATED; ++#else + if (codec->capabilities & CODEC_CAP_TRUNCATED) + cc->flags |= CODEC_FLAG_TRUNCATED; ++#endif + + #if (LIBAVCODEC_VERSION_INT < ((53<<16)+(8<<8)+0)) + if (avcodec_open(cc, codec) < 0) { #else if (avcodec_open2(cc, codec, NULL) < 0) { #endif @@ -61,7 +58,7 @@ https://trac.macports.org/ticket/51212 err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; break; } -@@ -347,7 +363,11 @@ +@@ -347,7 +368,11 @@ struct ffmpeg_output *output, SwrContext *swr) { #if (LIBAVCODEC_VERSION_INT >= ((53<<16) + (25<<8) + 0)) @@ -73,7 +70,7 @@ https://trac.macports.org/ticket/51212 int got_frame; #endif while (1) { -@@ -359,10 +379,16 @@ +@@ -359,10 +384,16 @@ int len; if (input->curr_pkt_size <= 0) { @@ -91,7 +88,7 @@ https://trac.macports.org/ticket/51212 avcodec_free_frame(&frame); #endif return 0; -@@ -399,7 +425,11 @@ +@@ -399,7 +430,11 @@ av_new_packet(&avpkt, input->curr_pkt_size); memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size); len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt); @@ -103,7 +100,7 @@ https://trac.macports.org/ticket/51212 } #endif if (len < 0) { -@@ -426,7 +456,11 @@ +@@ -426,7 +461,11 @@ res = 0; output->buffer_pos = output->buffer; output->buffer_used_len = res * cc->channels * sizeof(int16_t); @@ -115,7 +112,7 @@ https://trac.macports.org/ticket/51212 return output->buffer_used_len; } #endif -@@ -566,7 +600,11 @@ +@@ -566,7 +605,11 @@ long bitrate = -1; #if (LIBAVFORMAT_VERSION_INT > ((51<<16)+(43<<8)+0)) /* ape codec returns silly numbers */ diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 2fc99535d21..84e3e677e66 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,7 +1,7 @@ # Template file for 'cmus' pkgname=cmus version=2.7.1 -revision=4 +revision=5 hostmakedepends="pkg-config" makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel libmodplug-devel libmp4v2-devel libmpcdec-devel pulseaudio-devel From 47a5e3afa495ced334a38693bc05ab82afd2e466 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 23:22:04 +0200 Subject: [PATCH 407/759] goldendict: add patch for ffmpeg-4.0.1. --- srcpkgs/goldendict/patches/ffmpeg4.patch | 21 +++++++++++++++++++++ srcpkgs/goldendict/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/goldendict/patches/ffmpeg4.patch diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch new file mode 100644 index 00000000000..5b102c7b654 --- /dev/null +++ b/srcpkgs/goldendict/patches/ffmpeg4.patch @@ -0,0 +1,21 @@ +--- ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200 ++++ ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200 +@@ -143,7 +143,7 @@ + return false; + } + +- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE ); ++ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE ); + if ( !avioBuffer ) + { + errorString = QObject::tr( "av_malloc() failed." ); +@@ -380,7 +380,7 @@ + } + + if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) && +- codecContext_->codec->capabilities & CODEC_CAP_DELAY ) ++ codecContext_->codec->capabilities & AV_CODEC_CAP_DELAY ) + { + av_init_packet( &packet ); + int gotFrame = 0; + diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template index 16859524270..30ab69a80ca 100644 --- a/srcpkgs/goldendict/template +++ b/srcpkgs/goldendict/template @@ -1,7 +1,7 @@ # Template file for 'goldendict' pkgname=goldendict version=1.5.0RC2 -revision=2 +revision=3 wrksrc="${pkgname}-${version/RC/-RC}" build_style=qmake hostmakedepends="qt5-qmake pkg-config qt5-tools" From 16e3858740e58d514dd8bc64f2ffe05a873f237e Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 9 May 2018 23:23:38 +0200 Subject: [PATCH 408/759] libextractor: add patch for ffmpeg-4.0.1. --- srcpkgs/libextractor/patches/ffmpeg4.patch | 21 +++++++++++++++++++++ srcpkgs/libextractor/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libextractor/patches/ffmpeg4.patch diff --git a/srcpkgs/libextractor/patches/ffmpeg4.patch b/srcpkgs/libextractor/patches/ffmpeg4.patch new file mode 100644 index 00000000000..4100eb81884 --- /dev/null +++ b/srcpkgs/libextractor/patches/ffmpeg4.patch @@ -0,0 +1,21 @@ +--- src/plugins/thumbnailffmpeg_extractor.c.orig 2018-05-09 23:14:02.721105141 +0200 ++++ src/plugins/thumbnailffmpeg_extractor.c 2018-05-09 23:14:48.491629162 +0200 +@@ -107,7 +107,7 @@ + /** + * Number of bytes to feed to libav in one go, with padding (padding is zeroed). + */ +-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) ++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE) + + /** + * Global handle to MAGIC data. +@@ -355,7 +355,7 @@ + encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA; + encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA; + #endif +- encoder_codec_ctx->flags = CODEC_FLAG_QSCALE; ++ encoder_codec_ctx->flags = AV_CODEC_FLAG_QSCALE; + encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA; + + dst_frame->pts = 1; + diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template index a08c6a55df4..2e0fa49bdfb 100644 --- a/srcpkgs/libextractor/template +++ b/srcpkgs/libextractor/template @@ -1,7 +1,7 @@ # Template file for 'libextractor' pkgname=libextractor version=1.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" From 29bdbce390a4ac122f07605d5846a20e58b43d11 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 10 May 2018 10:25:26 +0200 Subject: [PATCH 409/759] openimageio: rebuild for ffmpeg-4.0.1. --- srcpkgs/openimageio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index b859de4ebc0..d90a804352c 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio version=1.8.12 -revision=2 +revision=3 wrksrc=oiio-Release-${version} build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 From cdbacd223a6b003148939953d8500c8e16a670c4 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 10 May 2018 10:48:32 +0200 Subject: [PATCH 410/759] blender: add patch for ffmpeg-4.0.1. --- srcpkgs/blender/patches/ffmpeg4.patch | 116 ++++++++++++++++++++++++++ srcpkgs/blender/template | 2 +- 2 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/blender/patches/ffmpeg4.patch diff --git a/srcpkgs/blender/patches/ffmpeg4.patch b/srcpkgs/blender/patches/ffmpeg4.patch new file mode 100644 index 00000000000..6b29e58f273 --- /dev/null +++ b/srcpkgs/blender/patches/ffmpeg4.patch @@ -0,0 +1,116 @@ +source: https://git.archlinux.org/svntogit/community.git/plain/trunk/ffmpeg4.0.patch?h=packages/blender + +diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +index e9eea195208..84aea330313 100644 +--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp ++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr buffer) : + m_membuffer(buffer), + m_membufferpos(0) + { +- m_membuf = reinterpret_cast(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)); ++ m_membuf = reinterpret_cast(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)); + +- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this, ++ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this, + read_packet, NULL, seek_packet); + + if(!m_aviocontext) +diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +index 3f95ac7a4da..2c2f0916406 100644 +--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp ++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, + try + { + if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER) +- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id); + if(!codec) +@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, + if(avcodec_open2(m_codecCtx, codec, NULL)) + AUD_THROW(AUD_ERROR_FFMPEG, codec_error); + +- m_output_buffer.resize(FF_MIN_BUFFER_SIZE); ++ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE); + int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs)); + + if(m_codecCtx->frame_size <= 1) { +- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; ++ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; + m_input_buffer.resize(m_input_size * samplesize); + } + else +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index d7fcd896e11..9e82df17dce 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -619,8 +619,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; +- + codec = avcodec_find_encoder(c->codec_id); + if (!codec) + return NULL; +@@ -682,14 +680,14 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + ) + { + PRINT("Using global header\n"); +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + /* Determine whether we are encoding interlaced material or not */ + if (rd->mode & R_FIELDS) { + PRINT("Encoding interlaced video\n"); +- c->flags |= CODEC_FLAG_INTERLACED_DCT; +- c->flags |= CODEC_FLAG_INTERLACED_ME; ++ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT; ++ c->flags |= AV_CODEC_FLAG_INTERLACED_ME; + } + + /* xasp & yasp got float lately... */ +@@ -779,7 +777,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int + } + + if (of->oformat->flags & AVFMT_GLOBALHEADER) { +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + set_ffmpeg_properties(rd, c, "audio", &opts); +@@ -798,14 +796,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int + st->codec->time_base.den = st->codec->sample_rate; + + #ifndef FFMPEG_HAVE_ENCODE_AUDIO2 +- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE; ++ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE; + #endif + + if (c->frame_size == 0) + // used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD)) + // not sure if that is needed anymore, so let's try out if there are any + // complaints regarding some ffmpeg versions users might have +- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels; ++ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels; + else { + context->audio_input_samples = c->frame_size; + #ifndef FFMPEG_HAVE_ENCODE_AUDIO2 +diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c +index eaf4dfd84b4..9c2f42feb52 100644 +--- a/source/blender/imbuf/intern/indexer.c ++++ b/source/blender/imbuf/intern/indexer.c +@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( + av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0); + + if (rv->of->flags & AVFMT_GLOBALHEADER) { +- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) { + diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 998f354fe07..9347d13f585 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.79b -revision=2 +revision=3 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel From deecdae7607b6d39a0a4a49781606c4db0b9ebfc Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Thu, 10 May 2018 18:38:57 +0200 Subject: [PATCH 411/759] guvcview: add patch for ffmpeg-4.0.1. --- srcpkgs/guvcview/patches/ffmpeg4.patch | 222 +++++++++++++++++++++++++ srcpkgs/guvcview/template | 2 +- 2 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/guvcview/patches/ffmpeg4.patch diff --git a/srcpkgs/guvcview/patches/ffmpeg4.patch b/srcpkgs/guvcview/patches/ffmpeg4.patch new file mode 100644 index 00000000000..0923d9b3b76 --- /dev/null +++ b/srcpkgs/guvcview/patches/ffmpeg4.patch @@ -0,0 +1,222 @@ +source: https://git.archlinux.org/svntogit/community.git/plain/guvcview/repos/community-testing-x86_64/ffmpeg4.patch + +Index: guvcview-src-2.0.5/guvcview/gui_gtk3_callbacks.c +=================================================================== +--- guvcview/gui_gtk3_callbacks.c ++++ guvcview/gui_gtk3_callbacks.c +@@ -2158,9 +2158,9 @@ + gtk_grid_attach (GTK_GRID(table), lbl_me_method, 0, line, 1 ,1); + gtk_widget_show (lbl_me_method); + +- GtkWidget *me_method = gtk_spin_button_new_with_range(1,10,1); ++ GtkWidget *me_method = gtk_entry_new(); + gtk_editable_set_editable(GTK_EDITABLE(me_method),TRUE); +- gtk_spin_button_set_value (GTK_SPIN_BUTTON(me_method), defaults->me_method); ++ gtk_entry_set_text(me_method, defaults->me_method); + + gtk_grid_attach (GTK_GRID(table), me_method, 1, line, 1 ,1); + gtk_widget_show (me_method); +@@ -2246,7 +2246,7 @@ + defaults->qblur = (float) gtk_spin_button_get_value (GTK_SPIN_BUTTON(qblur)); + defaults->subq = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(subq)); + defaults->framerefs = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(framerefs)); +- defaults->me_method = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(me_method)); ++ defaults->me_method = gtk_entry_get_text (me_method); + defaults->mb_decision = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(mb_decision)); + defaults->max_b_frames = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(max_b_frames)); + defaults->num_threads = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(num_threads));Index: guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp +=================================================================== +--- guvcview/gui_qt5_callbacks.cpp ++++ guvcview/gui_qt5_callbacks.cpp +@@ -1590,10 +1590,8 @@ void MainWindow::video_codec_properties( + framerefs->setValue(defaults->framerefs); + form.addRow(_("framerefs: "), framerefs); + /*me method*/ +- QSpinBox *me_method = new QSpinBox(&dialog); +- me_method->setRange(1, 10); +- me_method->setSingleStep(1); +- me_method->setValue(defaults->me_method); ++ QLabel *me_method = new QLabel(&dialog); ++ me_method->setText(defaults->me_method); + form.addRow(_("me method: "), me_method); + /*mb decision*/ + QSpinBox *mb_decision = new QSpinBox(&dialog); +@@ -1645,7 +1643,7 @@ void MainWindow::video_codec_properties( + defaults->qblur = qblur->value(); + defaults->subq = subq->value(); + defaults->framerefs = framerefs->value(); +- defaults->me_method = me_method->value(); ++ defaults->me_method = me_method->text().toLatin1().data(); + defaults->mb_decision = mb_decision->value(); + defaults->max_b_frames = max_b_frames->value(); + defaults->num_threads = num_threads->value(); +Index: guvcview-src-2.0.5/gview_encoder/encoder.c +=================================================================== +--- gview_encoder/encoder.c ++++ gview_encoder/encoder.c +@@ -445,10 +445,8 @@ static encoder_video_context_t *encoder_ + #if !LIBAVCODEC_VER_AT_LEAST(56,60) + video_codec_data->codec_context->me_method = video_defaults->me_method; + #else +- if( video_defaults->codec_id == AV_CODEC_ID_H264 && video_defaults->me_method > 4) +- video_defaults->me_method = X264_ME_HEX; +- +- av_dict_set_int(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0); ++ if(video_defaults->me_method) ++ av_dict_set(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0); + #endif + + #if !LIBAVCODEC_VER_AT_LEAST(57,00) +Index: guvcview-src-2.0.5/gview_encoder/gviewencoder.h +=================================================================== +--- gview_encoder/gviewencoder.h ++++ gview_encoder/gviewencoder.h +@@ -104,7 +104,7 @@ typedef struct _video_codec_t + char codec_name[20]; //lavc codec_name + int mb_decision; //lavc mb_decision + int trellis; //lavc trellis quantization +- int me_method; //lavc motion estimation method ++ const char* me_method; //lavc motion estimation method + int mpeg_quant; //lavc mpeg quantization + int max_b_frames; //lavc max b frames + int num_threads; //lavc num threads +Index: guvcview-src-2.0.5/gview_encoder/video_codecs.c +=================================================================== +--- gview_encoder/video_codecs.c ++++ gview_encoder/video_codecs.c +@@ -97,7 +97,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "none", + .mb_decision = 0, + .trellis = 0, +- .me_method = 0, ++ .me_method = NULL, + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 0, +@@ -133,7 +133,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "mjpeg", + .mb_decision = 0, + .trellis = 0, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 0, +@@ -169,7 +169,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "mpeg1video", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 1, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 1, +@@ -205,11 +205,11 @@ static video_codec_t listSupCodecs[] = + .codec_name = "flv", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 1, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 1, +- .flags = CODEC_FLAG_4MV ++ .flags = AV_CODEC_FLAG_4MV + }, + { + .valid = 1, +@@ -241,7 +241,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "wmv1", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 1, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 1, +@@ -277,7 +277,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "mpeg2video", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 1, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 1, +@@ -313,7 +313,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "msmpeg4v3", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 1, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 0, + .max_b_frames = 0, + .num_threads = 1, +@@ -349,7 +349,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "mpeg4", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 1, +- .me_method = ME_EPZS, ++ .me_method = "epsz", + .mpeg_quant = 1, + .max_b_frames = 0, + .num_threads = 1, +@@ -385,7 +385,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "libx264", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 0, +- .me_method = X264_ME_HEX, ++ .me_method = "hex", + .mpeg_quant = 1, + .max_b_frames = 16, + .num_threads = 4, +@@ -426,7 +426,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "libx265", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 0, +- .me_method = ME_HEX, ++ .me_method = "hex", + .mpeg_quant = 1, + .max_b_frames = 16, + .num_threads = 4, +@@ -463,7 +463,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "libvpx_vp8", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 0, +- .me_method = ME_HEX, ++ .me_method = "hex", + .mpeg_quant = 1, + .max_b_frames = 0, + .num_threads = 4, +@@ -500,7 +500,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "libvpx_vp9", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 0, +- .me_method = ME_HEX, ++ .me_method = "hex", + .mpeg_quant = 1, + .max_b_frames = 16, + .num_threads = 4, +@@ -537,7 +537,7 @@ static video_codec_t listSupCodecs[] = + .codec_name = "libtheora", + .mb_decision = FF_MB_DECISION_RD, + .trellis = 0, +- .me_method = ME_HEX, ++ .me_method = "hex", + .mpeg_quant = 1, + .max_b_frames = 0, + .num_threads = 4, +Index: guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c +=================================================================== +--- gview_v4l2core/uvc_h264.c ++++ gview_v4l2core/uvc_h264.c +@@ -1039,7 +1039,7 @@ int h264_init_decoder(int width, int hei + exit(-1); + } + +- h264_ctx->context->flags2 |= CODEC_FLAG2_FAST; ++ h264_ctx->context->flags2 |= AV_CODEC_FLAG2_FAST; + h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P; + h264_ctx->context->width = width; + h264_ctx->context->height = height; + diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template index da6a1a94852..e9adeea2181 100644 --- a/srcpkgs/guvcview/template +++ b/srcpkgs/guvcview/template @@ -1,7 +1,7 @@ # Template file for 'guvcview' pkgname=guvcview version=2.0.5 -revision=2 +revision=3 wrksrc="${pkgname}-src-${version}" build_style=gnu-configure configure_args="--disable-static --disable-debian-menu" From b204ac6caa5266c340ea1e8671a161930c7c1305 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Fri, 11 May 2018 08:36:43 +0200 Subject: [PATCH 412/759] gst-libav: add patch for ffmpeg-4.0.1. --- srcpkgs/gst-libav/patches/ffmpeg4.patch | 661 ++++++++++++++++++++++++ srcpkgs/gst-libav/template | 3 +- 2 files changed, 663 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gst-libav/patches/ffmpeg4.patch diff --git a/srcpkgs/gst-libav/patches/ffmpeg4.patch b/srcpkgs/gst-libav/patches/ffmpeg4.patch new file mode 100644 index 00000000000..6cf496baa74 --- /dev/null +++ b/srcpkgs/gst-libav/patches/ffmpeg4.patch @@ -0,0 +1,661 @@ +source: https://gitlab.collabora.com/nicolas/gst-ffmpeg/commit/b529e05a6ad5a8226d2fcbdcc2cde1be09e5ecba + +From b529e05a6ad5a8226d2fcbdcc2cde1be09e5ecba Mon Sep 17 00:00:00 2001 +From: Nicolas Dufresne +Date: Fri, 27 Apr 2018 16:06:28 -0400 +Subject: [PATCH] WIP: Port to FFMPEG 4.X + +--- + ext/libav/gstav.c | 4 ++-- + ext/libav/gstavauddec.c | 20 ++++++++++---------- + ext/libav/gstavaudenc.c | 7 +++---- + ext/libav/gstavcfg.c | 59 ++++++++++++++++++++++++++++++++++++++--------------------- + ext/libav/gstavcodecmap.c | 29 +++++++++++++++-------------- + ext/libav/gstavcodecmap.h | 2 +- + ext/libav/gstavscale.c | 4 ++-- + ext/libav/gstavviddec.c | 33 +++++++++++++++------------------ + ext/libav/gstavvidenc.c | 40 ++++++++++++++++++++++------------------ + 9 files changed, 108 insertions(+), 90 deletions(-) + +diff --git a/ext/libav/gstav.c b/ext/libav/gstav.c +index 0b9da42..10d8423 100644 +--- a/ext/libav/gstav.c ++++ b/ext/libav/gstav.c +@@ -30,7 +30,7 @@ + + #include + #include +-#include ++//#include + + #include "gstav.h" + #include "gstavutils.h" +@@ -158,7 +158,7 @@ plugin_init (GstPlugin * plugin) + gst_ffmpeg_init_pix_fmt_info (); + + av_register_all (); +- avfilter_register_all (); ++ //avfilter_register_all (); + + gst_ffmpegaudenc_register (plugin); + gst_ffmpegvidenc_register (plugin); +diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c +index 9aa45e3..fd25efd 100644 +--- a/ext/libav/gstavauddec.c ++++ b/ext/libav/gstavauddec.c +@@ -283,7 +283,7 @@ gst_ffmpegauddec_propose_allocation (GstAudioDecoder * decoder, + gst_allocation_params_init (¶ms); + params.flags = GST_MEMORY_FLAG_ZERO_PADDED; + params.align = 15; +- params.padding = FF_INPUT_BUFFER_PADDING_SIZE; ++ params.padding = AV_INPUT_BUFFER_PADDING_SIZE; + /* we would like to have some padding so that we don't have to + * memcpy. We don't suggest an allocator. */ + gst_query_add_allocation_param (query, NULL, ¶ms); +@@ -665,7 +665,7 @@ gst_ffmpegauddec_drain (GstFFMpegAudDec * ffmpegdec) + + oclass = (GstFFMpegAudDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); + +- if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) { ++ if (oclass->in_plugin->capabilities & AV_CODEC_CAP_DELAY) { + gint have_data, len; + + GST_LOG_OBJECT (ffmpegdec, +@@ -744,10 +744,10 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf) + bsize = map.size; + + if (bsize > 0 && (!GST_MEMORY_IS_ZERO_PADDED (map.memory) +- || (map.maxsize - map.size) < FF_INPUT_BUFFER_PADDING_SIZE)) { ++ || (map.maxsize - map.size) < AV_INPUT_BUFFER_PADDING_SIZE)) { + /* add padding */ +- if (ffmpegdec->padded_size < bsize + FF_INPUT_BUFFER_PADDING_SIZE) { +- ffmpegdec->padded_size = bsize + FF_INPUT_BUFFER_PADDING_SIZE; ++ if (ffmpegdec->padded_size < bsize + AV_INPUT_BUFFER_PADDING_SIZE) { ++ ffmpegdec->padded_size = bsize + AV_INPUT_BUFFER_PADDING_SIZE; + ffmpegdec->padded = g_realloc (ffmpegdec->padded, ffmpegdec->padded_size); + GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d", + ffmpegdec->padded_size); +@@ -755,7 +755,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf) + GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec, + "Copy input to add padding"); + memcpy (ffmpegdec->padded, bdata, bsize); +- memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memset (ffmpegdec->padded + bsize, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + bdata = ffmpegdec->padded; + do_padding = TRUE; +@@ -764,7 +764,7 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf) + } + + do { +- guint8 tmp_padding[FF_INPUT_BUFFER_PADDING_SIZE]; ++ guint8 tmp_padding[AV_INPUT_BUFFER_PADDING_SIZE]; + + data = bdata; + size = bsize; +@@ -773,15 +773,15 @@ gst_ffmpegauddec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf) + /* add temporary padding */ + GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec, + "Add temporary input padding"); +- memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE); +- memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memcpy (tmp_padding, data + size, AV_INPUT_BUFFER_PADDING_SIZE); ++ memset (data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + } + + /* decode a frame of audio now */ + len = gst_ffmpegauddec_frame (ffmpegdec, data, size, &have_data, &ret); + + if (do_padding) { +- memcpy (data + size, tmp_padding, FF_INPUT_BUFFER_PADDING_SIZE); ++ memcpy (data + size, tmp_padding, AV_INPUT_BUFFER_PADDING_SIZE); + } + + if (ret != GST_FLOW_OK) { +diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c +index 6ffbc3e..2a82273 100644 +--- a/ext/libav/gstavaudenc.c ++++ b/ext/libav/gstavaudenc.c +@@ -283,7 +283,6 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + } + + /* some other defaults */ +- ffmpegaudenc->context->rc_strategy = 2; + ffmpegaudenc->context->b_frame_strategy = 0; + ffmpegaudenc->context->coder_type = 0; + ffmpegaudenc->context->context_model = 0; +@@ -330,7 +329,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + oclass->in_plugin) < 0) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + +- if ((oclass->in_plugin->capabilities & CODEC_CAP_EXPERIMENTAL) && ++ if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && + ffmpegaudenc->compliance != GST_FFMPEG_EXPERIMENTAL) { + GST_ELEMENT_ERROR (ffmpegaudenc, LIBRARY, SETTINGS, + ("Codec is experimental, but settings don't allow encoders to " +@@ -602,7 +601,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc, + pkt->size, 0, pkt->size, pkt, gst_ffmpegaudenc_free_avpacket); + + codec = ffmpegaudenc->context->codec; +- if ((codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) || !buffer) { ++ if ((codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) || !buffer) { + /* FIXME: Not really correct, as -1 means "all the samples we got + given so far", which may not be true depending on the codec, + but we have no way to know AFAICT */ +@@ -626,7 +625,7 @@ gst_ffmpegaudenc_drain (GstFFMpegAudEnc * ffmpegaudenc) + + oclass = (GstFFMpegAudEncClass *) (G_OBJECT_GET_CLASS (ffmpegaudenc)); + +- if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) { ++ if (oclass->in_plugin->capabilities & AV_CODEC_CAP_DELAY) { + gint have_data, try = 0; + + GST_LOG_OBJECT (ffmpegaudenc, +diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c +index a1863fd..408e08e 100644 +--- a/ext/libav/gstavcfg.c ++++ b/ext/libav/gstavcfg.c +@@ -42,9 +42,9 @@ gst_ffmpeg_pass_get_type (void) + if (!ffmpeg_pass_type) { + static const GEnumValue ffmpeg_passes[] = { + {0, "Constant Bitrate Encoding", "cbr"}, +- {CODEC_FLAG_QSCALE, "Constant Quantizer", "quant"}, +- {CODEC_FLAG_PASS1, "VBR Encoding - Pass 1", "pass1"}, +- {CODEC_FLAG_PASS2, "VBR Encoding - Pass 2", "pass2"}, ++ {AV_CODEC_FLAG_QSCALE, "Constant Quantizer", "quant"}, ++ {AV_CODEC_FLAG_PASS1, "VBR Encoding - Pass 1", "pass1"}, ++ {AV_CODEC_FLAG_PASS2, "VBR Encoding - Pass 2", "pass2"}, + {0, NULL, NULL}, + }; + +@@ -66,7 +66,7 @@ gst_ffmpeg_lim_pass_get_type (void) + if (!ffmpeg_lim_pass_type) { + static const GEnumValue ffmpeg_lim_passes[] = { + {0, "Constant Bitrate Encoding", "cbr"}, +- {CODEC_FLAG_QSCALE, "Constant Quantizer", "quant"}, ++ {AV_CODEC_FLAG_QSCALE, "Constant Quantizer", "quant"}, + {0, NULL, NULL}, + }; + +@@ -121,9 +121,9 @@ gst_ffmpeg_mb_cmp_get_type (void) + {FF_CMP_VSSE, "VSSE", "vsse"}, + #if 0 + /* economize a bit for now */ +- {FF_CMP_NSSE, "NSSE", "nsse"}, +- {FF_CMP_W53, "W53", "w53"}, +- {FF_CMP_W97, "W97", "w97"}, ++ {AV_CMP_NSSE, "NSSE", "nsse"}, ++ {AV_CMP_W53, "W53", "w53"}, ++ {AV_CMP_W97, "W97", "w97"}, + #endif + {0, NULL, NULL}, + }; +@@ -260,21 +260,22 @@ gst_ffmpeg_flags_get_type (void) + /* FIXME: This needs some serious resyncing with avcodec.h */ + if (!ffmpeg_flags_type) { + static const GFlagsValue ffmpeg_flags[] = { +- {CODEC_FLAG_QSCALE, "Use fixed qscale", "qscale"}, +- {CODEC_FLAG_4MV, "Allow 4 MV per MB", "4mv"}, +- {CODEC_FLAG_QPEL, "Quartel Pel Motion Compensation", "qpel"}, +- {CODEC_FLAG_GMC, "GMC", "gmc"}, +- {CODEC_FLAG_MV0, "Always try a MB with MV (0,0)", "mv0"}, +- {CODEC_FLAG_LOOP_FILTER, "Loop filter", "loop-filter"}, +- {CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"}, +- {CODEC_FLAG_NORMALIZE_AQP, +- "Normalize Adaptive Quantization (masking, etc)", "aqp"}, +- {CODEC_FLAG_GLOBAL_HEADER, ++ {AV_CODEC_FLAG_QSCALE, "Use fixed qscale", "qscale"}, ++ {AV_CODEC_FLAG_4MV, "Allow 4 MV per MB", "4mv"}, ++ {AV_CODEC_FLAG_QPEL, "Quartel Pel Motion Compensation", "qpel"}, ++ //{AV_CODEC_FLAG_GMC, "GMC", "gmc"}, ++ //{AV_CODEC_FLAG_MV0, "Always try a MB with MV (0,0)", "mv0"}, ++ {AV_CODEC_FLAG_LOOP_FILTER, "Loop filter", "loop-filter"}, ++ {AV_CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"}, ++ //{AV_CODEC_FLAG_NORMALIZE_AQP, ++ // "Normalize Adaptive Quantization (masking, etc)", "aqp"}, ++ {AV_CODEC_FLAG_GLOBAL_HEADER, + "Global headers in extradata instead of every keyframe", + "global-headers"}, +- {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", ++ {AV_CODEC_FLAG_AC_PRED, ++ "H263 Advanced Intra Coding / MPEG4 AC prediction", + "aic"}, +- {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, ++ {AV_CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, + {0, NULL, NULL}, + }; + +@@ -487,31 +488,39 @@ gst_ffmpeg_cfg_init (void) + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.qblur, FALSE, mpeg, NULL); + ++#if 0 + pspec = g_param_spec_float ("rc-qsquish", "Ratecontrol Limiting Method", + "0 means limit by clipping, otherwise use nice continuous function", + 0, 99.0f, 1.0f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_qsquish, FALSE, mpeg, NULL); ++#endif + ++#if 0 + pspec = g_param_spec_float ("rc-qmod-amp", "Ratecontrol Mod", + "Ratecontrol Mod", 0, 99.0f, 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_qmod_amp, FALSE, mpeg, NULL); ++#endif + ++#if 0 + pspec = g_param_spec_int ("rc-qmod-freq", "Ratecontrol Freq", + "Ratecontrol Freq", 0, 0, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_qmod_freq, FALSE, mpeg, NULL); ++#endif + + pspec = g_param_spec_int ("rc-buffer-size", "Ratecontrol Buffer Size", + "Decoder bitstream buffer size", 0, G_MAXINT, 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_buffer_size, FALSE, mpeg, NULL); + ++#if 0 + pspec = + g_param_spec_float ("rc-buffer-aggressivity", + "Ratecontrol Buffer Aggressivity", "Ratecontrol Buffer Aggressivity", 0, + 99.0f, 1.0f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg, + NULL); ++#endif + + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (57, 3, 0) + pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate", +@@ -529,17 +538,21 @@ gst_ffmpeg_cfg_init (void) + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL); + ++#if 0 + pspec = + g_param_spec_float ("rc-initial-cplx", + "Initial Complexity for Pass 1 Ratecontrol", + "Initial Complexity for Pass 1 Ratecontrol", 0, 9999999.0f, 0, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_initial_cplx, FALSE, mpeg, NULL); ++#endif + ++#if 0 + pspec = g_param_spec_string ("rc-eq", "Ratecontrol Equation", + "Ratecontrol Equation", "tex^qComp", + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.rc_eq, FALSE, mpeg, NULL); ++#endif + + pspec = g_param_spec_float ("b-quant-factor", "B-Quantizer Factor", + "Factor in B-Frame Quantizer Computation", +@@ -630,19 +643,23 @@ gst_ffmpeg_cfg_init (void) + 0, 16000, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.me_range, FALSE, mpeg, NULL); + ++#if 0 + pspec = g_param_spec_int ("intra-quant-bias", + "Intra Quantizer Bias", + "Intra Quantizer Bias", +- -1000000, 1000000, FF_DEFAULT_QUANT_BIAS, ++ -1000000, 1000000, AV_DEFAULT_QUANT_BIAS, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.intra_quant_bias, FALSE, mpeg, NULL); ++#endif + ++#if 0 + pspec = g_param_spec_int ("inter-quant-bias", + "Inter Quantizer Bias", + "Inter Quantizer Bias", +- -1000000, 1000000, FF_DEFAULT_QUANT_BIAS, ++ -1000000, 1000000, AV_DEFAULT_QUANT_BIAS, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, config.inter_quant_bias, FALSE, mpeg, NULL); ++#endif + + pspec = g_param_spec_int ("noise-reduction", + "Noise Reduction", +diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c +index 9a72033..6b66bb9 100644 +--- a/ext/libav/gstavcodecmap.c ++++ b/ext/libav/gstavcodecmap.c +@@ -825,10 +825,10 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id, + if (encode && context) { + + gst_caps_set_simple (caps, +- "annex-f", G_TYPE_BOOLEAN, context->flags & CODEC_FLAG_4MV, +- "annex-j", G_TYPE_BOOLEAN, context->flags & CODEC_FLAG_LOOP_FILTER, +- "annex-i", G_TYPE_BOOLEAN, context->flags & CODEC_FLAG_AC_PRED, +- "annex-t", G_TYPE_BOOLEAN, context->flags & CODEC_FLAG_AC_PRED, ++ "annex-f", G_TYPE_BOOLEAN, context->flags & AV_CODEC_FLAG_4MV, ++ "annex-j", G_TYPE_BOOLEAN, context->flags & AV_CODEC_FLAG_LOOP_FILTER, ++ "annex-i", G_TYPE_BOOLEAN, context->flags & AV_CODEC_FLAG_AC_PRED, ++ "annex-t", G_TYPE_BOOLEAN, context->flags & AV_CODEC_FLAG_AC_PRED, + NULL); + } + break; +@@ -3181,7 +3181,7 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, + * as is, as that is what most players do. */ + context->extradata = + av_mallocz (GST_ROUND_UP_16 (size * 2 + +- FF_INPUT_BUFFER_PADDING_SIZE)); ++ AV_INPUT_BUFFER_PADDING_SIZE)); + copy_config (context->extradata, data, size, &extrasize); + GST_DEBUG ("escaped size: %d", extrasize); + context->extradata_size = extrasize; +@@ -3192,7 +3192,7 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, + GST_DEBUG ("copy codec_data"); + context->extradata = + av_mallocz (GST_ROUND_UP_16 (map.size + +- FF_INPUT_BUFFER_PADDING_SIZE)); ++ AV_INPUT_BUFFER_PADDING_SIZE)); + memcpy (context->extradata, map.data, map.size); + context->extradata_size = map.size; + } +@@ -3216,7 +3216,7 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, + { + const gchar *mime = gst_structure_get_name (str); + +- context->flags |= CODEC_FLAG_4MV; ++ context->flags |= AV_CODEC_FLAG_4MV; + + if (!strcmp (mime, "video/x-divx")) + context->codec_tag = GST_MAKE_FOURCC ('D', 'I', 'V', 'X'); +@@ -3228,7 +3228,8 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, + profile = gst_structure_get_string (str, "profile"); + if (profile) { + if (g_strcmp0 (profile, "advanced-simple") == 0) +- context->flags |= CODEC_FLAG_GMC | CODEC_FLAG_QPEL; ++ context->flags |= AV_CODEC_FLAG_QPEL; ++ /* FIXME use the "gmc" private option of the libxvid encoder */ + } + } + break; +@@ -3334,18 +3335,18 @@ gst_ffmpeg_caps_with_codecid (enum AVCodecID codec_id, + gboolean val; + + if (!gst_structure_get_boolean (str, "annex-f", &val) || val) +- context->flags |= CODEC_FLAG_4MV; ++ context->flags |= AV_CODEC_FLAG_4MV; + else +- context->flags &= ~CODEC_FLAG_4MV; ++ context->flags &= ~AV_CODEC_FLAG_4MV; + if ((!gst_structure_get_boolean (str, "annex-i", &val) || val) && + (!gst_structure_get_boolean (str, "annex-t", &val) || val)) +- context->flags |= CODEC_FLAG_AC_PRED; ++ context->flags |= AV_CODEC_FLAG_AC_PRED; + else +- context->flags &= ~CODEC_FLAG_AC_PRED; ++ context->flags &= ~AV_CODEC_FLAG_AC_PRED; + if (!gst_structure_get_boolean (str, "annex-j", &val) || val) +- context->flags |= CODEC_FLAG_LOOP_FILTER; ++ context->flags |= AV_CODEC_FLAG_LOOP_FILTER; + else +- context->flags &= ~CODEC_FLAG_LOOP_FILTER; ++ context->flags &= ~AV_CODEC_FLAG_LOOP_FILTER; + break; + } + case AV_CODEC_ID_ADPCM_G726: +diff --git a/ext/libav/gstavcodecmap.h b/ext/libav/gstavcodecmap.h +index 9575e77..14cdfce 100644 +--- a/ext/libav/gstavcodecmap.h ++++ b/ext/libav/gstavcodecmap.h +@@ -155,7 +155,7 @@ gst_ffmpeg_formatid_to_caps (const gchar *format_name); + + /* + * _formatid_get_codecids () can be used to get the codecIDs +- * (CODEC_ID_NONE-terminated list) that fit that specific ++ * (AV_CODEC_ID_NONE-terminated list) that fit that specific + * output format. + */ + +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index f9c6096..0ed4b23 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -237,7 +237,7 @@ gst_ffmpegviddec_class_init (GstFFMpegVidDecClass * klass) + DEFAULT_OUTPUT_CORRUPT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + caps = klass->in_plugin->capabilities; +- if (caps & (CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS)) { ++ if (caps & (AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS)) { + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MAX_THREADS, + g_param_spec_int ("max-threads", "Maximum decode threads", + "Maximum number of worker threads to spawn. (0 = auto)", +@@ -365,7 +365,7 @@ gst_ffmpegviddec_open (GstFFMpegVidDec * ffmpegdec) + oclass->in_plugin->name, oclass->in_plugin->id); + + gst_ffmpegviddec_context_set_flags (ffmpegdec->context, +- CODEC_FLAG_OUTPUT_CORRUPT, ffmpegdec->output_corrupt); ++ AV_CODEC_FLAG_OUTPUT_CORRUPT, ffmpegdec->output_corrupt); + + return TRUE; + +@@ -495,7 +495,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, + gboolean is_live; + + if (ffmpegdec->max_threads == 0) { +- if (!(oclass->in_plugin->capabilities & CODEC_CAP_AUTO_THREADS)) ++ if (!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) + ffmpegdec->context->thread_count = gst_ffmpeg_auto_max_threads (); + else + ffmpegdec->context->thread_count = 0; +@@ -624,10 +624,7 @@ gst_ffmpegvideodec_prepare_dr_pool (GstFFMpegVidDec * ffmpegdec, + avcodec_align_dimensions2 (ffmpegdec->context, &width, &height, + linesize_align); + +- if (ffmpegdec->context->flags & CODEC_FLAG_EMU_EDGE) +- edge = 0; +- else +- edge = avcodec_get_edge_width (); ++ edge = 0; + + /* increase the size for the padding */ + width += edge << 1; +@@ -732,7 +729,7 @@ gst_ffmpegviddec_can_direct_render (GstFFMpegVidDec * ffmpegdec) + return FALSE; + + oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); +- return ((oclass->in_plugin->capabilities & CODEC_CAP_DR1) == CODEC_CAP_DR1); ++ return ((oclass->in_plugin->capabilities & AV_CODEC_CAP_DR1) == AV_CODEC_CAP_DR1); + } + + /* called when ffmpeg wants us to allocate a buffer to write the decoded frame +@@ -1769,7 +1766,7 @@ gst_ffmpegviddec_drain (GstVideoDecoder * decoder) + + oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); + +- if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) { ++ if (oclass->in_plugin->capabilities & AV_CODEC_CAP_DELAY) { + gint have_data, len; + GstFlowReturn ret; + +@@ -1815,10 +1812,10 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder, + bsize = minfo.size; + + if (bsize > 0 && (!GST_MEMORY_IS_ZERO_PADDED (minfo.memory) +- || (minfo.maxsize - minfo.size) < FF_INPUT_BUFFER_PADDING_SIZE)) { ++ || (minfo.maxsize - minfo.size) < AV_INPUT_BUFFER_PADDING_SIZE)) { + /* add padding */ +- if (ffmpegdec->padded_size < bsize + FF_INPUT_BUFFER_PADDING_SIZE) { +- ffmpegdec->padded_size = bsize + FF_INPUT_BUFFER_PADDING_SIZE; ++ if (ffmpegdec->padded_size < bsize + AV_INPUT_BUFFER_PADDING_SIZE) { ++ ffmpegdec->padded_size = bsize + AV_INPUT_BUFFER_PADDING_SIZE; + ffmpegdec->padded = g_realloc (ffmpegdec->padded, ffmpegdec->padded_size); + GST_LOG_OBJECT (ffmpegdec, "resized padding buffer to %d", + ffmpegdec->padded_size); +@@ -1826,7 +1823,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder, + GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec, + "Copy input to add padding"); + memcpy (ffmpegdec->padded, bdata, bsize); +- memset (ffmpegdec->padded + bsize, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memset (ffmpegdec->padded + bsize, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + bdata = ffmpegdec->padded; + do_padding = TRUE; +@@ -1835,7 +1832,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder, + } + + do { +- guint8 tmp_padding[FF_INPUT_BUFFER_PADDING_SIZE]; ++ guint8 tmp_padding[AV_INPUT_BUFFER_PADDING_SIZE]; + + /* parse, if at all possible */ + data = bdata; +@@ -1845,8 +1842,8 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder, + /* add temporary padding */ + GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, ffmpegdec, + "Add temporary input padding"); +- memcpy (tmp_padding, data + size, FF_INPUT_BUFFER_PADDING_SIZE); +- memset (data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); ++ memcpy (tmp_padding, data + size, AV_INPUT_BUFFER_PADDING_SIZE); ++ memset (data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + } + + /* decode a frame of audio/video now */ +@@ -1862,7 +1859,7 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder, + } + + if (do_padding) { +- memcpy (data + size, tmp_padding, FF_INPUT_BUFFER_PADDING_SIZE); ++ memcpy (data + size, tmp_padding, AV_INPUT_BUFFER_PADDING_SIZE); + } + + if (len == 0 && have_data == 0) { +@@ -2143,7 +2140,7 @@ gst_ffmpegviddec_propose_allocation (GstVideoDecoder * decoder, + gst_allocation_params_init (¶ms); + params.flags = GST_MEMORY_FLAG_ZERO_PADDED; + params.align = DEFAULT_STRIDE_ALIGN; +- params.padding = FF_INPUT_BUFFER_PADDING_SIZE; ++ params.padding = AV_INPUT_BUFFER_PADDING_SIZE; + /* we would like to have some padding so that we don't have to + * memcpy. We don't suggest an allocator. */ + gst_query_add_allocation_param (query, NULL, ¶ms); +diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c +index 36143f5..22e5cae 100644 +--- a/ext/libav/gstavvidenc.c ++++ b/ext/libav/gstavvidenc.c +@@ -68,18 +68,19 @@ enum + PROP_CFG_BASE, + }; + ++#if 0 + #define GST_TYPE_ME_METHOD (gst_ffmpegvidenc_me_method_get_type()) + static GType + gst_ffmpegvidenc_me_method_get_type (void) + { + static GType ffmpegenc_me_method_type = 0; + static GEnumValue ffmpegenc_me_methods[] = { +- {ME_ZERO, "None (Very low quality)", "zero"}, +- {ME_FULL, "Full (Slow, unmaintained)", "full"}, +- {ME_LOG, "Logarithmic (Low quality, unmaintained)", "logarithmic"}, +- {ME_PHODS, "phods (Low quality, unmaintained)", "phods"}, +- {ME_EPZS, "EPZS (Best quality, Fast)", "epzs"}, +- {ME_X1, "X1 (Experimental)", "x1"}, ++ {FF_CMP_ZERO, "None (Very low quality)", "zero"}, ++ {FF_CMP_FULL, "Full (Slow, unmaintained)", "full"}, ++ {FF_CMP_LOG, "Logarithmic (Low quality, unmaintained)", "logarithmic"}, ++ {FF_CMP_PHODS, "phods (Low quality, unmaintained)", "phods"}, ++ {FF_CMP_EPZS, "EPZS (Best quality, Fast)", "epzs"}, ++ {FF_CMP_X1, "X1 (Experimental)", "x1"}, + {0, NULL, NULL}, + }; + if (!ffmpegenc_me_method_type) { +@@ -88,6 +89,7 @@ gst_ffmpegvidenc_me_method_get_type (void) + } + return ffmpegenc_me_method_type; + } ++#endif + + /* A number of function prototypes are given so we can refer to them later. */ + static void gst_ffmpegvidenc_class_init (GstFFMpegVidEncClass * klass); +@@ -201,10 +203,12 @@ gst_ffmpegvidenc_class_init (GstFFMpegVidEncClass * klass) + g_param_spec_int ("gop-size", "GOP Size", + "Number of frames within one GOP", 0, G_MAXINT, + DEFAULT_VIDEO_GOP_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); ++#if 0 + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_ME_METHOD, + g_param_spec_enum ("me-method", "ME Method", "Motion Estimation Method", +- GST_TYPE_ME_METHOD, ME_EPZS, ++ GST_TYPE_ME_METHOD, FF_CMP_EPZS, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); ++#endif + + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BUFSIZE, + g_param_spec_int ("buffer-size", "Buffer Size", +@@ -216,7 +220,7 @@ gst_ffmpegvidenc_class_init (GstFFMpegVidEncClass * klass) + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + caps = klass->in_plugin->capabilities; +- if (caps & (CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS)) { ++ if (caps & (AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS)) { + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MAX_THREADS, + g_param_spec_int ("max-threads", "Maximum encode threads", + "Maximum number of worker threads to spawn. (0 = auto)", +@@ -259,7 +263,7 @@ gst_ffmpegvidenc_init (GstFFMpegVidEnc * ffmpegenc) + ffmpegenc->file = NULL; + + ffmpegenc->bitrate = DEFAULT_VIDEO_BITRATE; +- ffmpegenc->me_method = ME_EPZS; ++ //ffmpegenc->me_method = FF_CMP_EPZS; + ffmpegenc->buffer_size = 512 * 1024; + ffmpegenc->gop_size = DEFAULT_VIDEO_GOP_SIZE; + ffmpegenc->rtp_payload_size = 0; +@@ -321,12 +325,12 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, + ffmpegenc->context->bit_rate = ffmpegenc->bitrate; + ffmpegenc->context->bit_rate_tolerance = ffmpegenc->bitrate; + ffmpegenc->context->gop_size = ffmpegenc->gop_size; +- ffmpegenc->context->me_method = ffmpegenc->me_method; ++ //ffmpegenc->context->me_method = ffmpegenc->me_method; + GST_DEBUG_OBJECT (ffmpegenc, "Setting avcontext to bitrate %d, gop_size %d", + ffmpegenc->bitrate, ffmpegenc->gop_size); + + if (ffmpegenc->max_threads == 0) { +- if (!(oclass->in_plugin->capabilities & CODEC_CAP_AUTO_THREADS)) ++ if (!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) + ffmpegenc->context->thread_count = gst_ffmpeg_auto_max_threads (); + else + ffmpegenc->context->thread_count = 0; +@@ -343,16 +347,16 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, + gst_ffmpeg_cfg_fill_context (ffmpegenc, ffmpegenc->context); + + /* then handle some special cases */ +- ffmpegenc->context->lmin = (ffmpegenc->lmin * FF_QP2LAMBDA + 0.5); +- ffmpegenc->context->lmax = (ffmpegenc->lmax * FF_QP2LAMBDA + 0.5); ++ ffmpegenc->context->qmin = (ffmpegenc->lmin * FF_QP2LAMBDA + 0.5); ++ ffmpegenc->context->qmax = (ffmpegenc->lmax * FF_QP2LAMBDA + 0.5); + + if (ffmpegenc->interlaced) { + ffmpegenc->context->flags |= +- CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME; ++ AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME; + } + + /* some other defaults */ +- ffmpegenc->context->rc_strategy = 2; ++ //ffmpegenc->context->rc_strategy = 2; + ffmpegenc->context->b_frame_strategy = 0; + ffmpegenc->context->coder_type = 0; + ffmpegenc->context->context_model = 0; +@@ -362,18 +366,18 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, + ffmpegenc->context->flags |= ffmpegenc->pass; + switch (ffmpegenc->pass) { + /* some additional action depends on type of pass */ +- case CODEC_FLAG_QSCALE: ++ case AV_CODEC_FLAG_QSCALE: + ffmpegenc->context->global_quality + = ffmpegenc->picture->quality = FF_QP2LAMBDA * ffmpegenc->quantizer; + break; +- case CODEC_FLAG_PASS1: /* need to prepare a stats file */ ++ case AV_CODEC_FLAG_PASS1: /* need to prepare a stats file */ + /* we don't close when changing caps, fingers crossed */ + if (!ffmpegenc->file) + ffmpegenc->file = g_fopen (ffmpegenc->filename, "w"); + if (!ffmpegenc->file) + goto open_file_err; + break; +- case CODEC_FLAG_PASS2: ++ case AV_CODEC_FLAG_PASS2: + { /* need to read the whole stats file ! */ + gsize size; + + + diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index 57888bed6b4..bffe41d0d83 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,11 +1,12 @@ # Template file for 'gst-libav' pkgname=gst-libav version=1.14.1 -revision=1 +revision=2 lib32disabled=yes wrksrc="${pkgname}-${version}" build_style=gnu-configure configure_args="--with-system-libav" +patch_args="-Np1" hostmakedepends="pkg-config yasm python" makedepends="orc-devel gst-plugins-base1-devel ffmpeg-devel" depends="orc>=0.4.18 gst-plugins-base1>=${version}" From d4c06bc7faff9d31fcf9b9932150d77f08ee4fc6 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Fri, 11 May 2018 12:52:05 +0200 Subject: [PATCH 413/759] moc: add patch for ffmpeg-4.0.1. --- srcpkgs/moc/patches/ffmpeg4.patch | 32 +++++++++++++++++++++++++++++++ srcpkgs/moc/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/moc/patches/ffmpeg4.patch diff --git a/srcpkgs/moc/patches/ffmpeg4.patch b/srcpkgs/moc/patches/ffmpeg4.patch new file mode 100644 index 00000000000..0606a52ab91 --- /dev/null +++ b/srcpkgs/moc/patches/ffmpeg4.patch @@ -0,0 +1,32 @@ +--- decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-05-11 12:48:29.897671514 +0200 ++++ decoder_plugins/ffmpeg/ffmpeg.c 2018-05-11 12:50:09.133692416 +0200 +@@ -984,7 +984,7 @@ + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { ++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -993,8 +993,8 @@ + #endif + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + #ifdef HAVE_AVCODEC_OPEN2 + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) +@@ -1025,7 +1025,7 @@ + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); + diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template index de141788df9..874f8b63424 100644 --- a/srcpkgs/moc/template +++ b/srcpkgs/moc/template @@ -1,7 +1,7 @@ # Template file for 'moc' pkgname=moc version=2.5.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel From c6c3bdaf711563d18f3fa42cc9f02d3591094502 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Sun, 13 May 2018 21:13:05 +0200 Subject: [PATCH 414/759] obs: rebuild for ffmpeg-4.0.1. --- srcpkgs/obs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 6dff2d59176..8d51676a84d 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,7 +1,7 @@ # Template file for 'obs' pkgname=obs version=21.1.2 -revision=1 +revision=2 wrksrc=obs-studio-${version} only_for_archs="i686 x86_64 i686-musl x86_64-musl" build_style=cmake From a103442b7fa6dd7db999bfce2d195bc6021d8b1b Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 30 May 2018 00:55:05 +0200 Subject: [PATCH 415/759] vlc: rebuild for ffmpeg-4.0.1. --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 02fb97f7ab0..90d3cb2f47d 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-live555 --disable-fluidsynth --enable-dvdread From c688286ddb5d4fc6e93393bdc62b68c566095ded Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 13 Jun 2018 21:31:15 +0200 Subject: [PATCH 416/759] opencv: rebuild for ffmpeg-4.0.1. --- srcpkgs/opencv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index a6c8cf853a6..832078aa3f9 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv version=3.4.1 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON -DENABLE_CXX11=ON" From 7507203e3ad67aa54b0990e62d6f78fae41f414a Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 13 Jun 2018 21:39:20 +0200 Subject: [PATCH 417/759] retroshare: rebuild for ffmpeg-4.0.1. --- srcpkgs/retroshare/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index f09662590d2..c8b13d6312a 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.4 -revision=2 +revision=3 wrksrc="RetroShare-${version}" build_style=qmake hostmakedepends="pkg-config qt5-qmake" From 567db66431d51c1201c170254eadb023d739d52a Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 20 Jun 2018 13:12:19 +0200 Subject: [PATCH 418/759] gerbera: rebuild for ffmpeg-4.0.1. --- srcpkgs/gerbera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 1e442376385..82f437bcfaf 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.2.0 -revision=1 +revision=2 build_style=cmake makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel libexif-devel libupnp1.8-devel libuuid-devel sqlite-devel taglib-devel" From 3236142c0ce7c40eb1d4bdcdcb0e788c3826b9ef Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 27 Jun 2018 11:36:05 +0200 Subject: [PATCH 419/759] libopenshot: add patch for ffmpeg-4.0.1. --- srcpkgs/libopenshot/patches/ffmpeg4.patch | 93 +++++++++++++++++++++++ srcpkgs/libopenshot/template | 2 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libopenshot/patches/ffmpeg4.patch diff --git a/srcpkgs/libopenshot/patches/ffmpeg4.patch b/srcpkgs/libopenshot/patches/ffmpeg4.patch new file mode 100644 index 00000000000..ee499741e8b --- /dev/null +++ b/srcpkgs/libopenshot/patches/ffmpeg4.patch @@ -0,0 +1,93 @@ +source: https://pkgs.rpmfusion.org/cgit/free/libopenshot.git/plain/ffmpeg35_buildfix.patch + +--- src/FFmpegWriter.cpp ++++ src/FFmpegWriter.cpp +@@ -543,7 +543,7 @@ + { + if (info.has_audio && audio_codec && audio_st->codec->codec_type == AVMEDIA_TYPE_AUDIO && audio_codec->frame_size <= 1) + return; +- if (info.has_video && video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (oc->oformat->flags & AVFMT_RAWPICTURE) && video_codec->codec->id == AV_CODEC_ID_RAWVIDEO) ++ if (info.has_video && video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (oc->oformat->flags & AVFMT_NOFILE) && video_codec->codec->id == AV_CODEC_ID_RAWVIDEO) + return; + + int error_code = 0; +@@ -858,7 +858,7 @@ + + // some formats want stream headers to be separate + if (oc->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::add_audio_stream", "c->codec_id", c->codec_id, "c->bit_rate", c->bit_rate, "c->channels", c->channels, "c->sample_fmt", c->sample_fmt, "c->channel_layout", c->channel_layout, "c->sample_rate", c->sample_rate); + +@@ -931,7 +931,7 @@ + c->mb_decision = 2; + // some formats want stream headers to be separate + if (oc->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + // Find all supported pixel formats for this codec + const PixelFormat* supported_pixel_formats = codec->pix_fmts; +@@ -951,14 +951,14 @@ + if (strcmp(fmt->name, "gif") != 0) + // If not GIF format, skip the encoding process + // Set raw picture flag (so we don't encode this video) +- oc->oformat->flags |= AVFMT_RAWPICTURE; ++ oc->oformat->flags |= AVFMT_NOFILE; + } else { + // Set the default codec + c->pix_fmt = PIX_FMT_YUV420P; + } + } + +- ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::add_video_stream (" + (string)fmt->name + " : " + (string)av_get_pix_fmt_name(c->pix_fmt) + ")", "c->codec_id", c->codec_id, "c->bit_rate", c->bit_rate, "c->pix_fmt", c->pix_fmt, "oc->oformat->flags", oc->oformat->flags, "AVFMT_RAWPICTURE", AVFMT_RAWPICTURE, "", -1); ++ ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::add_video_stream (" + (string)fmt->name + " : " + (string)av_get_pix_fmt_name(c->pix_fmt) + ")", "c->codec_id", c->codec_id, "c->bit_rate", c->bit_rate, "c->pix_fmt", c->pix_fmt, "oc->oformat->flags", oc->oformat->flags, "AVFMT_NOFILE", AVFMT_NOFILE, "", -1); + + return st; + } +@@ -1018,7 +1018,7 @@ + audio_encoder_buffer_size = AUDIO_PACKET_ENCODING_SIZE; + audio_encoder_buffer = new uint8_t[audio_encoder_buffer_size]; + +- ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::open_audio", "audio_codec->thread_count", audio_codec->thread_count, "audio_input_frame_size", audio_input_frame_size, "buffer_size", AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE, "", -1, "", -1, "", -1); ++ ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::open_audio", "audio_codec->thread_count", audio_codec->thread_count, "audio_input_frame_size", audio_input_frame_size, "buffer_size", AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE, "", -1, "", -1, "", -1); + + } + +@@ -1473,9 +1473,9 @@ + // write video frame + bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame* frame_final) + { +- ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_video_packet", "frame->number", frame->number, "oc->oformat->flags & AVFMT_RAWPICTURE", oc->oformat->flags & AVFMT_RAWPICTURE, "", -1, "", -1, "", -1, "", -1); +- +- if (oc->oformat->flags & AVFMT_RAWPICTURE) { ++ ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_video_packet", "frame->number", frame->number, "oc->oformat->flags & AVFMT_NOFILE", oc->oformat->flags & AVFMT_NOFILE, "", -1, "", -1, "", -1, "", -1); ++ ++ if (oc->oformat->flags & AVFMT_NOFILE) { + // Raw video case. + AVPacket pkt; + av_init_packet(&pkt); + +--- src/FFmpegReader.cpp ++++ src/FFmpegReader.cpp +@@ -903,7 +903,7 @@ + int data_size = 0; + + // re-initialize buffer size (it gets changed in the avcodec_decode_audio2 method call) +- int buf_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE; ++ int buf_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE; + int used = avcodec_decode_audio4(aCodecCtx, audio_frame, &frame_finished, packet); + + if (frame_finished) { +@@ -976,7 +976,7 @@ + + + // Allocate audio buffer +- int16_t *audio_buf = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; ++ int16_t *audio_buf = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; + + ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::ProcessAudioPacket (ReSample)", "packet_samples", packet_samples, "info.channels", info.channels, "info.sample_rate", info.sample_rate, "aCodecCtx->sample_fmt", aCodecCtx->sample_fmt, "AV_SAMPLE_FMT_S16", AV_SAMPLE_FMT_S16, "", -1); + + + diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 948a1623e2c..5b068c3d22f 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot version=0.1.9 -revision=4 +revision=5 build_style=cmake only_for_archs="i686 x86_64" pycompile_module="openshot.py" From b5347b978b3595101a90fbf77315e381fe762bb0 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Wed, 27 Jun 2018 13:06:34 +0200 Subject: [PATCH 420/759] bomi: add patch for ffmpeg-4.0.1. [ci skip] --- srcpkgs/bomi/patches/ffmpeg4.patch | 195 +++++++++++++++++++++++++++++ srcpkgs/bomi/template | 2 +- 2 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch new file mode 100644 index 00000000000..1ce9ea97b4b --- /dev/null +++ b/srcpkgs/bomi/patches/ffmpeg4.patch @@ -0,0 +1,195 @@ +source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa + +diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp +index 77b1df41c5..5365525c48 100644 +--- src/bomi/video/ffmpegfilters.hpp ++++ src/bomi/video/ffmpegfilters.hpp +@@ -6,7 +6,7 @@ + extern "C" { + #include