From 2d0bea3bc864f35b8047df435f9479bc3aac5980 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Mon, 10 Apr 2017 19:24:38 -0500 Subject: [PATCH 0001/1145] New package: tokei-6.0.0 --- srcpkgs/tokei/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/tokei/template diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template new file mode 100644 index 0000000000..68a264a6bd --- /dev/null +++ b/srcpkgs/tokei/template @@ -0,0 +1,22 @@ +# Template file for 'tokei' +pkgname=tokei +version=6.0.0 +revision=1 +hostmakedepends="cargo rust" +short_desc="Count lines of code" +maintainer="Joseph LaFreniere " +license="Apache, MIT" +homepage="https://github.com/Aaronepower/tokei" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=65b1872b8cd48214f257e7ca8ea1114d2112b29ad7d8e1fb4a8a5d4401dae02d +nocross=yes + +do_build() { + cargo build --release +} + +do_install() { + vbin target/release/tokei + vlicense LICENCE-APACHE + vlicense LICENCE-MIT +} From f20684fc41f42dbbca2a9c2f99916802ccf617a9 Mon Sep 17 00:00:00 2001 From: Lee Wang Date: Sat, 22 Apr 2017 18:25:13 -0400 Subject: [PATCH 0002/1145] New package: dina-font-2.92 --- srcpkgs/dina-font/template | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 srcpkgs/dina-font/template diff --git a/srcpkgs/dina-font/template b/srcpkgs/dina-font/template new file mode 100644 index 0000000000..191d7e90dd --- /dev/null +++ b/srcpkgs/dina-font/template @@ -0,0 +1,45 @@ +# Template file for 'dina-font' +pkgname=dina-font +version=2.92 +revision=1 +noarch="yes" +font_dirs="/usr/share/fonts/X11/misc" +hostmakedepends="bdftopcf font-util unzip" +depends="font-util" +short_desc="A monospace bitmap font, primarily aimed at programmers" +maintainer="Lee Wang " +homepage="http://www.donationcoder.com/Software/Jibz/Dina/index.html" +license="Custom" +distfiles="http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip" +checksum=1f51bba53f75a64d2d8bd037e8e0f84b6f8064e50a72ee954033bede173508cf +wrksrc="." + +_ex_pt() { + _pt=${1%.bdf} + _pt=${_pt#*-} + echo $_pt +} + +do_install() { + cd BDF + sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf + for i in Dina_i400-*.bdf; do + bdftopcf -t -o DinaItalic$(_ex_pt $i).pcf $i + done + for i in Dina_i700-*.bdf; do + bdftopcf -t -o DinaBoldItalic$(_ex_pt $i).pcf $i + done + for i in Dina_r400-*.bdf; do + bdftopcf -t -o DinaMedium$(_ex_pt $i).pcf $i + done + for i in Dina_r700-*.bdf; do + bdftopcf -t -o DinaBold$(_ex_pt $i).pcf $i + done + for i in *.pcf; do + gzip "$i" + done + + vmkdir usr/share/fonts/X11/misc + install -m644 *.pcf.gz ${DESTDIR}/usr/share/fonts/X11/misc + vlicense ../LICENSE +} From 13caff38208249ddc4f9d051c0108ace4f4a04c8 Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Thu, 27 Apr 2017 23:27:02 +0200 Subject: [PATCH 0003/1145] pgadmin3: fix startup and distfile Signed-off-by: Gerardo Di Iorio --- srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch | 11 +++++++++++ srcpkgs/pgadmin3/template | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch diff --git a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch new file mode 100644 index 0000000000..200aa84abf --- /dev/null +++ b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch @@ -0,0 +1,11 @@ +--- pgadmin/frm/plugins.cpp ++++ pgadmin/frm/plugins.cpp +@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p + { + // If we need a specific server type, we can't enable unless + // we have a connection. +- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) ++ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK)) + return false; + + // Get the server type. diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template index f8731b4ca7..a9ae94d989 100644 --- a/srcpkgs/pgadmin3/template +++ b/srcpkgs/pgadmin3/template @@ -1,7 +1,7 @@ # Template file for 'pgadmin3' pkgname=pgadmin3 version=1.22.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="ac_cv_path_WX_CONFIG=wx-config-3.0 --with-wx-version=3.0" makedepends="postgresql-libs-devel wxWidgets-devel libxslt-devel libressl-devel" @@ -9,7 +9,7 @@ short_desc="Comprehensive design and management interface for PostgreSQL" maintainer="Gerardo Di Iorio " license="BSD" homepage="http://www.pgadmin.org" -distfiles="http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz" +distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz" checksum=9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac nocross=yes From ee7648acae1cee4dd0e4016cb275a80f6bfeea68 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Sat, 29 Apr 2017 13:43:23 +0200 Subject: [PATCH 0004/1145] python-apsw: update to 3.18.0r1. --- srcpkgs/python-apsw/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python-apsw/template index 8052638a22..5a23b49c92 100644 --- a/srcpkgs/python-apsw/template +++ b/srcpkgs/python-apsw/template @@ -1,6 +1,6 @@ # Template file for 'python-apsw' pkgname=python-apsw -_distver=3.17.0 +_distver=3.18.0 _patchver=r1 version=${_distver}${_patchver} revision=1 @@ -13,7 +13,7 @@ maintainer="bra1nwave " license="zlib" homepage="https://github.com/rogerbinns/apsw" distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz" -checksum=ff408c39b62a7815fe9ed1b65542239f33a0d132e99e178dccd9c439278e35cc +checksum=6a2cd5a2a219b12c986b543587239e1f8986814dae9699d86e661dc6fe373197 post_install() { vlicense LICENSE From ee205e128aee328ad539e98357eefd2c67e0d290 Mon Sep 17 00:00:00 2001 From: cr6-git Date: Mon, 1 May 2017 17:07:02 +0200 Subject: [PATCH 0005/1145] dfc: update to 3.1.0 + add BSD license. --- srcpkgs/dfc/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dfc/template b/srcpkgs/dfc/template index 5b87250167..f52ea6a3c1 100644 --- a/srcpkgs/dfc/template +++ b/srcpkgs/dfc/template @@ -1,6 +1,6 @@ # Template file for 'dfc' pkgname=dfc -version=3.0.5 +version=3.1.0 revision=1 build_style=cmake configure_args="-DXDG_CONFIG_DIR=/etc/xdg" @@ -8,6 +8,10 @@ short_desc="Display file system space usage using graphs and colors" maintainer='Juan RP ' license="BSD" homepage="http://projects.gw-computing.net/projects/dfc" -distfiles="http://projects.gw-computing.net/attachments/download/467/dfc-${version}.tar.gz" -checksum=3c947a1d6bc53347b1643921dcbf4c6f8fe7eb6167fc1f4e9436366f036d857a +distfiles="http://projects.gw-computing.net/attachments/download/614/${pkgname}-${version}.tar.gz" +checksum=8ad98ba1a9685a1bf33a2d3b8f2737dedef6019543d19d1b5ebd1783be740feb conf_files="/etc/xdg/dfc/dfcrc" + +post_install() { + vlicense LICENSE +} From b9ba2303cb2e88e2118038ca8f09a4d0e31692ea Mon Sep 17 00:00:00 2001 From: cr6-git Date: Mon, 1 May 2017 18:07:25 +0200 Subject: [PATCH 0006/1145] radeontop: update to v1.0 --- srcpkgs/radeontop/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/radeontop/template b/srcpkgs/radeontop/template index 3ec32bbaf4..aacdc895e1 100644 --- a/srcpkgs/radeontop/template +++ b/srcpkgs/radeontop/template @@ -1,17 +1,17 @@ # Template file for 'radeontop' pkgname=radeontop -version=v0.9 -revision=3 +version=v1.0 +revision=1 only_for_archs="i686 i686-musl x86_64 x86_64-musl" wrksrc="${pkgname}-${version#?}" hostmakedepends="pkg-config" -makedepends="ncurses-devel libdrm-devel" +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="https://github.com/clbr/radeontop/archive/${version}.tar.gz" -checksum=e78a56d1222c8a45f08f09409f178ddda83461085b012e5ba54b716e6c8dd61d +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=a997ea92f38a53d59db4d8e846aec4cc04cee8b79939e89d5eb9e31c57b468fc do_build() { make CC="$CC" From 5ba21dbb16455124600e05a5e3a31eaec0472e80 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Tue, 2 May 2017 03:53:04 -0400 Subject: [PATCH 0007/1145] keybase: update to 1.0.22. --- srcpkgs/keybase/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 034dc7a9ed..54265253a6 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,6 +1,6 @@ # Template file for 'keybase' pkgname=keybase -version=1.0.21 +version=1.0.22 revision=1 wrksrc="client-${version}" build_style=go @@ -13,7 +13,7 @@ maintainer="Toyam Cox " license="BSD" homepage="https://keybase.io/" distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz" -checksum=a9bbaf16cb7b7cc3614ca5e76e0fb1b3bd164f38e14b9d49d4ca351941c8c0a3 +checksum=202a56ea6d25b0f0de2e7529839eb62266ad1665297483cef4948678c95c12f9 post_install() { vlicense LICENSE From 58880f4aa0e4c4f1abe94534d474473dcfbef83f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:17:41 +0000 Subject: [PATCH 0008/1145] icu: update to 59.1. (soname bump) --- common/shlibs | 16 +- srcpkgs/icu/patches/CVE-2017-7867+7868.patch | 155 ------------------ .../icu/patches/icu-58.1-iterator-reset.patch | 116 ------------- srcpkgs/icu/template | 6 +- 4 files changed, 11 insertions(+), 282 deletions(-) delete mode 100644 srcpkgs/icu/patches/CVE-2017-7867+7868.patch delete mode 100644 srcpkgs/icu/patches/icu-58.1-iterator-reset.patch diff --git a/common/shlibs b/common/shlibs index 626c305040..f8d011091a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -488,14 +488,14 @@ libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1 libbabl-0.1.so.0 babl-0.1.10_1 libbamf3.so.2 bamf-0.5.1_1 libgegl-0.2.so.0 gegl-0.2.0_1 -libiculx.so.58 icu-libs-58.2_1 -libicule.so.58 icu-libs-58.2_1 -libicuio.so.58 icu-libs-58.2_1 -libicui18n.so.58 icu-libs-58.2_1 -libicudata.so.58 icu-libs-58.2_1 -libicutu.so.58 icu-libs-58.2_1 -libicuuc.so.58 icu-libs-58.2_1 -libicutest.so.58 icu-libs-58.2_1 +libiculx.so.59 icu-libs-59.1_1 +libicule.so.59 icu-libs-59.1_1 +libicuio.so.59 icu-libs-59.1_1 +libicui18n.so.59 icu-libs-59.1_1 +libicudata.so.59 icu-libs-59.1_1 +libicutu.so.59 icu-libs-59.1_1 +libicuuc.so.59 icu-libs-59.1_1 +libicutest.so.59 icu-libs-59.1_1 libaspell.so.15 aspell-0.60_1 libpspell.so.15 aspell-0.60_1 libenchant.so.1 enchant-1.4.2_1 diff --git a/srcpkgs/icu/patches/CVE-2017-7867+7868.patch b/srcpkgs/icu/patches/CVE-2017-7867+7868.patch deleted file mode 100644 index 164923340e..0000000000 --- a/srcpkgs/icu/patches/CVE-2017-7867+7868.patch +++ /dev/null @@ -1,155 +0,0 @@ -Index: /trunk/icu4c/source/common/utext.cpp -=================================================================== ---- source/common/utext.cpp (revision 39670) -+++ source/common/utext.cpp (revision 39671) -@@ -848,7 +848,13 @@ - - // Chunk size. --// Must be less than 85, because of byte mapping from UChar indexes to native indexes. --// Worst case is three native bytes to one UChar. (Supplemenaries are 4 native bytes --// to two UChars.) -+// Must be less than 42 (256/6), because of byte mapping from UChar indexes to native indexes. -+// Worst case there are six UTF-8 bytes per UChar. -+// obsolete 6 byte form fd + 5 trails maps to fffd -+// obsolete 5 byte form fc + 4 trails maps to fffd -+// non-shortest 4 byte forms maps to fffd -+// normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit -+// mapToUChars array size must allow for the worst case, 6. -+// This could be brought down to 4, by treating fd and fc as pure illegal, -+// rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros. - // - enum { UTF8_TEXT_CHUNK_SIZE=32 }; -@@ -890,5 +896,5 @@ - // one for a supplementary starting in the last normal position, - // and one for an entry for the buffer limit position. -- uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to -+ uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to - // correspoding offset in filled part of buf. - int32_t align; -@@ -1033,4 +1039,5 @@ - u8b = (UTF8Buf *)ut->p; // the current buffer - mapIndex = ix - u8b->toUCharsMapStart; -+ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); - ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; - return TRUE; -@@ -1299,4 +1306,8 @@ - // If index is at the end, there is no character there to look at. - if (ix != ut->b) { -+ // Note: this function will only move the index back if it is on a trail byte -+ // and there is a preceding lead byte and the sequence from the lead -+ // through this trail could be part of a valid UTF-8 sequence -+ // Otherwise the index remains unchanged. - U8_SET_CP_START(s8, 0, ix); - } -@@ -1312,5 +1323,8 @@ - uint8_t *mapToNative = u8b->mapToNative; - uint8_t *mapToUChars = u8b->mapToUChars; -- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1); -+ int32_t toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1; -+ // Note that toUCharsMapStart can be negative. Happens when the remaining -+ // text from current position to the beginning is less than the buffer size. -+ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry. - int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region - // at end of buffer to leave room -@@ -1339,4 +1353,5 @@ - // Special case ASCII range for speed. - buf[destIx] = (UChar)c; -+ U_ASSERT(toUCharsMapStart <= srcIx); - mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx; - mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart); -@@ -1368,4 +1383,5 @@ - mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx; - } while (sIx >= srcIx); -+ U_ASSERT(toUCharsMapStart <= (srcIx+1)); - - // Set native indexing limit to be the current position. -@@ -1542,4 +1558,5 @@ - U_ASSERT(index<=ut->chunkNativeLimit); - int32_t mapIndex = index - u8b->toUCharsMapStart; -+ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); - int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; - U_ASSERT(offset>=0 && offset<=ut->chunkLength); -Index: /trunk/icu4c/source/test/intltest/utxttest.cpp -=================================================================== ---- source/test/intltest/utxttest.cpp (revision 39670) -+++ source/test/intltest/utxttest.cpp (revision 39671) -@@ -68,4 +68,6 @@ - case 7: name = "Ticket12130"; - if (exec) Ticket12130(); break; -+ case 8: name = "Ticket12888"; -+ if (exec) Ticket12888(); break; - default: name = ""; break; - } -@@ -1584,2 +1586,62 @@ - utext_close(&ut); - } -+ -+// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal, -+// six byte utf-8 forms. Original implementation had an assumption that -+// there would be at most three utf-8 bytes per UTF-16 code unit. -+// The five and six byte sequences map to a single replacement character. -+ -+void UTextTest::Ticket12888() { -+ const char *badString = -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" -+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"; -+ -+ UErrorCode status = U_ZERO_ERROR; -+ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status)); -+ TEST_SUCCESS(status); -+ for (;;) { -+ UChar32 c = utext_next32(ut.getAlias()); -+ if (c == U_SENTINEL) { -+ break; -+ } -+ } -+ int32_t endIdx = utext_getNativeIndex(ut.getAlias()); -+ if (endIdx != (int32_t)strlen(badString)) { -+ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx); -+ return; -+ } -+ -+ for (int32_t prevIndex = endIdx; prevIndex>0;) { -+ UChar32 c = utext_previous32(ut.getAlias()); -+ int32_t currentIndex = utext_getNativeIndex(ut.getAlias()); -+ if (c != 0xfffd) { -+ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n", -+ __FILE__, __LINE__, 0xfffd, c, currentIndex); -+ break; -+ } -+ if (currentIndex != prevIndex - 6) { -+ errln("%s:%d: wrong index. Expected, actual = %d, %d", -+ __FILE__, __LINE__, prevIndex - 6, currentIndex); -+ break; -+ } -+ prevIndex = currentIndex; -+ } -+} -Index: /trunk/icu4c/source/test/intltest/utxttest.h -=================================================================== ---- source/test/intltest/utxttest.h (revision 39670) -+++ source/test/intltest/utxttest.h (revision 39671) -@@ -39,4 +39,5 @@ - void Ticket10983(); - void Ticket12130(); -+ void Ticket12888(); - - private: diff --git a/srcpkgs/icu/patches/icu-58.1-iterator-reset.patch b/srcpkgs/icu/patches/icu-58.1-iterator-reset.patch deleted file mode 100644 index da4b0d589b..0000000000 --- a/srcpkgs/icu/patches/icu-58.1-iterator-reset.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- source/common/ulist.c -+++ source/common/ulist.c -@@ -30,5 +30,4 @@ - - int32_t size; -- int32_t currentIndex; - }; - -@@ -52,5 +51,4 @@ - newList->tail = NULL; - newList->size = 0; -- newList->currentIndex = -1; - - return newList; -@@ -81,6 +79,7 @@ - p->next->previous = p->previous; - } -- list->curr = NULL; -- list->currentIndex = 0; -+ if (p == list->curr) { -+ list->curr = p->next; -+ } - --list->size; - if (p->forceDelete) { -@@ -151,5 +150,4 @@ - list->head->previous = newItem; - list->head = newItem; -- list->currentIndex++; - } - -@@ -194,5 +192,4 @@ - curr = list->curr; - list->curr = curr->next; -- list->currentIndex++; - - return curr->data; -@@ -210,5 +207,4 @@ - if (list != NULL) { - list->curr = list->head; -- list->currentIndex = 0; - } - } -@@ -273,3 +269,2 @@ - return (UList *)(en->context); - } -- ---- source/i18n/ucol_res.cpp -+++ source/i18n/ucol_res.cpp -@@ -681,4 +681,5 @@ - } - memcpy(en, &defaultKeywordValues, sizeof(UEnumeration)); -+ ulist_resetList(sink.values); // Initialize the iterator. - en->context = sink.values; - sink.values = NULL; // Avoid deletion in the sink destructor. ---- source/test/intltest/apicoll.cpp -+++ source/test/intltest/apicoll.cpp -@@ -82,14 +82,7 @@ - col = Collator::createInstance(Locale::getEnglish(), success); - if (U_FAILURE(success)){ -- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success)); -- return; -- } -- -- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success); -- if (U_FAILURE(success)){ -- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success)); -- return; -- } -- delete kwEnum; -+ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success)); -+ return; -+ } - - col->getVersion(versionArray); -@@ -230,4 +223,27 @@ - delete aFrCol; - delete junk; -+} -+ -+void CollationAPITest::TestKeywordValues() { -+ IcuTestErrorCode errorCode(*this, "TestKeywordValues"); -+ LocalPointer col(Collator::createInstance(Locale::getEnglish(), errorCode)); -+ if (errorCode.logIfFailureAndReset("English Collator creation failed")) { -+ return; -+ } -+ -+ LocalPointer kwEnum( -+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode)); -+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) { -+ return; -+ } -+ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0); -+ const char *kw; -+ UBool hasStandard = FALSE; -+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) { -+ if (strcmp(kw, "standard") == 0) { -+ hasStandard = TRUE; -+ } -+ } -+ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard); - } - -@@ -2467,4 +2483,5 @@ - TESTCASE_AUTO_BEGIN; - TESTCASE_AUTO(TestProperty); -+ TESTCASE_AUTO(TestKeywordValues); - TESTCASE_AUTO(TestOperators); - TESTCASE_AUTO(TestDuplicate); ---- source/test/intltest/apicoll.h -+++ source/test/intltest/apicoll.h -@@ -36,4 +36,5 @@ - */ - void TestProperty(/* char* par */); -+ void TestKeywordValues(); - - /** diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index 363aab86b7..b2ab41e562 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -1,7 +1,7 @@ # Template build file for 'icu'. pkgname=icu -version=58.2 -revision=2 +version=59.1 +revision=1 wrksrc=icu build_wrksrc=source build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.icu-project.org/" license="ICU License /usr/share/licenses/icu/license.html" distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${version//./_}-src.tgz" -checksum=2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c +checksum=7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe if [ "$CROSS_BUILD" ]; then configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu" From 8e0a2cffb1836de4b4e7ec520f3c56e26c17e3cd Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:47:41 +0000 Subject: [PATCH 0009/1145] protobuf: update to 3.3.0. (soname bump) --- common/shlibs | 6 +++--- srcpkgs/protobuf/template | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index f8d011091a..62d56b82cc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -925,9 +925,9 @@ libopenal.so.1 libopenal-1.13_1 libalut.so.0 freealut-1.1.0_1 liblilv-0.so.0 liblilv-0.14.4_1 libsuil-0.so.0 suil-0.6.4_1 -libprotoc.so.9 protobuf-2.6.1_1 -libprotobuf.so.9 protobuf-2.6.1_1 -libprotobuf-lite.so.9 protobuf-lite-2.6.1_1 +libprotoc.so.13 protobuf-3.3.0_1 +libprotobuf.so.13 protobuf-3.3.0_1 +libprotobuf-lite.so.13 protobuf-lite-3.3.0_1 libmcpp.so.0 libmcpp-2.7.2_1 libGlacier2.so.35 libIce-3.5.0_1 libIce.so.35 libIce-3.5.0_1 diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 9200e9f25c..b71885c07d 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,16 +1,16 @@ # Template file for 'protobuf' pkgname=protobuf -version=2.6.1 -revision=6 +version=3.3.0 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" short_desc="Google's data interchange format" maintainer="Juan RP " -distfiles="https://github.com/google/protobuf/releases/download/v${version}/protobuf-${version}.tar.bz2" +distfiles="https://github.com/google/protobuf/releases/download/v${version}/protobuf-cpp-${version}.tar.gz" homepage="https://developers.google.com/protocol-buffers/" license="BSD" -checksum=ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 +checksum=578a2589bf9258adb03245dec5d624b61536867ebb732dbb8aeb30d96b0ada1f CXXFLAGS="-std=c++14" From 7367172c043e5bc4d4ae57092a4e4054fb43e087 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 29 Apr 2017 10:57:01 +0000 Subject: [PATCH 0010/1145] webkitgtk: fix build against icu-59 (PLD Linux patch) --- srcpkgs/webkitgtk/patches/icu59.patch | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/webkitgtk/patches/icu59.patch diff --git a/srcpkgs/webkitgtk/patches/icu59.patch b/srcpkgs/webkitgtk/patches/icu59.patch new file mode 100644 index 0000000000..93a3c383a9 --- /dev/null +++ b/srcpkgs/webkitgtk/patches/icu59.patch @@ -0,0 +1,38 @@ +--- Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100 ++++ Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200 +@@ -32,6 +32,7 @@ + #include + #endif + #include /* for size_t */ ++#include + + #ifdef __cplusplus + extern "C" { +@@ -46,7 +47,7 @@ + character. As with all scalar types, endianness depends on the underlying + architecture. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif +--- Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100 ++++ Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #ifndef __cplusplus + #include +@@ -39,7 +40,7 @@ + + #if !defined(WIN32) && !defined(_WIN32) \ + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ +- typedef unsigned short WKChar; ++ typedef char16_t WKChar; + #else + typedef wchar_t WKChar; + #endif From 09006758cfe99888deaa3463ca109cd43df15948 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 29 Apr 2017 11:09:56 +0000 Subject: [PATCH 0011/1145] qt5-webkit: fix build against icu-59 (PLD Linux patch) --- srcpkgs/qt5-webkit/patches/icu59.patch | 73 ++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 srcpkgs/qt5-webkit/patches/icu59.patch diff --git a/srcpkgs/qt5-webkit/patches/icu59.patch b/srcpkgs/qt5-webkit/patches/icu59.patch new file mode 100644 index 0000000000..503a106217 --- /dev/null +++ b/srcpkgs/qt5-webkit/patches/icu59.patch @@ -0,0 +1,73 @@ +diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +index ead844f..e62cfd4 100644 +--- Source/WTF/wtf/Compiler.h ++++ Source/WTF/wtf/Compiler.h +@@ -61,6 +61,7 @@ + #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor) + #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums) + #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions) ++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS) + + #endif + +@@ -142,6 +143,7 @@ + #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 + #endif + #if GCC_VERSION_AT_LEAST(4, 5, 0) ++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1 + #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1 + #endif + #if GCC_VERSION_AT_LEAST(4, 6, 0) +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index b9e46bc..876fa45 100644 +--- Source/WTF/wtf/TypeTraits.h ++++ Source/WTF/wtf/TypeTraits.h +@@ -75,6 +75,10 @@ namespace WTF { + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif ++#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES) ++ template<> struct IsInteger { static const bool value = true; }; ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + + template struct IsFloatingPoint { static const bool value = false; }; + template<> struct IsFloatingPoint { static const bool value = true; }; +--- Source/JavaScriptCore/API/JSStringRef.h.orig 2015-10-13 06:37:10.000000000 +0200 ++++ Source/JavaScriptCore/API/JSStringRef.h 2017-04-24 12:26:42.495345570 +0200 +@@ -32,6 +32,7 @@ + #include + #endif + #include /* for size_t */ ++#include + + #ifdef __cplusplus + extern "C" { +@@ -43,7 +44,7 @@ + @typedef JSChar + @abstract A Unicode character. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif +--- Source/WebKit2/Shared/API/c/WKString.h.orig 2015-10-13 06:37:12.000000000 +0200 ++++ Source/WebKit2/Shared/API/c/WKString.h 2017-04-24 12:27:33.432011867 +0200 +@@ -31,6 +31,7 @@ + #ifndef __cplusplus + #include + #endif ++#include + + #ifdef __cplusplus + extern "C" { +@@ -38,7 +39,7 @@ + + #if !defined(WIN32) && !defined(_WIN32) \ + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ +- typedef unsigned short WKChar; ++ typedef char16_t WKChar; + #else + typedef wchar_t WKChar; + #endif From 1f204a264da5984536fd7c23248edf7184d5a2b6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 29 Apr 2017 11:15:04 +0000 Subject: [PATCH 0012/1145] webkit2gtk: fix build against icu-59 (PLD Linux patch) --- srcpkgs/webkit2gtk/patches/icu59.patch | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/webkit2gtk/patches/icu59.patch diff --git a/srcpkgs/webkit2gtk/patches/icu59.patch b/srcpkgs/webkit2gtk/patches/icu59.patch new file mode 100644 index 0000000000..93a3c383a9 --- /dev/null +++ b/srcpkgs/webkit2gtk/patches/icu59.patch @@ -0,0 +1,38 @@ +--- Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100 ++++ Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200 +@@ -32,6 +32,7 @@ + #include + #endif + #include /* for size_t */ ++#include + + #ifdef __cplusplus + extern "C" { +@@ -46,7 +47,7 @@ + character. As with all scalar types, endianness depends on the underlying + architecture. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif +--- Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100 ++++ Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #ifndef __cplusplus + #include +@@ -39,7 +40,7 @@ + + #if !defined(WIN32) && !defined(_WIN32) \ + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ +- typedef unsigned short WKChar; ++ typedef char16_t WKChar; + #else + typedef wchar_t WKChar; + #endif From 426eb1ec169d3a29972bdcaacdb956c9021d29b7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 29 Apr 2017 11:45:15 +0000 Subject: [PATCH 0013/1145] phantomjs: fix build against icu-59 (PLD Linux patch) --- srcpkgs/phantomjs/patches/icu59.patch | 73 +++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 srcpkgs/phantomjs/patches/icu59.patch diff --git a/srcpkgs/phantomjs/patches/icu59.patch b/srcpkgs/phantomjs/patches/icu59.patch new file mode 100644 index 0000000000..0a641929ca --- /dev/null +++ b/srcpkgs/phantomjs/patches/icu59.patch @@ -0,0 +1,73 @@ +--- src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.h.orig 2015-10-13 06:37:10.000000000 +0200 ++++ src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.h 2017-04-24 12:26:42.495345570 +0200 +@@ -32,6 +32,7 @@ + #include + #endif + #include /* for size_t */ ++#include + + #ifdef __cplusplus + extern "C" { +@@ -43,7 +44,7 @@ + @typedef JSChar + @abstract A Unicode character. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif +--- src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.h.orig 2015-10-13 06:37:12.000000000 +0200 ++++ src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.h 2017-04-24 12:27:33.432011867 +0200 +@@ -31,6 +31,7 @@ + #ifndef __cplusplus + #include + #endif ++#include + + #ifdef __cplusplus + extern "C" { +@@ -38,7 +39,7 @@ + + #if !defined(WIN32) && !defined(_WIN32) \ + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ +- typedef unsigned short WKChar; ++ typedef char16_t WKChar; + #else + typedef wchar_t WKChar; + #endif +diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +index ead844f..e62cfd4 100644 +--- src/qt/qtwebkit/Source/WTF/wtf/Compiler.h ++++ src/qt/qtwebkit/Source/WTF/wtf/Compiler.h +@@ -61,6 +61,7 @@ + #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor) + #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums) + #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions) ++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS) + + #endif + +@@ -142,6 +143,7 @@ + #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 + #endif + #if GCC_VERSION_AT_LEAST(4, 5, 0) ++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1 + #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1 + #endif + #if GCC_VERSION_AT_LEAST(4, 6, 0) +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index b9e46bc..876fa45 100644 +--- src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h ++++ src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h +@@ -75,6 +75,10 @@ namespace WTF { + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif ++#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES) ++ template<> struct IsInteger { static const bool value = true; }; ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + + template struct IsFloatingPoint { static const bool value = false; }; + template<> struct IsFloatingPoint { static const bool value = true; }; From 61fbd710ae806b435bb89d0cc5aa936b3c43230a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 29 Apr 2017 16:59:30 +0000 Subject: [PATCH 0014/1145] poedit: fix build against icu-59 (Arch patch) --- srcpkgs/poedit/patches/icu59.patch | 11 +++++++++++ srcpkgs/poedit/template | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 srcpkgs/poedit/patches/icu59.patch diff --git a/srcpkgs/poedit/patches/icu59.patch b/srcpkgs/poedit/patches/icu59.patch new file mode 100644 index 0000000000..4a3e9313be --- /dev/null +++ b/srcpkgs/poedit/patches/icu59.patch @@ -0,0 +1,11 @@ +diff -upr poedit-2.0.1.orig/src/unicode_helpers.cpp poedit-2.0.1/src/unicode_helpers.cpp +--- src/unicode_helpers.cpp 2017-04-26 10:55:31.807183266 +0300 ++++ src/unicode_helpers.cpp 2017-04-26 11:02:47.373899526 +0300 +@@ -25,6 +25,7 @@ + + #include "unicode_helpers.h" + ++#include + #include "str_helpers.h" + + #include diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 0c924f05c8..c41dd05ca7 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -14,6 +14,8 @@ homepage="http://www.poedit.net/" distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz" checksum=8766874175b2221ef670d89b32f0fe900cde3e27e5dcb2c1b6cf6d01e8d56ff3 +CPPFLAGS="-DUCHAR_TYPE=uint16_t" + post_install() { vlicense COPYING } From d0b0a6089a33d1aa9a14db9cff120364bb3588d0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 12:42:00 +0000 Subject: [PATCH 0015/1145] nodejs: switch to bundled icu --- srcpkgs/nodejs/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 07c5ac09f8..dea483ad04 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -3,8 +3,8 @@ pkgname=nodejs version=7.9.0 revision=1 wrksrc=node-v${version} -hostmakedepends="pkg-config python icu" -makedepends="zlib-devel python-devel icu-devel +hostmakedepends="pkg-config python $(vopt_if icu icu)" +makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel)" depends="python" @@ -17,9 +17,10 @@ checksum=5cc131bb16f7ca688c29634a18b3c6a7816609a431a509f31baedf7caf25d626 # TODO: Fix cross compiling nocross="https://api.travis-ci.org/jobs/208411830/log.txt?deansi=true" -build_options="ssl libuv http_parser" +build_options="ssl libuv http_parser icu" desc_option_libuv="Enable shared libuv" desc_option_http_parser="Enable shared http-parser" +desc_option_icu="Enable shared icu" build_options_default="libuv http_parser" replaces="iojs>=0" @@ -35,7 +36,8 @@ do_configure() { *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}\n" ;; esac fi - ./configure --prefix=/usr --shared-zlib --with-intl=system-icu \ + ./configure --prefix=/usr --shared-zlib \ + $(vopt_if icu --with-intl=system-icu) \ $(vopt_if http_parser --shared-http-parser) \ $(vopt_if ssl --shared-openssl) \ $(vopt_if libuv --shared-libuv) ${_args} From 10b36da9b8a4c9feba45722bc43a868780f24cab Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:22 +0000 Subject: [PATCH 0016/1145] harfbuzz: rebuild against icu-59.1 --- srcpkgs/harfbuzz/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 3aa421b856..ecaeb38d25 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,7 +1,7 @@ # Template file for 'harfbuzz' pkgname=harfbuzz version=1.4.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2" hostmakedepends="automake libtool pkg-config glib-devel" From 3efb02959a9d919b57c0598f01e4727e02d7c905 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:18 +0000 Subject: [PATCH 0017/1145] protobuf-c: rebuild against protobuf-3.3.0 --- 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 7befccd775..c26b4f8216 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.2.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="protobuf-devel" From 9d0c6604ad5788169191a6f51e54db2e4beacd80 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:22 +0000 Subject: [PATCH 0018/1145] boost: rebuild against icu-59.1 --- srcpkgs/boost/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 2468f52bd7..8933616234 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,7 +1,7 @@ # Template file for 'boost' pkgname=boost version=1.64.0 -revision=1 +revision=2 wrksrc="${pkgname}_${version//\./_}" hostmakedepends="bzip2-devel icu-devel python-devel" makedepends="zlib-devel bzip2-devel icu-devel python-devel" From aee6bcdcbc405d18af6b32e6f74e187c9a0b909b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:25 +0000 Subject: [PATCH 0019/1145] libvisio: rebuild against icu-59.1 --- srcpkgs/libvisio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template index 52731988e7..5ed38785d9 100644 --- a/srcpkgs/libvisio/template +++ b/srcpkgs/libvisio/template @@ -1,7 +1,7 @@ # Template file for 'libvisio' pkgname=libvisio version=0.1.5 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="gperf pkg-config perl" makedepends="boost-devel librevenge-devel libxml2-devel icu-devel" From d656219dd9663a0f8a9797b6004aa10c754dd5ec Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:25 +0000 Subject: [PATCH 0020/1145] libcdr: rebuild against icu-59.1 --- srcpkgs/libcdr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template index f796dc93db..fd6e3cf6e6 100644 --- a/srcpkgs/libcdr/template +++ b/srcpkgs/libcdr/template @@ -1,7 +1,7 @@ # Template file for 'libcdr' pkgname=libcdr version=0.1.3 -revision=2 +revision=3 build_style=gnu-configure short_desc="Corel Draw file format importer library" maintainer="Enno Boland " From afb645779895ad7cc9dc1f24810bbea469700ddf Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:24 +0000 Subject: [PATCH 0021/1145] firebird: rebuild against icu-59.1 --- srcpkgs/firebird/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template index 636ab08072..6fcda1da5f 100644 --- a/srcpkgs/firebird/template +++ b/srcpkgs/firebird/template @@ -1,7 +1,7 @@ # Template file for 'firebird' pkgname=firebird version=2.5.6.27020 -revision=2 +revision=3 _build=0 wrksrc="${pkgname^}-${version}-${_build}" build_style=gnu-configure From f0fd6e24970937ca17cd76595e8c1e072f9f370b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:25 +0000 Subject: [PATCH 0022/1145] libe-book: rebuild against icu-59.1 --- srcpkgs/libe-book/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template index cc9706775d..4d663fe309 100644 --- a/srcpkgs/libe-book/template +++ b/srcpkgs/libe-book/template @@ -1,7 +1,7 @@ # Template file for 'libe-book' pkgname=libe-book version=0.1.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-werror" hostmakedepends="automake libtool gperf doxygen pkg-config" From e7b6518597a49cb452569bd19915165d9c3c5caf Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:25 +0000 Subject: [PATCH 0023/1145] libmspub: rebuild against icu-59.1 --- srcpkgs/libmspub/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template index 1807430ea7..afe8f2fb82 100644 --- a/srcpkgs/libmspub/template +++ b/srcpkgs/libmspub/template @@ -1,7 +1,7 @@ # Template file for 'libmspub' pkgname=libmspub version=0.1.2 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="icu-devel boost-devel librevenge-devel zlib-devel" From a8d7e5064687fa64036d2bd4c98a6c171fd5e6fa Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:28 +0000 Subject: [PATCH 0024/1145] firefox: rebuild against icu-59.1 --- srcpkgs/firefox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index f7b3b08363..cdf910e8b4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,7 +1,7 @@ # Template build file for 'firefox'. pkgname=firefox version=53.0 -revision=1 +revision=2 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" From 4dc16871ec559b8c4f93edbc74b3baa69033a7d1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:28 +0000 Subject: [PATCH 0025/1145] firefox-esr: rebuild against icu-59.1 --- srcpkgs/firefox-esr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 57ae6a66bd..8dc5ae3ac7 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -1,7 +1,7 @@ # Template build file for 'firefox-esr'. pkgname=firefox-esr version=45.9.0 -revision=1 +revision=2 wrksrc="firefox-${version}esr" short_desc="Lightweight gecko-based web browser" maintainer="Eivind Uggedal " From 238cd017adbe831650ec7d22ac0bdf9377dce7e6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:24 +0000 Subject: [PATCH 0026/1145] qt5: rebuild against icu-59.1 --- srcpkgs/qt5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index e810f6dd4f..a6026aadfd 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.8.0 -revision=5 +revision=6 wrksrc="qt-everywhere-opensource-src-${version}" build_style=gnu-configure homepage="http://qt.io/" From ed23070ee88433e6790369a5f59be1a35f07ff5e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:24 +0000 Subject: [PATCH 0027/1145] webkitgtk: rebuild against icu-59.1 --- srcpkgs/webkitgtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index d04418405f..9cac111622 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -1,7 +1,7 @@ # Template file for 'webkitgtk' pkgname=webkitgtk version=2.4.11 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-gtk-doc --disable-schemas-compile --enable-accelerated-compositing $(vopt_enable gir introspection) From d36e4e1455e32bc72018109b14919602153ae59e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:25 +0000 Subject: [PATCH 0028/1145] webkit2gtk: rebuild against icu-59.1 --- srcpkgs/webkit2gtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index abe7d1db9e..8585fef567 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,7 +1,7 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk version=2.16.1 -revision=1 +revision=2 wrksrc="webkitgtk-$version" build_style=cmake configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc" From 6b590e21bdcf2325823f49604b2226a5127869f0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:25 +0000 Subject: [PATCH 0029/1145] qt5-webkit: rebuild against icu-59.1 --- srcpkgs/qt5-webkit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index b1cc78e6b4..0e62cf6e7b 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webkit' pkgname=qt5-webkit version=5.8.0 -revision=3 +revision=4 wrksrc=qtwebkit-opensource-src-${version} hostmakedepends="bison flex gperf perl python ruby pkg-config" makedepends="libwebp-devel libxslt-devel libXcomposite-devel sqlite-devel libjpeg-turbo-devel From 2159896800e590f59d117278b7d39884c924cc60 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 2 May 2017 10:40:09 +0200 Subject: [PATCH 0030/1145] zim: update to 0.66. --- srcpkgs/zim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template index 773c1fa178..c9b79254d3 100644 --- a/srcpkgs/zim/template +++ b/srcpkgs/zim/template @@ -1,6 +1,6 @@ # Template file for 'zim' pkgname=zim -version=0.65 +version=0.66 revision=1 build_style=python2-module make_install_args="--skip-xdg-cmd" @@ -13,4 +13,4 @@ noarch=yes license="GPL-2" homepage="http://zim-wiki.org/" distfiles="http://zim-wiki.org/downloads/${pkgname}-${version}.tar.gz" -checksum=5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 +checksum=e8b53948097f211972713252f3a89b2957e3a63f55eb53587e2474dfc4cbf6c4 From b976d8766f5906b912b2d8d5077582c7797fcd33 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 2 May 2017 11:01:25 +0200 Subject: [PATCH 0031/1145] NetworkManager: silence the sv script. --- srcpkgs/NetworkManager/files/NetworkManager/run | 2 +- srcpkgs/NetworkManager/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run index 07bdf3d3f0..3b4d79cb29 100755 --- a/srcpkgs/NetworkManager/files/NetworkManager/run +++ b/srcpkgs/NetworkManager/files/NetworkManager/run @@ -5,4 +5,4 @@ sv check dbus >/dev/null || exit 1 [ ! -d /etc/NetworkManager/VPN ] && mkdir -m0755 -p /etc/NetworkManager/VPN [ ! -d /etc/NetworkManager/system-connections ] && mkdir -m0755 -p /etc/NetworkManager/system-connections [ ! -d /var/lib/NetworkManager ] && mkdir -m0700 -p /var/lib/NetworkManager -exec NetworkManager -n +exec NetworkManager -n > /dev/null 2>&1 diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 1298e5393b..92f363e7a3 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=1.6.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no From e8037b2cc372026a7dd0e3396e8d3db565048231 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 2 May 2017 16:19:58 +0200 Subject: [PATCH 0032/1145] corebird: update to 1.5. --- srcpkgs/corebird/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/corebird/template b/srcpkgs/corebird/template index a83419ebf3..8b855a8ea1 100644 --- a/srcpkgs/corebird/template +++ b/srcpkgs/corebird/template @@ -1,13 +1,13 @@ # Template build for 'corebird'. pkgname=corebird -version=1.4.2 +version=1.5 revision=1 short_desc="Native Gtk+ Twitter Client" maintainer="Enno Boland " license="GPL-3" homepage="http://corebird.baedert.org/" distfiles="https://github.com/baedert/corebird/archive/${version}.tar.gz" -checksum=776ff02e6b58b9d2019b141047eccf25615e3ac50a2092c665e15dabf4ec8e1f +checksum=39d451238ef30bf2caf5568d9c02c6e2a2f8b7256f19786ebcd6557adc815203 build_style=gnu-configure hostmakedepends="pkg-config intltool vala glib-devel gdk-pixbuf libgee08-devel automake libtool libxml2 gettext-devel" From e4b820348c8b983ac607d1e0af83ed35d5269134 Mon Sep 17 00:00:00 2001 From: yopito Date: Tue, 2 May 2017 22:14:08 +0200 Subject: [PATCH 0033/1145] burp2-server: update to 2.1.8 --- srcpkgs/burp2-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template index c40ad31c2d..d155b23a85 100644 --- a/srcpkgs/burp2-server/template +++ b/srcpkgs/burp2-server/template @@ -2,8 +2,8 @@ _desc="A network-based backup and restore program" pkgname=burp2-server -version=2.1.6 -revision=2 +version=2.1.8 +revision=1 short_desc="${_desc} - Server" maintainer="Pierre Bourgin " license="AGPL-3, BSD, GPL-2.1 and LGPL-2.1" @@ -11,7 +11,7 @@ homepage="http://burp.grke.org/" wrksrc="burp-${version}" patch_args='-Np1' distfiles="https://github.com/grke/burp/archive/${version}.tar.gz" -checksum=3917383e7313d59c5082c196eb4c509cc246db06105a19e02263b411818ff218 +checksum=d711a40838d5d5ace844cd68f7667c2dbf3995c81217837d4863941f172a9569 hostmakedepends="automake libtool perl" makedepends=" From 9ad16f3d51a8306aa38c0733db5e3b8a27534b1d Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Tue, 2 May 2017 14:34:02 -0600 Subject: [PATCH 0034/1145] google-chrome: update to 58.0.3029.96 --- srcpkgs/google-chrome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index e87c66ccd2..f4fa9ed2b3 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=58.0.3029.81 +_chromeVersion=58.0.3029.96 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" -checksum=baf2e0aa0727635ab086d3912a8974557d2fad8713870ac94f8deeccb292fbdc +checksum=15b943941c827ef1a4fa19cb5346b8ad4f3d07a66b0d0a6ba63a39274782661a do_extract() { mkdir -p ${DESTDIR} From d606b1474296b58ac38f71e878725c7785b0bc45 Mon Sep 17 00:00:00 2001 From: Brandon Wilson Date: Mon, 24 Apr 2017 20:41:19 +0900 Subject: [PATCH 0035/1145] New package: qgo-2.1.1 Closes: #6257 [via git-merge-pr] --- srcpkgs/qgo/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/qgo/template diff --git a/srcpkgs/qgo/template b/srcpkgs/qgo/template new file mode 100644 index 0000000000..be48543020 --- /dev/null +++ b/srcpkgs/qgo/template @@ -0,0 +1,17 @@ +# Template file for 'qgo' +pkgname=qgo +version=2.1.1 +revision=1 +build_style=qmake +hostmakedepends="git qt5-qmake qt5-tools" +makedepends="qt5-devel qt5-multimedia-devel pulseaudio-devel" +short_desc="Go/Weiqi/Baduk client that supports the IGS, GTP and SGF protocols" +maintainer='Brandon Wilson ' +license="GPL-2" +homepage="https://github.com/pzorin/qgo" +distfiles="https://github.com/xelxebar/${pkgname}/archive/v${version}.tar.gz" +checksum="e4a36f92abded9536e2bedb5748fd3aba6d150248b1b26a6985763dc4c15434e" + +if [ -n "${CROSS_BUILD}" ]; then + hostmakedepends+=" qt5-multimedia-devel" +fi From ac2f703ba4431a260404861936921738f9b473b8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:22 +0000 Subject: [PATCH 0036/1145] znc: rebuild against icu-59.1 --- srcpkgs/znc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template index a180e66554..6ba9cb184f 100644 --- a/srcpkgs/znc/template +++ b/srcpkgs/znc/template @@ -1,7 +1,7 @@ # Template file for 'znc' pkgname=znc version=1.6.5 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-python --enable-perl --enable-tcl --enable-cyrus" hostmakedepends="pkg-config perl" From 8e4a831fdc1bc45fa2188b11c600be60dd241b01 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:22 +0000 Subject: [PATCH 0037/1145] xerces-c: rebuild against icu-59.1 --- srcpkgs/xerces-c/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template index b9390547fb..bb49f2a280 100644 --- a/srcpkgs/xerces-c/template +++ b/srcpkgs/xerces-c/template @@ -1,7 +1,7 @@ # Template file for 'xerces-c' pkgname=xerces-c version=3.1.4 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libcurl-devel icu-devel" From c04ea2eb828289af081a8a6eacdee3f0ab672085 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:22 +0000 Subject: [PATCH 0038/1145] postfix: rebuild against icu-59.1 --- srcpkgs/postfix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index a1582d6902..b2d7b4f147 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,7 +1,7 @@ # Template file for 'postfix' pkgname=postfix version=3.2.0 -revision=3 +revision=4 short_desc="High-performance mail transport agent" maintainer="Juan RP " license="IBM Public License 1.0, BSD-alike" From e00bb936ebd91765c90e0c981d21dbd3f5f4bdc0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:23 +0000 Subject: [PATCH 0039/1145] php: rebuild against icu-59.1 --- srcpkgs/php/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index e71a1c5bb8..640e9bb9e6 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template build file for 'php' pkgname=php version=7.1.4 -revision=1 +revision=2 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " license="PHP" From 83de1e9195f53efae27afaab5385f4ee88dd8ad7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:23 +0000 Subject: [PATCH 0040/1145] openttd: rebuild against icu-59.1 --- srcpkgs/openttd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template index 9f63a3b94c..6bafb65b60 100644 --- a/srcpkgs/openttd/template +++ b/srcpkgs/openttd/template @@ -1,7 +1,7 @@ # Template file for 'openttd' pkgname=openttd version=1.7.0 -revision=1 +revision=2 _gfxver=0.5.4 _sfxver=0.2.3 build_style=gnu-configure From 77f89c1ebe0cae6d3f577f14ed59778103e3717b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:23 +0000 Subject: [PATCH 0041/1145] nodejs: rebuild against icu-59.1 --- srcpkgs/nodejs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index dea483ad04..4f38678ef8 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs version=7.9.0 -revision=1 +revision=2 wrksrc=node-v${version} hostmakedepends="pkg-config python $(vopt_if icu icu)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) From 1bd1d4772bea40b7ddedcea169c24c995c0f14e5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:23 +0000 Subject: [PATCH 0042/1145] mozjs38: rebuild against icu-59.1 --- srcpkgs/mozjs38/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template index 7277b0c73d..cc59c5cc95 100644 --- a/srcpkgs/mozjs38/template +++ b/srcpkgs/mozjs38/template @@ -1,7 +1,7 @@ # Template file for 'mozjs38' pkgname=mozjs38 version=38.8.0 -revision=2 +revision=3 wrksrc="mozilla-esr${version%.*.*}" build_wrksrc="js/src" build_style=gnu-configure From 8d59c1f4bf2cadbc17f06bb321f29fdd22ce2fee Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:23 +0000 Subject: [PATCH 0043/1145] icu4lua: rebuild against icu-59.1 --- srcpkgs/icu4lua/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template index 5375964766..1e9565d9c0 100644 --- a/srcpkgs/icu4lua/template +++ b/srcpkgs/icu4lua/template @@ -1,7 +1,7 @@ # Template file for 'icu4lua' pkgname=icu4lua version=0.2B -revision=4 +revision=5 create_wrksrc=yes build_style=gnu-makefile hostmakedepends="pkg-config unzip" From 2aa6e6ee7e80fa833f5a368cf30239034eab96d7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:23 +0000 Subject: [PATCH 0044/1145] dwdiff: rebuild against icu-59.1 --- srcpkgs/dwdiff/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template index fe316a2252..06c3d03868 100644 --- a/srcpkgs/dwdiff/template +++ b/srcpkgs/dwdiff/template @@ -1,7 +1,7 @@ # Template file for 'dwdiff' pkgname=dwdiff version=2.1.1 -revision=1 +revision=2 build_style=gnu-configure makedepends="icu-devel" depends="diffutils" From 524d32ce2fb31bc1638f31b6eb53c99511b7f6dd Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:24 +0000 Subject: [PATCH 0045/1145] couchdb: rebuild against icu-59.1 --- srcpkgs/couchdb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template index 690b4e9e26..a2dbf6b2c7 100644 --- a/srcpkgs/couchdb/template +++ b/srcpkgs/couchdb/template @@ -1,7 +1,7 @@ # Template file for 'couchdb' pkgname=couchdb version=1.6.1 -revision=8 +revision=9 wrksrc="apache-couchdb-$version" build_style=gnu-configure conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini" From 9f10fc5d823e214c758764a448a36536bec9721a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:24 +0000 Subject: [PATCH 0046/1145] R: rebuild against icu-59.1 --- srcpkgs/R/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/R/template b/srcpkgs/R/template index a78be87624..90fd541867 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,7 +1,7 @@ # Template file for 'R' pkgname=R version=3.4.0 -revision=1 +revision=2 nocross=yes build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R From 7b241917b47115d4bf9973b6237979fc929f3b25 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:24 +0000 Subject: [PATCH 0047/1145] swift: rebuild against icu-59.1 --- srcpkgs/swift/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/swift/template b/srcpkgs/swift/template index 8929ea10ff..4d0414ea04 100644 --- a/srcpkgs/swift/template +++ b/srcpkgs/swift/template @@ -1,7 +1,7 @@ # Template file for 'swift' pkgname=swift version=2.2.1 -revision=2 +revision=3 nocross=yes nopie=yes depends="clang libswift" From cd5101913160efa328dce40f06b42a4caf237687 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:26 +0000 Subject: [PATCH 0048/1145] tracker: rebuild against icu-59.1 --- srcpkgs/tracker/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index 22c8bf059b..dcc3619f96 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,7 +1,7 @@ # Template file for 'tracker' pkgname=tracker version=1.12.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-libflac --enable-libvorbis --disable-unit-tests --enable-libtiff --disable-static --enable-network-manager From ce163c967769fc887d434031b174faa68bf8b46f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:26 +0000 Subject: [PATCH 0049/1145] thunderbird: rebuild against icu-59.1 --- srcpkgs/thunderbird/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index e3bc119d4c..358d73dd36 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,7 +1,7 @@ # Template build file for 'thunderbird'. pkgname=thunderbird version=52.1.0 -revision=1 +revision=2 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" From 4a52f7edc7ed897411bfb5a6590134c21d4b3011 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:26 +0000 Subject: [PATCH 0050/1145] tesseract-ocr: rebuild against icu-59.1 --- srcpkgs/tesseract-ocr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template index 3f041b8fd5..6979f07ae6 100644 --- a/srcpkgs/tesseract-ocr/template +++ b/srcpkgs/tesseract-ocr/template @@ -1,7 +1,7 @@ # Template file for 'tesseract-ocr' pkgname=tesseract-ocr version=3.05.00 -revision=3 +revision=4 wrksrc=tesseract-${version} _tessdata_ver=8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40 build_style=gnu-configure From b5b4f71c729a19f18a495fe49e4c21ab72a04b00 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:26 +0000 Subject: [PATCH 0051/1145] rspamd: rebuild against icu-59.1 --- srcpkgs/rspamd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index 9cd955149b..fae1fb0f33 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,7 +1,7 @@ # Template file for 'rspamd' pkgname=rspamd version=1.5.6 -revision=1 +revision=2 build_style=cmake configure_args=" -DRSPAMD_USER=rspamd From c86cf97960e3e10dc035721a16f6bc9fa9e52799 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:26 +0000 Subject: [PATCH 0052/1145] poedit: rebuild against icu-59.1 --- srcpkgs/poedit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index c41dd05ca7..8e55f03a82 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit version=2.0.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-wx-config=wx-config-3.0" hostmakedepends="pkg-config" From 84347573a336b77a427b941ba5cb833c595736d2 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:27 +0000 Subject: [PATCH 0053/1145] phantomjs: rebuild against icu-59.1 --- srcpkgs/phantomjs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/phantomjs/template b/srcpkgs/phantomjs/template index e9a572a06e..2c36217ce8 100644 --- a/srcpkgs/phantomjs/template +++ b/srcpkgs/phantomjs/template @@ -1,7 +1,7 @@ # Template file for 'phantomjs' pkgname=phantomjs version=2.0.0 -revision=7 +revision=8 hostmakedepends="unzip flex ruby gperf python perl pkg-config" makedepends=" fontconfig-devel icu-devel libressl-devel libpng-devel From 5113d54d26488fe8e865234b70294d427c775b90 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:27 +0000 Subject: [PATCH 0054/1145] ncmpcpp: rebuild against icu-59.1 --- srcpkgs/ncmpcpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index e4bc29281c..becd8dc2fa 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.7.7 -revision=4 +revision=5 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode From a309ad466373530482b5536cd22eedf8ccf79327 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:27 +0000 Subject: [PATCH 0055/1145] mpd: rebuild against icu-59.1 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index a325f3090c..740c1305d4 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.20.6 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder From 285541005a23c0a881c781c1646931728bef729b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:27 +0000 Subject: [PATCH 0056/1145] icecat: rebuild against icu-59.1 --- srcpkgs/icecat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template index 4fe00efd17..3ea76e8bf1 100644 --- a/srcpkgs/icecat/template +++ b/srcpkgs/icecat/template @@ -1,7 +1,7 @@ # Template build file for 'icecat'. pkgname=icecat version=52.0.2 -revision=1 +revision=2 short_desc="GNU version of the Firefox browser" maintainer="Jürgen Buchmüller " homepage="https://www.gnu.org/software/${pkgname}/" From 49a2f59404691e3b848807264ce56315ea0342e9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:27 +0000 Subject: [PATCH 0057/1145] freshplayerplugin: rebuild against icu-59.1 --- srcpkgs/freshplayerplugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index 862f896a28..3309630700 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -1,7 +1,7 @@ # Template file for 'freshplayerplugin' pkgname=freshplayerplugin version=0.3.6 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config ragel" makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel From 3202bbb1d01f05fd1c318dc6fae77ee1e4332a8f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:28 +0000 Subject: [PATCH 0058/1145] evolution-data-server: rebuild against icu-59.1 --- srcpkgs/evolution-data-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 60d55b9202..f081527c9a 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,7 +1,7 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server version=3.24.1 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF" hostmakedepends="pkg-config intltool flex glib-devel gperf $(vopt_if gir gobject-introspection)" From 2ea7db7f2772aacf2438cc00898a484d682aa790 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:28 +0000 Subject: [PATCH 0059/1145] epiphany: rebuild against icu-59.1 --- srcpkgs/epiphany/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index f645554000..2c001cd0e5 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany version=3.24.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils From 0dbc65318959830c7f7872dfdc2b9d4c75676d48 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:28 +0000 Subject: [PATCH 0060/1145] calligra: rebuild against icu-59.1 --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 924bf3f2e5..f988bd847c 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=2.9.11 -revision=11 +revision=12 build_style=cmake configure_args="-Wno-dev -DBUILD_active=OFF -DWITH_Soprano=OFF -DBUILD_krita=OFF" hostmakedepends="automoc4 perl pkg-config eigen3.2" From 18d3602747a35d73124df2e54208d259009a83d4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:28 +0000 Subject: [PATCH 0061/1145] calibre: rebuild against icu-59.1 --- srcpkgs/calibre/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index c98ed4256c..3cdf2955de 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre version=2.83.0 -revision=1 +revision=2 hostmakedepends="qt5-qmake python-devel pkg-config python-dateutil python-lxml python-Pillow python-PyQt5-webkit python-apsw python-cssutils python-CherryPy" From 8a54c90446791416eb440e0f3e94b3d2b534be40 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 22 Apr 2017 21:16:29 +0000 Subject: [PATCH 0062/1145] libreoffice: rebuild against icu-59.1 --- srcpkgs/libreoffice/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index df865e92e8..63e736b90d 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=5.2.5.1 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-werror" nopie=yes From 7dbd6b6224ea2039ed68135d18967adf5d4b96ef Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:17 +0000 Subject: [PATCH 0063/1145] bitcoin: rebuild against protobuf-3.3.0 --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index fecd82eb63..f043da9ae0 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.13.1 -revision=4 +revision=5 create_wrksrc=yes hostmakedepends="pkg-config yasm" makedepends="db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel" From 86ea258605c31c11103533a5c1a7904b90d6a0d4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:18 +0000 Subject: [PATCH 0064/1145] clementine: rebuild against protobuf-3.3.0 --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 892deb2747..5c13380924 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=5 +revision=6 patch_args="-Np1" build_style=cmake hostmakedepends="sparsehash pkg-config" From 040c9de8f9f98360d71cf822312424c2f41097ac Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:18 +0000 Subject: [PATCH 0065/1145] libcompizconfig: rebuild against protobuf-3.3.0 --- srcpkgs/libcompizconfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index af7d61e433..af04c9a607 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -1,7 +1,7 @@ # Template file for 'libcompizconfig' of Compiz Reloaded pkgname=libcompizconfig version=0.8.12.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" From 009c8b90487210b6a62429f4e8a3d7813c7cd8c3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:18 +0000 Subject: [PATCH 0066/1145] litecoin: rebuild against protobuf-3.3.0 --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index bb31a6d94b..05f3a718f2 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.13.2.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" From 8b21cb61199e3ee6b3c3ea9d1321b3824e282294 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:18 +0000 Subject: [PATCH 0067/1145] mosh: rebuild against protobuf-3.3.0 --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 4acd5178d9..91bad3958a 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config protobuf-devel" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" From 592af772be8b3b219d609edc773e5d87e15b1abc Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:18 +0000 Subject: [PATCH 0068/1145] mumble: rebuild against protobuf-3.3.0 --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 87b70eeb7f..dc7ef892db 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.2.19 -revision=3 +revision=4 hostmakedepends="pkg-config" makedepends=" libcap-devel Ice-devel protobuf-devel libXi-devel qt-devel libressl-devel From 81b929af9fc6eaf3add413f7a8db1c3c974a02b1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 1 May 2017 10:48:19 +0000 Subject: [PATCH 0069/1145] zbackup: rebuild against protobuf-3.3.0 --- srcpkgs/zbackup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index e879ee3d64..e5eb9eec3e 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=4 +revision=5 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" From aa3dc687b7ae43d1837f03aae0e6b085a31eb061 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 2 May 2017 07:48:00 +0000 Subject: [PATCH 0070/1145] mixxx: rebuild against protobuf-3.3.0 --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 3585021c39..ae9749100e 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.0.0 -revision=3 +revision=4 hostmakedepends="scons pkg-config" makedepends="portaudio-devel libusb-devel libmad-devel protobuf-devel libid3tag-devel glu-devel taglib-devel opus-devel portmidi-devel From c8d7a9cd31dd4281379a12d0580395d3c68c2207 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 2 May 2017 20:59:52 +0000 Subject: [PATCH 0071/1145] exiftool: update to 10.51. --- srcpkgs/exiftool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 5a650cde7f..372b0bee73 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.50 +version=10.51 revision=1 noarch=yes wrksrc="Image-ExifTool-${version}" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" license="Artistic, GPL-1" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" -checksum=339dd8f771f673fd6c448f4a4b36cf50fe8e3bf884da95aef6cec1d182c0885b +checksum=0a9d4cec4700e974df4ec5ff537aa2f783399a0ee595e646d665144198073fcf From 9b952d537aa7602462f3c20219395cddfe97a6f2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 3 May 2017 09:03:49 +0200 Subject: [PATCH 0072/1145] mumble: nocross for now --- srcpkgs/mumble/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index dc7ef892db..87d5ae9345 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -15,6 +15,7 @@ homepage="http://mumble.sourceforge.net/" license="BSD" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 +nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/2488/steps/shell_3/logs/stdio do_configure() { # Needs bundled celt for some reason From 914ad32edff63a3105614d2803ba09726ebde24a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 3 May 2017 08:29:14 +0000 Subject: [PATCH 0073/1145] libressl: update to 2.5.4. --- srcpkgs/libressl/patches/CVE-2017-8301.patch | 28 -------------------- srcpkgs/libressl/template | 6 ++--- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/libressl/patches/CVE-2017-8301.patch diff --git a/srcpkgs/libressl/patches/CVE-2017-8301.patch b/srcpkgs/libressl/patches/CVE-2017-8301.patch deleted file mode 100644 index 634fd904da..0000000000 --- a/srcpkgs/libressl/patches/CVE-2017-8301.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e4ea34f17cdd3b81ab1b6bd4df3712fbe49dc136 Mon Sep 17 00:00:00 2001 -From: beck <> -Date: Fri, 28 Apr 2017 23:03:58 +0000 -Subject: [PATCH] Revert previous change that forced consistency between return - value and error code, since this breaks the documented API. Under certain - circumstances this will result in incorrect successful certiticate - verification (where a user supplied callback always returns 1, and later code - checks the error code to potentially abort post verification) - ---- crypto/x509/x509_vfy.c -+++ crypto/x509/x509_vfy.c -@@ -541,15 +541,7 @@ X509_verify_cert(X509_STORE_CTX *ctx) - /* Safety net, error returns must set ctx->error */ - if (ok <= 0 && ctx->error == X509_V_OK) - ctx->error = X509_V_ERR_UNSPECIFIED; -- -- /* -- * Safety net, if user provided verify callback indicates sucess -- * make sure they have set error to X509_V_OK -- */ -- if (ctx->verify_cb != null_callback && ok == 1) -- ctx->error = X509_V_OK; -- -- return(ctx->error == X509_V_OK); -+ return ok; - } - - /* Given a STACK_OF(X509) find the issuer of cert (if any) diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 2824de0b6c..8529b5fc2f 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,7 +1,7 @@ # Template file for 'libressl' pkgname=libressl -version=2.5.3 -revision=2 +version=2.5.4 +revision=1 bootstrap=yes build_style=gnu-configure short_desc="Version of the TLS/crypto stack forked from OpenSSL" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="OpenSSL-License, SSLeay-License, ISC" homepage="http://www.libressl.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz" -checksum=14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30 +checksum=107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa provides="openssl-${version}_${revision}" replaces="openssl>=0" From bbc8911288fe12676169a8016375d92feaef578b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 3 May 2017 08:34:48 +0000 Subject: [PATCH 0074/1145] js: aarch64 broken --- srcpkgs/js/template | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/srcpkgs/js/template b/srcpkgs/js/template index 936c499eb9..4d2ca73282 100644 --- a/srcpkgs/js/template +++ b/srcpkgs/js/template @@ -13,6 +13,13 @@ maintainer="Juan RP " distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz" checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 +case "$XBPS_TARGET_MACHINE" in + aarch64*) + # ./assembler/jit/ExecutableAllocator.h:395:6: error: #error "The cacheFlush support is missing on this platform." + broken="https://build.voidlinux.eu/builders/aarch64_builder/builds/2509/steps/shell_3/logs/stdio" + ;; +esac + do_configure() { local _args From 412bd95bc497c613e9eac9fcf9cd6ef5357fc6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 3 May 2017 10:40:43 +0200 Subject: [PATCH 0075/1145] mkvtoolnix: re-enable mkvtoolnix-gui The package now needs qt5-multimedia-devel to build the GUI component. Closes #6317 --- srcpkgs/mkvtoolnix/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index f5fa99b0ae..b5d1d0fcbb 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,12 +1,12 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=11.0.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--without-curl --with-docbook-xsl-root=/usr/share/xsl/docbook" +configure_args="--without-curl --with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt" hostmakedepends="autoconf pkg-config ruby libxslt docbook-xsl" makedepends="libebml-devel libmatroska-devel boost-devel libvorbis-devel - libflac-devel file-devel qt5-devel qt5-tools-devel" + libflac-devel file-devel qt5-devel qt5-tools-devel qt5-multimedia-devel" short_desc="Create, alter and inspect Matroska videos" maintainer="Jürgen Buchmüller " license="GPL-2" From ff76ae44ec52db8f1abcb734cfeda9b44c3912b3 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 2 May 2017 09:44:37 +0200 Subject: [PATCH 0076/1145] etcd: update to 3.1.7. --- srcpkgs/etcd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index 2ca944e127..38542697f9 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,22 +1,22 @@ # Template file for 'etcd' pkgname=etcd -version=3.1.5 +version=3.1.7 revision=1 build_style=go short_desc="Distributed reliable key-value store" maintainer="Andrea Brancaleoni " license="Apache-2.0" -hostmakedepends="git" +hostmakedepends="git glide" go_import_path="github.com/coreos/etcd" homepage="https://coreos.com/etcd/docs/latest/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=d9019b45df696f1dae286a511bd28b03751e37343c752380318e2a13ac994318 +checksum=41cbfc6744c76aa1735e11c82e6f6ff03c88dc88810938cf6eb80930dc994b2a conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" pre_build() { - sed -i '/SupportPackageIsVersion3/d' etcdserver/etcdserverpb/rpc.pb.go + glide install } post_build() { From 97117b39178a82b301e0896ce9d1475f16ea9e17 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 3 May 2017 11:40:55 +0200 Subject: [PATCH 0077/1145] New package: docker-gc-0.0.20170125 --- srcpkgs/docker-gc/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/docker-gc/template diff --git a/srcpkgs/docker-gc/template b/srcpkgs/docker-gc/template new file mode 100644 index 0000000000..87d828eecf --- /dev/null +++ b/srcpkgs/docker-gc/template @@ -0,0 +1,20 @@ +# Template file for 'docker-gc' +pkgname=docker-gc +version=0.0.20170125 +revision=1 +_commit=f460c1d2d50b652e156ffe68489362bedc9278a5 +wrksrc="$pkgname-$_commit" +depends="docker" +short_desc="Docker garbage collection of containers and images" +maintainer="Andrea Brancaleoni " +license="GPL-3" +homepage="https://github.com/spotify/docker-gc" +distfiles="$homepage/archive/$_commit.tar.gz" +checksum=82ebc5eab842b41282c10e5cf1a82af521e4aa46e6d0fb9bddb2565cef5984a2 + +make_dirs=" +/var/lib/docker-gc 0775 root docker" + +do_install() { + vbin docker-gc +} From 968f9cf5fb865c5298712eeb134dac7762802ab5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 3 May 2017 10:10:38 +0000 Subject: [PATCH 0078/1145] litecoin: musl broken --- srcpkgs/litecoin/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 05f3a718f2..ad716ddb20 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -16,6 +16,10 @@ distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar. checksum=cb07472b32f713bb37ea37cfcc336816a38c8684844c259c89203ed9fe54f85b nocross=yes +case "$XBPS_TARGET_MACHINE" in + *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2372/steps/shell_3/logs/stdio" +esac + pre_configure() { NOCONFIGURE=1 ./autogen.sh } From 0f22895f64bc0099fe906a120f43af9b0a8abca0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 3 May 2017 10:13:04 +0000 Subject: [PATCH 0079/1145] etcd: broken --- srcpkgs/etcd/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index 38542697f9..9e30fe9c1b 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -15,6 +15,8 @@ conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" +broken="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2422/steps/shell_3/logs/stdio" + pre_build() { glide install } From b422fb3ba103f669a2e22ca96ca00d896cf0d97b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 3 May 2017 11:53:59 +0000 Subject: [PATCH 0080/1145] meson: update to 0.40.1. --- srcpkgs/meson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index ad4e7af482..1a88249469 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.40.0 +version=0.40.1 revision=1 noarch=yes build_style=python3-module @@ -12,4 +12,4 @@ license="Apache-2.0" maintainer="Dylan Katz " homepage="http://mesonbuild.com" distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz" -checksum=34bab8104df65f78b89c8d27d074ec6a426cc97cdea2b139892de2545904609a +checksum=b90c25088e074130820fd3870e60829085384d78f36c0e3f34d626047d8e867a From 293764bf4faa44345cba91f11dd3ab03095f1e0d Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 3 May 2017 15:17:41 +0200 Subject: [PATCH 0081/1145] etcd: works for clean build --- srcpkgs/etcd/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index 9e30fe9c1b..adeb77d0f0 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -15,14 +15,17 @@ conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" -broken="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2422/steps/shell_3/logs/stdio" +do_build() { + if [[ "${go_get}" != "yes" ]]; then + local path="${GOPATH}/src/${go_import_path}" + mkdir -p "$(dirname ${path})" + ln -fs $PWD "${path}" + fi -pre_build() { glide install -} - -post_build() { - go get -x ${go_import_path}/etcdctl + go_package=${go_package:-$go_import_path} + go get -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} + go get -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_import_path}/etcdctl } post_install() { From 1f427c9aa48e741590db465f6752c82a1ff5d687 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 3 May 2017 16:59:06 +0200 Subject: [PATCH 0082/1145] openjdk: revert version scheme change this broke both the version check and the actual build as the newer version wasn't recognized as the bigger version number. --- srcpkgs/openjdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template index 0bbda84167..4890da4f11 100644 --- a/srcpkgs/openjdk/template +++ b/srcpkgs/openjdk/template @@ -11,9 +11,9 @@ _main_ver=${_java_ver}u${_jdk_update} _openjdk_version="openjdk-1.8.0_${_jdk_update}" pkgname=openjdk -version="jdk${_java_ver}u${_jdk_update}b${_jdk_build}" +version="${_java_ver}u${_jdk_update}b${_jdk_build}" revision=1 -_repo_ver="${version/b/-b}" +_repo_ver="jdk${version/b/-b}" nocross=yes nopie=yes wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/ From cfa641ec6e7a299a0c6c94c2f5b00d317d2823e9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 3 May 2017 16:44:30 +0200 Subject: [PATCH 0083/1145] Revert "openjdk: fix update check with new versioning scheme" This reverts commit f642132e152ffff73e91497125068c0e5f6566cc. --- srcpkgs/openjdk/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk/update b/srcpkgs/openjdk/update index 1103e66dda..b7130975e8 100644 --- a/srcpkgs/openjdk/update +++ b/srcpkgs/openjdk/update @@ -1,2 +1,2 @@ site="http://hg.openjdk.java.net/jdk8u/jdk8u/tags" -pattern='\Kjdk8u\d+\-b\d+' +pattern='jdk\K8u\d+' From 13c4cd6ff27d5d10c21df12a771b83a1072dd067 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 3 May 2017 17:10:09 +0200 Subject: [PATCH 0084/1145] fwup: update to 0.14.0. --- srcpkgs/fwup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 465e3564c4..5168907129 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,6 +1,6 @@ # Template file for 'fwup' pkgname=fwup -version=0.13.0 +version=0.14.0 revision=1 build_style=gnu-configure configure_args="ac_vc_func_open_memstream=yes" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=96f55ae5cbcac108d07b10f47329b44a02614d13526d0ad09621d8eea0c9d1f5 +checksum=4ccd0ae1d3db46f25cb3df6f1b60a2e9bdba687e60b37b07d947eab835023ec9 if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" From 314bd904a7b3c0605b79da60fc2a349c926c97b7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 3 May 2017 17:49:08 +0200 Subject: [PATCH 0085/1145] dmenu: update to 4.7. --- srcpkgs/dmenu/files/config.h | 20 +++++++++++++------- srcpkgs/dmenu/template | 6 +++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/srcpkgs/dmenu/files/config.h b/srcpkgs/dmenu/files/config.h index a9122f73ad..1edb647789 100644 --- a/srcpkgs/dmenu/files/config.h +++ b/srcpkgs/dmenu/files/config.h @@ -6,12 +6,18 @@ static int topbar = 1; /* -b option; if 0, dmenu appears a static const char *fonts[] = { "monospace:size=10" }; -static const char *prompt = NULL; /* -p option; prompt to the elft of input field */ -static const char *normbgcolor = "#222222"; /* -nb option; normal background */ -static const char *normfgcolor = "#bbbbbb"; /* -nf option; normal foreground */ -static const char *selbgcolor = "#005577"; /* -sb option; selected background */ -static const char *selfgcolor = "#eeeeee"; /* -sf option; selected foreground */ -static const char *outbgcolor = "#00ffff"; -static const char *outfgcolor = "#000000"; +static const char *prompt = NULL; /* -p option; prompt to the left of input field */ +static const char *colors[SchemeLast][2] = { + /* fg bg */ + [SchemeNorm] = { "#bbbbbb", "#222222" }, + [SchemeSel] = { "#eeeeee", "#005577" }, + [SchemeOut] = { "#000000", "#00ffff" }, +}; /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ static unsigned int lines = 0; + +/* + * Characters not considered part of a word while deleting words + * for example: " /?\"&[]" + */ +static const char worddelimiters[] = " "; diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template index 3ad9bbdc60..bfd67d3a8b 100644 --- a/srcpkgs/dmenu/template +++ b/srcpkgs/dmenu/template @@ -1,14 +1,14 @@ # Template file for 'dmenu' pkgname=dmenu -version=4.6 -revision=2 +version=4.7 +revision=1 makedepends="libXinerama-devel libXft-devel freetype-devel" short_desc="A generic menu for X" maintainer="Juan RP " license="MIT" homepage="http://tools.suckless.org/dmenu/" distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" -checksum=4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 +checksum=a75635f8dc2cbc280deecb906ad9b7594c5c31620e4a01ba30dc83984881f7b9 build_options="fuzzymatch" desc_option_fuzzymatch="Enable Fuzzymatch support" From c9da276a3a07ec015b7ce402721f549dfeb6fa1e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 May 2017 19:56:42 +0200 Subject: [PATCH 0086/1145] linux4.10: update to 4.10.14. --- srcpkgs/linux4.10/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.10/template b/srcpkgs/linux4.10/template index acce101e87..3851b6e370 100644 --- a/srcpkgs/linux4.10/template +++ b/srcpkgs/linux4.10/template @@ -1,6 +1,6 @@ # Template file for 'linux4.10' pkgname=linux4.10 -version=4.10.13 +version=4.10.14 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=dab0291aeeb68ad76056aced6a9011d5dd098bf9503f5b7cea1058b0ff78d4ef +checksum=d3b3b8c9f25b73f623b55ae9a18bb7b0e6d8b55a4e62d03ec6e0761cd23f33dd nodebug=yes # -dbg package is generated below manually nostrip=yes From 77b5af0e6593683789eda383104837d4bf638098 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 3 May 2017 20:11:18 +0200 Subject: [PATCH 0087/1145] mumble: fix cross --- srcpkgs/mumble/template | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 87d5ae9345..60f68db742 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -2,7 +2,7 @@ pkgname=mumble version=1.2.19 revision=4 -hostmakedepends="pkg-config" +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 @@ -15,21 +15,32 @@ homepage="http://mumble.sourceforge.net/" license="BSD" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 -nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/2488/steps/shell_3/logs/stdio do_configure() { + if [ "$CROSS_BUILD" ]; then + for i in ${XBPS_CROSS_BASE}/usr/include/Qt*; do + CXXFLAGS+=" -I$i" + done + fi # Needs bundled celt for some reason - qmake -recursive main.pro \ + qmake-qt4 -recursive main.pro \ CONFIG+="bundled-celt no-bundled-opus no-update no-bundled-speex no-g15 \ no-xevie pulseaudio no-embed-qt-translations" \ - DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" + DEFINES+="PLUGIN_PATH=/usr/lib/mumble" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ + PREFIX=/usr \ + LIB=/usr/lib \ + QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" # qmake-qt4 ignores CXXFLAGS and LDFLAGS thus patch the Makefiles sed -i */Makefile* */*/Makefile* \ -e "s;^\(LFLAGS.*=.*\);& $LDFLAGS;" \ -e "s;^\(CXXFLAGS.*=.*\);& $CXXFLAGS;" } do_build() { - make ${makejobs} release + make ${makejobs} release \ + CC="$CC" CXX="$CXX" LINK="$CXX" } do_install() { vlicense LICENSE From c0fe5647c0f74c8e0ad9238ab821b59e35c9aade Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 3 May 2017 20:11:51 +0200 Subject: [PATCH 0088/1145] New package: btrbk-0.25.0 --- srcpkgs/btrbk/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/btrbk/template diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template new file mode 100644 index 0000000000..d3e153ad38 --- /dev/null +++ b/srcpkgs/btrbk/template @@ -0,0 +1,14 @@ +# Template file for 'btrbk' +pkgname=btrbk +version=0.25.0 +revision=1 +build_style=gnu-makefile +depends="perl btrfs-progs openssh" +short_desc="backup tool for btrfs subvolumes" +maintainer="Enno Boland " +license="GPL-3" +homepage="http://digint.ch/btrbk" +distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz" +checksum=21b77473e033ee4886e48802cb92c4a958465534169aee4b7238826a89a63650 +make_install_args="BINDIR=/usr/bin" +conf_files="/etc/btrbk/*" From d86a5ded7df2384ed8e2b26a9507b8fa2759eb5e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 May 2017 09:15:38 +0200 Subject: [PATCH 0089/1145] man-pages: update to 4.11. --- srcpkgs/man-pages/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template index 5a5e81000c..fe9703e3d6 100644 --- a/srcpkgs/man-pages/template +++ b/srcpkgs/man-pages/template @@ -1,6 +1,6 @@ # Template file for 'man-pages' pkgname=man-pages -version=4.10 +version=4.11 revision=1 noarch=yes short_desc="Linux Documentation Project (LDP) manual pages" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://man7.org/linux/man-pages/index.html" distfiles="${KERNEL_SITE}/docs/man-pages/$pkgname-$version.tar.xz" -checksum=7395dfc391d545385a998d23df9accb60f2020451c53940eaf8a07b6ea8a63fa +checksum=adde80495f5efb26d077f4e5309bafdc4859e080b7529263720f7cb5f403f524 do_install() { make all prefix=${DESTDIR}/usr From 67fa37e5a0011f96b395c60bb0c21337ea76b46f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 4 May 2017 07:36:39 +0000 Subject: [PATCH 0090/1145] brltty: rebuild against icu-59.1 --- srcpkgs/brltty/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index 27b9401227..659beea292 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,7 +1,7 @@ # Template file for 'brltty' pkgname=brltty version=5.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3-Cython python3 xproto" makedepends="ncurses-devel alsa-lib-devel gpm-devel at-spi2-core-devel dbus-devel glib-devel xproto icu-devel python3-devel libbluetooth-devel" From 2ba3c4c50cdcf73203ef4f0a6f59e87a83aa4a84 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 4 May 2017 07:55:12 +0000 Subject: [PATCH 0091/1145] protobuf: musl fix (Alpine patch) --- srcpkgs/protobuf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index b71885c07d..47c54ef6ef 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,7 +1,7 @@ # Template file for 'protobuf' pkgname=protobuf version=3.3.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" From f1048fb91d834fa61201f3dfda7cfe67f6f17a88 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 4 May 2017 07:55:39 +0000 Subject: [PATCH 0092/1145] litecoin: unbreak musl --- srcpkgs/litecoin/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index ad716ddb20..05f3a718f2 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -16,10 +16,6 @@ distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar. checksum=cb07472b32f713bb37ea37cfcc336816a38c8684844c259c89203ed9fe54f85b nocross=yes -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2372/steps/shell_3/logs/stdio" -esac - pre_configure() { NOCONFIGURE=1 ./autogen.sh } From dc89f84c384355362a002a3c43a567c0b8317a45 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 4 May 2017 07:59:34 +0000 Subject: [PATCH 0093/1145] protobuf: actually add the patch... --- srcpkgs/protobuf/patches/musl-fix.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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 0000000000..5c3b88b7c2 --- /dev/null +++ b/srcpkgs/protobuf/patches/musl-fix.patch @@ -0,0 +1,24 @@ +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)); From 3f60389db4cb6e3c47c447c6404f4fc38666a09b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 4 May 2017 08:01:59 +0000 Subject: [PATCH 0094/1145] protobuf: revbump for previous --- srcpkgs/protobuf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 47c54ef6ef..62f56c1cb5 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,7 +1,7 @@ # Template file for 'protobuf' pkgname=protobuf version=3.3.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel" From 271222cc62b618e055f0fc50a2b42dd20c9abc7a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 4 May 2017 08:09:03 +0000 Subject: [PATCH 0095/1145] neovim: disable bundled libtermkey Fixes #6309 --- srcpkgs/neovim/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 0d3b380632..d944097fb7 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,9 +1,9 @@ # Template file for 'neovim' pkgname=neovim version=0.2.0 -revision=1 +revision=2 build_style=cmake -configure_args="-DENABLE_JEMALLOC=0" +configure_args="-DENABLE_JEMALLOC=0 -DUSE_BUNDLED_LIBTERMKEY=OFF" hostmakedepends="gperf lua51-lpeg lua51-mpack lua51-BitOp" makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel" short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs" From f20a2cef5089a421e86c36072c3d539dc88dc20d Mon Sep 17 00:00:00 2001 From: demiaster Date: Thu, 4 May 2017 10:12:22 +0200 Subject: [PATCH 0096/1145] Adapta: update to 3.90.0.139. --- srcpkgs/Adapta/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index 0943ecdcf0..78949ffb83 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,6 +1,6 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.90.0.108 +version=3.90.0.139 revision=1 build_style=gnu-configure wrksrc="adapta-gtk-theme-$version" @@ -11,7 +11,7 @@ maintainer="demiaster " license="GPL-2" homepage="https://github.com/tista500/$pkgname" distfiles="$homepage/archive/$version.tar.gz" -checksum=d79d1790f6c2826920fdaebeb2d153a8b8eb246439a2678dfb51e949822b6a47 +checksum=60ce70061c4c09312dd8e41022dd91bd9ae6e0c500f1df7fa5e0c20f6691fc5c noarch=y From c1df07bfc31b5252789afd3804ec11fa52978b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 4 May 2017 10:33:38 +0200 Subject: [PATCH 0097/1145] qt: fix for icu59 --- srcpkgs/qt/patches/qt4-icu59.patch | 40 ++++++++++++++++++++++++++++++ srcpkgs/qt/template | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qt/patches/qt4-icu59.patch diff --git a/srcpkgs/qt/patches/qt4-icu59.patch b/srcpkgs/qt/patches/qt4-icu59.patch new file mode 100644 index 0000000000..982b23a7ee --- /dev/null +++ b/srcpkgs/qt/patches/qt4-icu59.patch @@ -0,0 +1,40 @@ +--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp~ 2017-04-25 07:42:22.000000000 +0000 ++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp 2017-04-25 07:44:34.675363008 +0000 +@@ -43,6 +43,8 @@ + #include "qlibrary.h" + #include "qdebug.h" + ++#define UCHAR_TYPE unsigned short ++ + #include "unicode/uversion.h" + #include "unicode/ucol.h" + +--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qstring.cpp 2015-05-07 16:14:48.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qstring.cpp 2017-05-04 04:26:21.101965075 +0200 +@@ -6773,7 +6773,7 @@ + QString locale_arg; + if (d.locale_occurrences > 0) { + QLocale locale; +- if (!locale.numberOptions() & QLocale::OmitGroupSeparator) ++ if (~locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags); + } +@@ -6817,7 +6817,7 @@ + QString locale_arg; + if (d.locale_occurrences > 0) { + QLocale locale; +- if (!locale.numberOptions() & QLocale::OmitGroupSeparator) ++ if (~locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags); + } +@@ -6952,7 +6952,7 @@ + if (d.locale_occurrences > 0) { + QLocale locale; + +- if (!locale.numberOptions() & QLocale::OmitGroupSeparator) ++ if (~locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags); + } diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index deb93bab60..f70d04d8b3 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.8.7 -revision=22 +revision=23 _distname=qt-everywhere-opensource-src patch_args="-Np1" wrksrc=${_distname}-${version} From 3be85be8f0182f7e6e124523ff19b969438e9ee2 Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Tue, 2 May 2017 12:28:40 -0600 Subject: [PATCH 0098/1145] wine: update to 2.7 --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 7ee5dcf570..cafcb6bf73 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=2.6 +version=2.7 revision=1 build_style=gnu-configure configure_args="--without-gstreamer" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${version}.tar.xz" -checksum=e6ff64758f437647e99a36c1275e41adf54f0432907172d3bba22b070a97aac0 +checksum=e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c CC="gcc" CFLAGS="-O2 -pipe" @@ -46,7 +46,7 @@ fi if [ ${build_option_staging} ]; then makedepends+=" libva-devel gtk+3-devel" distfiles+=" https://github.com/wine-compholio/wine-staging/archive/v${version}.tar.gz" - checksum+=" ff86ddcceb7f6857bd415db3842ddf216a5cb301452e2a08053a9378cbf5580a" + checksum+=" 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d" fi post_extract() { From 5bee4e1b82192b5bd66517c29ca53cbdf0770309 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 4 May 2017 10:09:25 +0200 Subject: [PATCH 0099/1145] python-Cheroot: update to 5.5.0. --- srcpkgs/python-Cheroot/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template index d2ebbf45e8..02c9714a20 100644 --- a/srcpkgs/python-Cheroot/template +++ b/srcpkgs/python-Cheroot/template @@ -1,7 +1,7 @@ # Template file for 'python-Cheroot' pkgname=python-Cheroot -version=5.4.0 -revision=2 +version=5.5.0 +revision=1 noarch=yes wrksrc="cheroot-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="3-clause-BSD" homepage="https://github.com/cherrypy/cheroot" distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz" -checksum=f4b3d2eaa949b8a2f6676e3bca7c68cd358e4aa6bab437362b4bee6781626135 +checksum=59e349f91b9230930f7078646bb92b3a5b0f9cf19a6ff949777409fd289a1eba pre_build() { sed -i setup.py \ From aa1c2df8c23cfba772b4c3859322ddeb0adfe45a Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 4 May 2017 10:10:23 +0200 Subject: [PATCH 0100/1145] hugo: update to 0.20.7. --- srcpkgs/hugo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 14516cc3d9..d68b6c81d4 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.20.6 +version=0.20.7 revision=1 build_style=go hostmakedepends="git-perl mercurial" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="SimPL-2" homepage="http://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=692e08b009430d27064821d498f1454152cbfd5f26d019c29002e6fbff8fc387 +checksum=81b0fa0743f8f075c76c7c0d258357e2da240aa62b6725ec7920f332673df7e2 post_install() { vlicense LICENSE.md From 16abf7e150c64d999b94a1b987cee7129cbe47c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 4 May 2017 10:34:43 +0200 Subject: [PATCH 0101/1145] New package: zbar-0.10 --- common/shlibs | 3 +++ srcpkgs/libzbar | 1 + srcpkgs/libzbar-devel | 1 + srcpkgs/zbar/patches/v4l1.patch | 24 ++++++++++++++++++++++ srcpkgs/zbar/template | 35 +++++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 120000 srcpkgs/libzbar create mode 120000 srcpkgs/libzbar-devel create mode 100644 srcpkgs/zbar/patches/v4l1.patch create mode 100644 srcpkgs/zbar/template diff --git a/common/shlibs b/common/shlibs index 62d56b82cc..cdbbc33fe2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2795,6 +2795,9 @@ libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.0.1.0 slop-5.3.37_1 libbcunit.so.1 bcunit-3.0_1 +libzbar.so.0 libzbar-0.10_1 +libzbargtk.so.0 libzbar-0.10_1 +libzbarqt.so.0 libzbar-0.10_1 libomxil-bellagio.so.0 libomxil-bellagio-0.9.3_1 libomxdynamicloader.so.0 libomxil-bellagio-0.9.3_1 libomxaudio_effects.so.0 libomxil-bellagio-0.9.3_1 diff --git a/srcpkgs/libzbar b/srcpkgs/libzbar new file mode 120000 index 0000000000..8660d16a45 --- /dev/null +++ b/srcpkgs/libzbar @@ -0,0 +1 @@ +zbar \ No newline at end of file diff --git a/srcpkgs/libzbar-devel b/srcpkgs/libzbar-devel new file mode 120000 index 0000000000..8660d16a45 --- /dev/null +++ b/srcpkgs/libzbar-devel @@ -0,0 +1 @@ +zbar \ No newline at end of file diff --git a/srcpkgs/zbar/patches/v4l1.patch b/srcpkgs/zbar/patches/v4l1.patch new file mode 100644 index 0000000000..150b0e6952 --- /dev/null +++ b/srcpkgs/zbar/patches/v4l1.patch @@ -0,0 +1,24 @@ +Thanks to Andy Weidenbaum for providing this patch! + +--- ./zbar/video/v4l1.c 2013-03-06 23:24:22.996336417 -0800 ++++ ./zbar/video/v4l1.c 2013-03-06 23:29:29.789662369 -0800 +@@ -41,7 +41,7 @@ + #ifdef HAVE_SYS_MMAN_H + # include + #endif +-#include ++#include + + #include "video.h" + #include "image.h" +--- ./configure 2009-10-23 11:17:24.000000000 -0700 ++++ ./configure 2013-03-06 23:47:33.902966990 -0800 +@@ -18709,7 +18709,7 @@ + if test "x$enable_video" != "xno"; then + if test "x$win32" = "xno"; then + +-for ac_header in linux/videodev.h ++for ac_header in libv4l1-videodev.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template new file mode 100644 index 0000000000..b608a20814 --- /dev/null +++ b/srcpkgs/zbar/template @@ -0,0 +1,35 @@ +# Template file for 'zbar' +pkgname=zbar +version=0.10 +revision=1 +build_style=gnu-configure +configure_args="--with-qt --with-gtk" +hostmakedepends="pkg-config qt-qmake qt-host-tools glib-devel" +makedepends="libmagick-devel libXv-devel pygtk-devel qt-devel v4l-utils-devel" +short_desc="A barcode reading library and application" +maintainer="Jürgen Buchmüller " +license="LGPL-2" +homepage="https://zbar.sourceforge.net/" +distfiles="$SOURCEFORGE_SITE/zbar/${version}/${pkgname}-${version}.tar.bz2" +checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 +depends="libzbar-${version}_${revision}" + +CFLAGS="-DNDEBUG" + +libzbar_package() { + short_desc+=" - library files" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +libzbar-devel_package() { + short_desc+=" - development files" + depends="libzbar>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 0f23ee75d575b6f609ce9a252f6f82a815f5f3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 4 May 2017 12:44:14 +0200 Subject: [PATCH 0102/1145] zbar: nocross --- srcpkgs/zbar/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index b608a20814..b0737d9a99 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -13,6 +13,7 @@ homepage="https://zbar.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/zbar/${version}/${pkgname}-${version}.tar.bz2" checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 depends="libzbar-${version}_${revision}" +nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/2508/steps/shell_3/logs/stdio" CFLAGS="-DNDEBUG" From 5adcb02d08b86249d13b9fd46787c4cefbb8878d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 15 Mar 2017 16:25:08 +0100 Subject: [PATCH 0103/1145] llvm: update to 4.0.0. - Switch back to dynamic linking, seems to work again. Fixes #4722. - Disable libedit on musl (weird input bugs). --- common/shlibs | 2 + srcpkgs/{libllvm3.9 => libllvm4.0} | 0 .../llvm/files/patches/lldb/fix-musl.patch | 13 -- .../llvm/files/patches/lldb/zzz-aarch64.patch | 24 ++- ...on-between-WQM-and-polygon-stippling.patch | 140 ------------------ srcpkgs/llvm/template | 41 +++-- srcpkgs/rust/template | 2 +- 7 files changed, 37 insertions(+), 185 deletions(-) rename srcpkgs/{libllvm3.9 => libllvm4.0} (100%) delete mode 100644 srcpkgs/llvm/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch diff --git a/common/shlibs b/common/shlibs index cdbbc33fe2..018cf0f234 100644 --- a/common/shlibs +++ b/common/shlibs @@ -957,6 +957,7 @@ libyajl.so.2 yajl-2.0.1_1 libconfuse.so.1 confuse-3.0_1 libclang.so clang-3.4.2_1 libclang.so.3.9 clang-3.9.1_2 +libclang.so.4 clang-4.0.0_1 liblldb.so lldb-3.5.1_1 libLLVM-3.5.so libllvm-3.5.0_1 libLLVM-3.6.so libllvm3.6-3.6.0_1 @@ -965,6 +966,7 @@ libLLVM-3.7.1.so libllvm3.7-3.7.1_1 libLLVM-3.8.so libllvm3.8-3.8.0_1 libLLVM-3.8.1.so libllvm3.8-3.8.1_1 libLLVM-3.9.so libllvm3.9-3.9.0_1 +libLLVM-4.0.so libllvm4.0-4.0.0_1 libisofs.so.6 libisofs-0.6.24_1 libbfd-2.22.so binutils-2.22_1<2.23_1 libopcodes-2.22.so binutils-2.22_1<2.23_1 diff --git a/srcpkgs/libllvm3.9 b/srcpkgs/libllvm4.0 similarity index 100% rename from srcpkgs/libllvm3.9 rename to srcpkgs/libllvm4.0 diff --git a/srcpkgs/llvm/files/patches/lldb/fix-musl.patch b/srcpkgs/llvm/files/patches/lldb/fix-musl.patch index 67b8df0749..c3422bef63 100644 --- a/srcpkgs/llvm/files/patches/lldb/fix-musl.patch +++ b/srcpkgs/llvm/files/patches/lldb/fix-musl.patch @@ -23,19 +23,6 @@ index ceb094b..a48620d 100644 #ifndef _MSC_VER #include #endif -diff --git a/source/Plugins/Process/Linux/Procfs.h b/source/Plugins/Process/Linux/Procfs.h -index 1b383fb..4ebe390 100644 ---- a/source/Plugins/Process/Linux/Procfs.h -+++ b/source/Plugins/Process/Linux/Procfs.h -@@ -12,7 +12,7 @@ - - #include - --#ifdef __ANDROID__ -+#ifndef __GLIBC__ - #if defined (__arm64__) || defined (__aarch64__) - typedef unsigned long elf_greg_t; - typedef elf_greg_t elf_gregset_t[(sizeof (struct user_pt_regs) / sizeof(elf_greg_t))]; -- 2.5.1 diff --git a/srcpkgs/llvm/files/patches/lldb/zzz-aarch64.patch b/srcpkgs/llvm/files/patches/lldb/zzz-aarch64.patch index a6979541c6..5bacbf4729 100644 --- a/srcpkgs/llvm/files/patches/lldb/zzz-aarch64.patch +++ b/srcpkgs/llvm/files/patches/lldb/zzz-aarch64.patch @@ -1,17 +1,25 @@ --- lldb/source/Plugins/Process/Linux/Procfs.h.orig +++ lldb/source/Plugins/Process/Linux/Procfs.h -@@ -11,12 +11,11 @@ +@@ -11,21 +11,6 @@ // sys/procfs.h on Android/Linux for all supported architectures. #include +#include - #ifndef __GLIBC__ - #if defined (__arm64__) || defined (__aarch64__) +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) -typedef unsigned long elf_greg_t; --typedef elf_greg_t elf_gregset_t[(sizeof (struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; -typedef struct user_fpsimd_state elf_fpregset_t; -+#include - #ifndef NT_FPREGSET - #define NT_FPREGSET NT_PRFPREG - #endif // NT_FPREGSET +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ + #include +-#endif // __ANDROID__ diff --git a/srcpkgs/llvm/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch b/srcpkgs/llvm/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch deleted file mode 100644 index f23b916828..0000000000 --- a/srcpkgs/llvm/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 25e2616626caafb896517e18cd8aa724fba2b200 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Tue, 29 Nov 2016 03:41:28 +0000 -Subject: [PATCH] Merging r280589: - ------------------------------------------------------------------------- -r280589 | nhaehnle | 2016-09-03 05:26:32 -0700 (Sat, 03 Sep 2016) | 19 lines - -AMDGPU: Fix an interaction between WQM and polygon stippling - -Summary: -This fixes a rare bug in polygon stippling with non-monolithic pixel shaders. - -The underlying problem is as follows: the prolog part contains the polygon -stippling sequence, i.e. a kill. The main part then enables WQM based on the -_reduced_ exec mask, effectively undoing most of the polygon stippling. - -Since we cannot know whether polygon stippling will be used, the main part -of a non-monolithic shader must always return to exact mode to fix this -problem. - -Reviewers: arsenm, tstellarAMD, mareko - -Subscribers: arsenm, llvm-commits, kzhuravl - -Differential Revision: https://reviews.llvm.org/D23131 - ------------------------------------------------------------------------- - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@288105 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Target/AMDGPU/SIInstructions.td | 1 + - lib/Target/AMDGPU/SIWholeQuadMode.cpp | 7 ----- - test/CodeGen/AMDGPU/wqm.ll | 49 ++++++++++++++++++++++++++++++++--- - 3 files changed, 46 insertions(+), 11 deletions(-) - -diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td -index 18b7d5d..dde5f2f 100644 ---- a/lib/Target/AMDGPU/SIInstructions.td -+++ b/lib/Target/AMDGPU/SIInstructions.td -@@ -2029,6 +2029,7 @@ def SI_RETURN : PseudoInstSI < - let hasSideEffects = 1; - let SALU = 1; - let hasNoSchedulingInfo = 1; -+ let DisableWQM = 1; - } - - let Uses = [EXEC], Defs = [EXEC, VCC, M0], -diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp -index b200c15..1534d58 100644 ---- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp -+++ b/lib/Target/AMDGPU/SIWholeQuadMode.cpp -@@ -219,13 +219,6 @@ char SIWholeQuadMode::scanInstructions(MachineFunction &MF, - markInstruction(MI, Flags, Worklist); - GlobalFlags |= Flags; - } -- -- if (WQMOutputs && MBB.succ_empty()) { -- // This is a prolog shader. Make sure we go back to exact mode at the end. -- Blocks[&MBB].OutNeeds = StateExact; -- Worklist.push_back(&MBB); -- GlobalFlags |= StateExact; -- } - } - - return GlobalFlags; -diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll -index 809a7ba..41e4264 100644 ---- a/test/CodeGen/AMDGPU/wqm.ll -+++ b/test/CodeGen/AMDGPU/wqm.ll -@@ -17,17 +17,18 @@ main_body: - ;CHECK-LABEL: {{^}}test2: - ;CHECK-NEXT: ; %main_body - ;CHECK-NEXT: s_wqm_b64 exec, exec --;CHECK: image_sample - ;CHECK-NOT: exec --;CHECK: _load_dword v0, --define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { -+define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { - main_body: - %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) - %c.2 = bitcast <4 x float> %c.1 to <4 x i32> - %c.3 = extractelement <4 x i32> %c.2, i32 0 - %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3 - %data = load float, float addrspace(1)* %gep -- ret float %data -+ -+ call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef) -+ -+ ret void - } - - ; ... but disabled for stores (and, in this simple case, not re-enabled). -@@ -414,6 +415,46 @@ entry: - ret void - } - -+; Must return to exact at the end of a non-void returning shader, -+; otherwise the EXEC mask exported by the epilog will be wrong. This is true -+; even if the shader has no kills, because a kill could have happened in a -+; previous shader fragment. -+; -+; CHECK-LABEL: {{^}}test_nonvoid_return: -+; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec -+; CHECK: s_wqm_b64 exec, exec -+; -+; CHECK: s_and_b64 exec, exec, [[LIVE]] -+; CHECK-NOT: exec -+define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind { -+ %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) -+ %tex.i = bitcast <4 x float> %tex to <4 x i32> -+ %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) -+ ret <4 x float> %dtex -+} -+ -+; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable: -+; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec -+; CHECK: s_wqm_b64 exec, exec -+; -+; CHECK: s_and_b64 exec, exec, [[LIVE]] -+; CHECK-NOT: exec -+define amdgpu_ps <4 x float> @test_nonvoid_return_unreachable(i32 inreg %c) nounwind { -+entry: -+ %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) -+ %tex.i = bitcast <4 x float> %tex to <4 x i32> -+ %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) -+ -+ %cc = icmp sgt i32 %c, 0 -+ br i1 %cc, label %if, label %else -+ -+if: -+ store volatile <4 x float> %dtex, <4 x float>* undef -+ unreachable -+ -+else: -+ ret <4 x float> %dtex -+} - - declare void @llvm.amdgcn.image.store.v4i32(<4 x float>, <4 x i32>, <8 x i32>, i32, i1, i1, i1, i1) #1 - declare void @llvm.amdgcn.buffer.store.f32(float, <4 x i32>, i32, i32, i1, i1) #1 diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index c847211d64..da60558228 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,20 +1,17 @@ # Template file for 'llvm' pkgname=llvm -version=3.9.1 -revision=2 +version=4.0.0 +revision=1 wrksrc="llvm-${version}.src" lib32disabled=yes build_style=cmake configure_args=" -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_LINK_LLVM_DYLIB=OFF - -DLLVM_DYLIB_EXPORT_ALL=ON + -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_FFI=ON - -DLLVM_BINUTILS_INCDIR=/usr/include - -DCMAKE_INSTALL_DO_STRIP=0" -nodebug=yes # while -DLLVM_LINK_LLVM_DYLIB=OFF + -DLLVM_BINUTILS_INCDIR=/usr/include" short_desc="Low Level Virtual Machine" maintainer="Juan RP " homepage="http://www.llvm.org" @@ -26,20 +23,19 @@ distfiles=" http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.xz http://www.llvm.org/releases/${version}/clang-tools-extra-${version}.src.tar.xz http://www.llvm.org/releases/${version}/compiler-rt-${version}.src.tar.xz" -checksum=" - 1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee - 7e3311b2a1f80f4d3426e09f9459d079cab4d698258667e50a46dccbaaa460fc - 48e128fabb2ddaee64ecb8935f7ac315b6e68106bc48aeaf655d179c65d87f34 - e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63 - 29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635 - d30967b1a5fa51a2503474aacc913e69fd05ae862d37bf310088955bdb13ec99" +checksum="8d10511df96e73b8ff9e7abbfb4d4d432edbdbe965f1f4f07afaf370b8a533be + 2dbd8f05c662c1c9f11270fc9d0c63b419ddc988095e0ad107ed911cf882033d + 33e06457b9ce0563c89b11ccc7ccabf9cff71b83571985a5bf8684c9150e7502 + cea5f88ebddb30e296ca89130c83b9d46c2d833685e2912303c828054c4dc98a + 41b7d37eb128fd362ab3431be5244cf50325bb3bb153895735c5bacede647c99 + d3f25b23bef24c305137e6b44f7e81c51bbec764c119e01512a9bd2330be3115" # XXX Investigate ocaml bindings. hostmakedepends="groff perl python zlib-devel libffi-devel swig" makedepends="python-devel zlib-devel libffi-devel libedit-devel libxml2-devel binutils-devel" -depends="libllvm3.9" +depends="libllvm4.0" -subpackages="clang-tools-extra clang clang-analyzer libllvm3.9" +subpackages="clang-tools-extra clang clang-analyzer libllvm4.0" if [ -z "$CROSS_BUILD" ]; then # XXX fails to cross compile due to python subpackages+=" lldb lldb-devel" @@ -54,9 +50,6 @@ post_extract() { patch -sNp1 -i ${i} done - # https://bugs.freedesktop.org/show_bug.cgi?id=99078 - patch -RsNp1 -i ${FILESDIR}/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch - cd ${XBPS_BUILDDIR}/compiler-rt-${version}.src for i in ${FILESDIR}/patches/compiler-rt/compiler-rt-*.patch; do msg_normal "Applying $i to compiler-rt\n" @@ -135,10 +128,14 @@ pre_configure() { esac configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" + + case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" -DLLDB_DISABLE_LIBEDIT=ON";; + esac } post_configure() { # Don't leak CFLAGS into llvm-config. - sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" tools/llvm-config/BuildVariables.inc + sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" tools/llvm-config/BuildVariables.inc } do_install() { @@ -159,8 +156,6 @@ do_install() { done fi - ln -s /usr/bin/clang ${DESTDIR}/usr/bin/clang-cpp - # Remove llvm-config-host in cross builds. if [ "$CROSS_BUILD" ]; then rm -f ${DESTDIR}/usr/bin/llvm-config-host @@ -257,7 +252,7 @@ lldb-devel_package() { vmove "usr/lib/liblldb*.so" } } -libllvm3.9_package() { +libllvm4.0_package() { short_desc+=" - runtime library" pkg_install() { vmove "usr/lib/libLLVM-*.so*" diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 9b1ea1f732..2acdc6a512 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -17,7 +17,7 @@ maintainer="Leah Neukirchen " homepage="http://www.rust-lang.org/" license="MIT, Apache-2.0" distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz" -checksum=f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4 +checksum=4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87 case "$XBPS_MACHINE" in x86_64-musl) From 3c7e271ec5d04c1c8afc6ec8d0b14ac48b8d3901 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 15 Mar 2017 17:46:42 +0100 Subject: [PATCH 0104/1145] llvm-libunwind: update to 4.0.0. --- srcpkgs/llvm-libunwind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/llvm-libunwind/template b/srcpkgs/llvm-libunwind/template index 662c2c824d..3f5ef072fd 100644 --- a/srcpkgs/llvm-libunwind/template +++ b/srcpkgs/llvm-libunwind/template @@ -1,6 +1,6 @@ # Template file for 'llvm-libunwind' pkgname=llvm-libunwind -version=3.9.1 +version=4.0.0 revision=1 build_style=cmake wrksrc="libunwind-${version}.src" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://llvm.org" license="BSD" distfiles="http://www.llvm.org/releases/${version}/libunwind-${version}.src.tar.xz" -checksum=0b0bc73264d7ab77d384f8a7498729e3c4da8ffee00e1c85ad02a2f85e91f0e6 +checksum=0755efa9f969373d4d543123bbed4b3f9a835f6302875c1379c5745857725973 post_install() { vmkdir usr/include From 0e51b944c9467e555c58e6526b404c5ff0ccc2e8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 15 Mar 2017 18:36:41 +0100 Subject: [PATCH 0105/1145] libcxxabi: update to 4.0.0. --- srcpkgs/libcxxabi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template index 4a4cabf5ea..bdc93af39a 100644 --- a/srcpkgs/libcxxabi/template +++ b/srcpkgs/libcxxabi/template @@ -1,6 +1,6 @@ # Template file for 'libcxxiabi' pkgname=libcxxabi -version=3.9.1 +version=4.0.0 revision=1 wrksrc="${pkgname}-${version}.src" build_style=cmake @@ -15,8 +15,8 @@ homepage="http://libcxxabi.llvm.org" license="BSD" distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz http://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz" -checksum="920d8be32e6f5574a3fb293f93a31225eeba15086820fcb942155bf50dc029e2 - 25e615e428f60e651ed09ffd79e563864e3f4bc69a9e93ee41505c419d1a7461" +checksum="dca9cb619662ad2d3a0d685c4366078345247218c3702dd35bcaaa23f63481d8 + 4f4d33c4ad69bf9e360eebe6b29b7b19486948b1a41decf89d4adec12473cf96" case "$XBPS_TARGET_MACHINE" in arm*) broken="Wierd EHABI defines break it";; From ae5162801e4cc207980ce8faf79fce10ebd2fc89 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 15 Mar 2017 18:36:24 +0100 Subject: [PATCH 0106/1145] libcxx: update to 4.0.0. Now supports static and dynamic lib out of the box. --- .../libcxx/files/libcxx-0001-musl-hacks.patch | 16 ++++----- srcpkgs/libcxx/template | 36 +++++-------------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/srcpkgs/libcxx/files/libcxx-0001-musl-hacks.patch b/srcpkgs/libcxx/files/libcxx-0001-musl-hacks.patch index 99795c3cc9..b20eb7724f 100644 --- a/srcpkgs/libcxx/files/libcxx-0001-musl-hacks.patch +++ b/srcpkgs/libcxx/files/libcxx-0001-musl-hacks.patch @@ -26,21 +26,21 @@ typename remove_reference::type __current_errno = errno; if (__current_errno == 0) errno = __save_errno; ---- a/src/locale.cpp -+++ b/src/locale.cpp -@@ -1010,7 +1010,7 @@ ctype::do_narrow(const char_type* low, const char_type* high, char dfault, +--- libcxx-4.0.0.src/src/locale.cpp.orig ++++ libcxx-4.0.0.src/src/locale.cpp +@@ -1012,7 +1012,7 @@ return low; } -#if defined(__EMSCRIPTEN__) -+#ifdef __linux__ ++#if defined(__linux__) extern "C" const unsigned short ** __ctype_b_loc(); extern "C" const int ** __ctype_tolower_loc(); extern "C" const int ** __ctype_toupper_loc(); -@@ -1112,20 +1112,8 @@ ctype::classic_table() _NOEXCEPT - return _ctype+1; // internal ctype mask table defined in msvcrt.dll - // This is assumed to be safe, which is a nonsense assumption because we're - // going to end up dereferencing it later... +@@ -1118,20 +1118,8 @@ + #else + return __pctype_func(); + #endif -#elif defined(__EMSCRIPTEN__) - return *__ctype_b_loc(); -#elif defined(_NEWLIB_VERSION) diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template index bd256e9309..df98c188e6 100644 --- a/srcpkgs/libcxx/template +++ b/srcpkgs/libcxx/template @@ -1,15 +1,20 @@ # Template file for 'libcxx' pkgname=libcxx -version=3.9.1 +version=4.0.0 revision=1 build_style=cmake +hostmakedepends="python" case "$XBPS_TARGET_MACHINE" in arm*) # libcxxabi doesn't build on arm. ;; *) - configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" - makedepends="llvm-libunwind-devel libcxxabi-devel" + configure_args+=" + -DLIBCXX_CXX_ABI=libcxxabi + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON + -DLIBCXX_CXX_ABI_LIBRARY_PATH=/usr/lib + " + makedepends="llvm llvm-libunwind-devel libcxxabi-devel" LDFLAGS="-Wl,--no-as-needed -lunwind -Wl,--as-needed" esac case "$XBPS_TARGET_MACHINE" in @@ -21,7 +26,7 @@ maintainer="Juan RP " homepage="http://libcxx.llvm.org" license="BSD" distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz" -checksum=25e615e428f60e651ed09ffd79e563864e3f4bc69a9e93ee41505c419d1a7461 +checksum=4f4d33c4ad69bf9e360eebe6b29b7b19486948b1a41decf89d4adec12473cf96 wrksrc=${pkgname}-${version}.src post_extract() { @@ -31,29 +36,6 @@ post_extract() { sed -i 's/!defined(_GCC_MAX_ALIGN_T)/& \&\& !defined(__DEFINED_max_align_t)/' include/stddef.h esac } -post_configure() { - ( - mkdir -p ${wrksrc}/build-static - cd ${wrksrc}/build-static - if [ "$CROSS_BUILD" ]; then - cp ${wrksrc}/build/cross_${XBPS_CROSS_TRIPLET}.cmake . - fi - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ - ${configure_args} -DLIBCXX_ENABLE_SHARED=OFF .. - ) -} -post_build() { - ( - cd ${wrksrc}/build-static - ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target} - ) -} -post_install() { - ( - cd ${wrksrc}/build-static - ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target} - ) -} libcxx-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" From 9cb29d2577f9c90efc327cce8edc8fa9f3ebb5a9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 19 Apr 2017 21:01:07 +0200 Subject: [PATCH 0107/1145] New package: llvm3.9-3.9.1 --- srcpkgs/libllvm3.9 | 1 + srcpkgs/llvm3.9/files/llvm-Config-config.h | 9 ++ .../llvm3.9/files/llvm-Config-llvm-config.h | 9 ++ .../patches/cfe/cfe-001-fix-stdint.patch | 41 +++++ .../cfe-003-fix-unwind-chain-inclusion.patch | 45 ++++++ .../cfe/cfe-004-add-musl-triples.patch | 47 ++++++ .../cfe/cfe-007-musl-use-init-array.patch | 10 ++ .../compiler-rt-002-musl-no-dlvsym.patch | 11 ++ .../llvm3.9/files/patches/lldb/fix-musl.patch | 41 +++++ .../files/patches/lldb/zzz-aarch64.patch | 17 +++ .../files/patches/llvm/llvm-003-musl.patch | 83 +++++++++++ ...on-between-WQM-and-polygon-stippling.patch | 140 ++++++++++++++++++ srcpkgs/llvm3.9/template | 112 ++++++++++++++ srcpkgs/llvm3.9/update | 1 + 14 files changed, 567 insertions(+) create mode 120000 srcpkgs/libllvm3.9 create mode 100644 srcpkgs/llvm3.9/files/llvm-Config-config.h create mode 100644 srcpkgs/llvm3.9/files/llvm-Config-llvm-config.h create mode 100644 srcpkgs/llvm3.9/files/patches/cfe/cfe-001-fix-stdint.patch create mode 100644 srcpkgs/llvm3.9/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch create mode 100644 srcpkgs/llvm3.9/files/patches/cfe/cfe-004-add-musl-triples.patch create mode 100644 srcpkgs/llvm3.9/files/patches/cfe/cfe-007-musl-use-init-array.patch create mode 100644 srcpkgs/llvm3.9/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch create mode 100644 srcpkgs/llvm3.9/files/patches/lldb/fix-musl.patch create mode 100644 srcpkgs/llvm3.9/files/patches/lldb/zzz-aarch64.patch create mode 100644 srcpkgs/llvm3.9/files/patches/llvm/llvm-003-musl.patch create mode 100644 srcpkgs/llvm3.9/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch create mode 100644 srcpkgs/llvm3.9/template create mode 100644 srcpkgs/llvm3.9/update diff --git a/srcpkgs/libllvm3.9 b/srcpkgs/libllvm3.9 new file mode 120000 index 0000000000..e4eeb1deee --- /dev/null +++ b/srcpkgs/libllvm3.9 @@ -0,0 +1 @@ +llvm3.9 \ No newline at end of file diff --git a/srcpkgs/llvm3.9/files/llvm-Config-config.h b/srcpkgs/llvm3.9/files/llvm-Config-config.h new file mode 100644 index 0000000000..c369b4551f --- /dev/null +++ b/srcpkgs/llvm3.9/files/llvm-Config-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "config-32.h" +#elif __WORDSIZE == 64 +#include "config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/srcpkgs/llvm3.9/files/llvm-Config-llvm-config.h b/srcpkgs/llvm3.9/files/llvm-Config-llvm-config.h new file mode 100644 index 0000000000..2fa08c9be6 --- /dev/null +++ b/srcpkgs/llvm3.9/files/llvm-Config-llvm-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "llvm-config-32.h" +#elif __WORDSIZE == 64 +#include "llvm-config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/srcpkgs/llvm3.9/files/patches/cfe/cfe-001-fix-stdint.patch b/srcpkgs/llvm3.9/files/patches/cfe/cfe-001-fix-stdint.patch new file mode 100644 index 0000000000..17c6989dc8 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/cfe/cfe-001-fix-stdint.patch @@ -0,0 +1,41 @@ +From fd3bcfddcdb11757e95bc3a625017cbf234b67ed Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:14:32 +0200 +Subject: [PATCH 1/7] fix stdint + +--- + lib/Headers/stdint.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/Headers/stdint.h b/lib/Headers/stdint.h +index 0303db9..8ca28df 100644 +--- a/lib/Headers/stdint.h ++++ b/lib/Headers/stdint.h +@@ -22,8 +22,6 @@ + * + \*===----------------------------------------------------------------------===*/ + +-#ifndef __CLANG_STDINT_H +-#define __CLANG_STDINT_H + + /* If we're hosted, fall back to the system's stdint.h, which might have + * additional definitions. +@@ -72,6 +70,8 @@ + # endif + + #else ++#ifndef __CLANG_STDINT_H ++#define __CLANG_STDINT_H + + /* C99 7.18.1.1 Exact-width integer types. + * C99 7.18.1.2 Minimum-width integer types. +@@ -703,5 +703,5 @@ typedef __UINTMAX_TYPE__ uintmax_t; + #define INTMAX_C(v) __INTN_C(__INTMAX_WIDTH__, v) + #define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v) + +-#endif /* __STDC_HOSTED__ */ + #endif /* __CLANG_STDINT_H */ ++#endif /* __STDC_HOSTED__ */ +-- +2.5.1 + diff --git a/srcpkgs/llvm3.9/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm3.9/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch new file mode 100644 index 0000000000..a399ac17a0 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/cfe/cfe-003-fix-unwind-chain-inclusion.patch @@ -0,0 +1,45 @@ +From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:14:57 +0200 +Subject: [PATCH 2/7] fix unwind chain inclusion + +--- + lib/Headers/unwind.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h +index 303d792..44e10cc 100644 +--- a/lib/Headers/unwind.h ++++ b/lib/Headers/unwind.h +@@ -23,9 +23,6 @@ + + /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ + +-#ifndef __CLANG_UNWIND_H +-#define __CLANG_UNWIND_H +- + #if defined(__APPLE__) && __has_include_next() + /* Darwin (from 11.x on) provide an unwind.h. If that's available, + * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, +@@ -53,6 +50,9 @@ + # endif + #else + ++#ifndef __CLANG_UNWIND_H ++#define __CLANG_UNWIND_H ++ + #include + + #ifdef __cplusplus +@@ -277,6 +277,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); + } + #endif + ++#endif /* __CLANG_UNWIND_H */ ++ + #endif + +-#endif /* __CLANG_UNWIND_H */ +-- +2.5.1 + diff --git a/srcpkgs/llvm3.9/files/patches/cfe/cfe-004-add-musl-triples.patch b/srcpkgs/llvm3.9/files/patches/cfe/cfe-004-add-musl-triples.patch new file mode 100644 index 0000000000..a96916b74e --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/cfe/cfe-004-add-musl-triples.patch @@ -0,0 +1,47 @@ +From 420899503863473ba40ba68a81134dbcb3c330e5 Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:24:52 +0200 +Subject: [PATCH 3/7] add musl triples + +--- + lib/Driver/ToolChains.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp +index 15e36a1..3cd6dd1 100644 +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1275,7 +1275,10 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { + static const char *const ARMTriples[] = {"arm-linux-gnueabi", + "arm-linux-androideabi"}; + static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", +- "armv7hl-redhat-linux-gnueabi"}; ++ "armv7hl-redhat-linux-gnueabi", ++ "armv6-linux-musleabihf", "armv6l-linux-musleabihf", ++ "armv7-linux-musleabihf", "armv7l-linux-musleabihf", ++ "arm-linux-musleabihf" }; + static const char *const ARMebLibDirs[] = {"/lib"}; + static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", + "armeb-linux-androideabi"}; +@@ -1289,6 +1292,7 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { + "x86_64-redhat-linux", "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", + "x86_64-slackware-linux", "x86_64-linux-android", ++ "x86_64-linux-musl", "x86_64-pc-linux-musl", + "x86_64-unknown-linux"}; + static const char *const X32LibDirs[] = {"/libx32"}; + static const char *const X86LibDirs[] = {"/lib32", "/lib"}; +@@ -1297,7 +1301,9 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { + "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", + "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", + "i486-slackware-linux", "i686-montavista-linux", "i686-linux-android", +- "i586-linux-gnu"}; ++ "i586-linux-gnu", "i486-linux-musl", "i486-pc-linux-musl", ++ "i686-linux-musl", "i686-pc-linux-musl" ++ }; + + static const char *const MIPSLibDirs[] = {"/lib"}; + static const char *const MIPSTriples[] = { +-- +2.5.1 + diff --git a/srcpkgs/llvm3.9/files/patches/cfe/cfe-007-musl-use-init-array.patch b/srcpkgs/llvm3.9/files/patches/cfe/cfe-007-musl-use-init-array.patch new file mode 100644 index 0000000000..bab9a29310 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/cfe/cfe-007-musl-use-init-array.patch @@ -0,0 +1,10 @@ +--- cfe-3.8.0.src/lib/Driver/ToolChains.cpp.orig ++++ cfe-3.8.0.src/lib/Driver/ToolChains.cpp +@@ -2428,6 +2428,7 @@ + ArgStringList &CC1Args) const { + const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion(); + bool UseInitArrayDefault = ++ getTriple().getEnvironment() == llvm::Triple::Musl || + getTriple().getArch() == llvm::Triple::aarch64 || + getTriple().getArch() == llvm::Triple::aarch64_be || + (getTriple().getOS() == llvm::Triple::Linux && diff --git a/srcpkgs/llvm3.9/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch b/srcpkgs/llvm3.9/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch new file mode 100644 index 0000000000..70908618b1 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/compiler-rt/compiler-rt-002-musl-no-dlvsym.patch @@ -0,0 +1,11 @@ +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + return real == wrapper; + } + +-#if !defined(__ANDROID__) // android does not have dlvsym ++#if defined(__GLIBC__) // !defined(__ANDROID__) // android does not have dlvsym + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } diff --git a/srcpkgs/llvm3.9/files/patches/lldb/fix-musl.patch b/srcpkgs/llvm3.9/files/patches/lldb/fix-musl.patch new file mode 100644 index 0000000000..67b8df0749 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/lldb/fix-musl.patch @@ -0,0 +1,41 @@ +From 13b33959b864e3697e8dad002577321de13f4cc9 Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 23:00:56 +0200 +Subject: [PATCH] fix musl + +--- + source/Core/ConnectionSharedMemory.cpp | 1 + + source/Host/common/FileSpec.cpp | 1 + + source/Host/linux/Host.cpp | 2 +- + source/Host/linux/HostThreadLinux.cpp | 2 ++ + source/Plugins/Process/Linux/Procfs.h | 2 +- + 5 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/source/Host/common/FileSpec.cpp b/source/Host/common/FileSpec.cpp +index ceb094b..a48620d 100644 +--- a/source/Host/common/FileSpec.cpp ++++ b/source/Host/common/FileSpec.cpp +@@ -14,6 +14,7 @@ + #include "lldb/Host/windows/windows.h" + #endif + #include ++#include /* PATH_MAX */ + #ifndef _MSC_VER + #include + #endif +diff --git a/source/Plugins/Process/Linux/Procfs.h b/source/Plugins/Process/Linux/Procfs.h +index 1b383fb..4ebe390 100644 +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -12,7 +12,7 @@ + + #include + +-#ifdef __ANDROID__ ++#ifndef __GLIBC__ + #if defined (__arm64__) || defined (__aarch64__) + typedef unsigned long elf_greg_t; + typedef elf_greg_t elf_gregset_t[(sizeof (struct user_pt_regs) / sizeof(elf_greg_t))]; +-- +2.5.1 + diff --git a/srcpkgs/llvm3.9/files/patches/lldb/zzz-aarch64.patch b/srcpkgs/llvm3.9/files/patches/lldb/zzz-aarch64.patch new file mode 100644 index 0000000000..a6979541c6 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/lldb/zzz-aarch64.patch @@ -0,0 +1,17 @@ +--- lldb/source/Plugins/Process/Linux/Procfs.h.orig ++++ lldb/source/Plugins/Process/Linux/Procfs.h +@@ -11,12 +11,11 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include ++#include + + #ifndef __GLIBC__ + #if defined (__arm64__) || defined (__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t elf_gregset_t[(sizeof (struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; ++#include + #ifndef NT_FPREGSET + #define NT_FPREGSET NT_PRFPREG + #endif // NT_FPREGSET diff --git a/srcpkgs/llvm3.9/files/patches/llvm/llvm-003-musl.patch b/srcpkgs/llvm3.9/files/patches/llvm/llvm-003-musl.patch new file mode 100644 index 0000000000..8fafa57003 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/llvm/llvm-003-musl.patch @@ -0,0 +1,83 @@ +From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:03:02 +0200 +Subject: [PATCH 3/3] musl + +--- + include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ + lib/Analysis/TargetLibraryInfo.cpp | 5 +++-- + lib/Support/DynamicLibrary.cpp | 2 +- + lib/Support/Unix/Signals.inc | 6 +++--- + utils/unittest/googletest/src/gtest.cc | 1 + + 5 files changed, 17 insertions(+), 6 deletions(-) + +diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h +index e0a1ee3..465b65a 100644 +--- a/include/llvm/Analysis/TargetLibraryInfo.h ++++ b/include/llvm/Analysis/TargetLibraryInfo.h +@@ -18,6 +18,15 @@ + #include "llvm/IR/Module.h" + #include "llvm/Pass.h" + ++#undef fopen64 ++#undef fseeko64 ++#undef fstat64 ++#undef fstatvfs64 ++#undef ftello64 ++#undef lstat64 ++#undef stat64 ++#undef tmpfile64 ++ + namespace llvm { + /// VecDesc - Describes a possible vectorization of a function. + /// Function 'VectorFnName' is equivalent to 'ScalarFnName' vectorized +diff --git a/lib/Analysis/TargetLibraryInfo.cpp b/lib/Analysis/TargetLibraryInfo.cpp +index 635c50c..863f4a0 100644 +--- a/lib/Analysis/TargetLibraryInfo.cpp ++++ b/lib/Analysis/TargetLibraryInfo.cpp +@@ -336,14 +336,15 @@ static void initialize(TargetLibraryInfoImpl &TLI, const Triple &T, + } + + // The following functions are available on at least Linux: +- if (!T.isOSLinux()) { ++ if (!T.isOSLinux()) ++ TLI.setUnavailable(LibFunc::memalign); ++ if (1 /*!T.isGlibc()*/) { + TLI.setUnavailable(LibFunc::dunder_strdup); + TLI.setUnavailable(LibFunc::dunder_strtok_r); + TLI.setUnavailable(LibFunc::dunder_isoc99_scanf); + TLI.setUnavailable(LibFunc::dunder_isoc99_sscanf); + TLI.setUnavailable(LibFunc::under_IO_getc); + TLI.setUnavailable(LibFunc::under_IO_putc); +- TLI.setUnavailable(LibFunc::memalign); + TLI.setUnavailable(LibFunc::fopen64); + TLI.setUnavailable(LibFunc::fseeko64); + TLI.setUnavailable(LibFunc::fstat64); +diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp +index 9a7aeb5..e21750d 100644 +--- a/lib/Support/DynamicLibrary.cpp ++++ b/lib/Support/DynamicLibrary.cpp +@@ -138,7 +138,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { + + // This macro returns the address of a well-known, explicit symbol + #define EXPLICIT_SYMBOL(SYM) \ +- if (!strcmp(symbolName, #SYM)) return &SYM ++ if (!strcmp(symbolName, #SYM)) return (void *) &SYM + + // On linux we have a weird situation. The stderr/out/in symbols are both + // macros and global variables because of standards requirements. So, we +diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc +index 5780764..1d548c1 100644 +--- a/utils/unittest/googletest/src/gtest.cc ++++ b/utils/unittest/googletest/src/gtest.cc +@@ -120,6 +120,7 @@ + + #if GTEST_CAN_STREAM_RESULTS_ + # include // NOLINT ++# include // NOLINT + # include // NOLINT + #endif + +-- +2.5.1 + diff --git a/srcpkgs/llvm3.9/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch b/srcpkgs/llvm3.9/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch new file mode 100644 index 0000000000..f23b916828 --- /dev/null +++ b/srcpkgs/llvm3.9/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch @@ -0,0 +1,140 @@ +From 25e2616626caafb896517e18cd8aa724fba2b200 Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Tue, 29 Nov 2016 03:41:28 +0000 +Subject: [PATCH] Merging r280589: + +------------------------------------------------------------------------ +r280589 | nhaehnle | 2016-09-03 05:26:32 -0700 (Sat, 03 Sep 2016) | 19 lines + +AMDGPU: Fix an interaction between WQM and polygon stippling + +Summary: +This fixes a rare bug in polygon stippling with non-monolithic pixel shaders. + +The underlying problem is as follows: the prolog part contains the polygon +stippling sequence, i.e. a kill. The main part then enables WQM based on the +_reduced_ exec mask, effectively undoing most of the polygon stippling. + +Since we cannot know whether polygon stippling will be used, the main part +of a non-monolithic shader must always return to exact mode to fix this +problem. + +Reviewers: arsenm, tstellarAMD, mareko + +Subscribers: arsenm, llvm-commits, kzhuravl + +Differential Revision: https://reviews.llvm.org/D23131 + +------------------------------------------------------------------------ + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@288105 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Target/AMDGPU/SIInstructions.td | 1 + + lib/Target/AMDGPU/SIWholeQuadMode.cpp | 7 ----- + test/CodeGen/AMDGPU/wqm.ll | 49 ++++++++++++++++++++++++++++++++--- + 3 files changed, 46 insertions(+), 11 deletions(-) + +diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td +index 18b7d5d..dde5f2f 100644 +--- a/lib/Target/AMDGPU/SIInstructions.td ++++ b/lib/Target/AMDGPU/SIInstructions.td +@@ -2029,6 +2029,7 @@ def SI_RETURN : PseudoInstSI < + let hasSideEffects = 1; + let SALU = 1; + let hasNoSchedulingInfo = 1; ++ let DisableWQM = 1; + } + + let Uses = [EXEC], Defs = [EXEC, VCC, M0], +diff --git a/lib/Target/AMDGPU/SIWholeQuadMode.cpp b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +index b200c15..1534d58 100644 +--- a/lib/Target/AMDGPU/SIWholeQuadMode.cpp ++++ b/lib/Target/AMDGPU/SIWholeQuadMode.cpp +@@ -219,13 +219,6 @@ char SIWholeQuadMode::scanInstructions(MachineFunction &MF, + markInstruction(MI, Flags, Worklist); + GlobalFlags |= Flags; + } +- +- if (WQMOutputs && MBB.succ_empty()) { +- // This is a prolog shader. Make sure we go back to exact mode at the end. +- Blocks[&MBB].OutNeeds = StateExact; +- Worklist.push_back(&MBB); +- GlobalFlags |= StateExact; +- } + } + + return GlobalFlags; +diff --git a/test/CodeGen/AMDGPU/wqm.ll b/test/CodeGen/AMDGPU/wqm.ll +index 809a7ba..41e4264 100644 +--- a/test/CodeGen/AMDGPU/wqm.ll ++++ b/test/CodeGen/AMDGPU/wqm.ll +@@ -17,17 +17,18 @@ main_body: + ;CHECK-LABEL: {{^}}test2: + ;CHECK-NEXT: ; %main_body + ;CHECK-NEXT: s_wqm_b64 exec, exec +-;CHECK: image_sample + ;CHECK-NOT: exec +-;CHECK: _load_dword v0, +-define amdgpu_ps float @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { ++define amdgpu_ps void @test2(<8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, float addrspace(1)* inreg %ptr, <4 x i32> %c) { + main_body: + %c.1 = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %c, <8 x i32> %rsrc, <4 x i32> %sampler, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) + %c.2 = bitcast <4 x float> %c.1 to <4 x i32> + %c.3 = extractelement <4 x i32> %c.2, i32 0 + %gep = getelementptr float, float addrspace(1)* %ptr, i32 %c.3 + %data = load float, float addrspace(1)* %gep +- ret float %data ++ ++ call void @llvm.SI.export(i32 15, i32 1, i32 1, i32 0, i32 1, float %data, float undef, float undef, float undef) ++ ++ ret void + } + + ; ... but disabled for stores (and, in this simple case, not re-enabled). +@@ -414,6 +415,46 @@ entry: + ret void + } + ++; Must return to exact at the end of a non-void returning shader, ++; otherwise the EXEC mask exported by the epilog will be wrong. This is true ++; even if the shader has no kills, because a kill could have happened in a ++; previous shader fragment. ++; ++; CHECK-LABEL: {{^}}test_nonvoid_return: ++; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec ++; CHECK: s_wqm_b64 exec, exec ++; ++; CHECK: s_and_b64 exec, exec, [[LIVE]] ++; CHECK-NOT: exec ++define amdgpu_ps <4 x float> @test_nonvoid_return() nounwind { ++ %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) ++ %tex.i = bitcast <4 x float> %tex to <4 x i32> ++ %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) ++ ret <4 x float> %dtex ++} ++ ++; CHECK-LABEL: {{^}}test_nonvoid_return_unreachable: ++; CHECK: s_mov_b64 [[LIVE:s\[[0-9]+:[0-9]+\]]], exec ++; CHECK: s_wqm_b64 exec, exec ++; ++; CHECK: s_and_b64 exec, exec, [[LIVE]] ++; CHECK-NOT: exec ++define amdgpu_ps <4 x float> @test_nonvoid_return_unreachable(i32 inreg %c) nounwind { ++entry: ++ %tex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> undef, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) ++ %tex.i = bitcast <4 x float> %tex to <4 x i32> ++ %dtex = call <4 x float> @llvm.SI.image.sample.v4i32(<4 x i32> %tex.i, <8 x i32> undef, <4 x i32> undef, i32 15, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 0) ++ ++ %cc = icmp sgt i32 %c, 0 ++ br i1 %cc, label %if, label %else ++ ++if: ++ store volatile <4 x float> %dtex, <4 x float>* undef ++ unreachable ++ ++else: ++ ret <4 x float> %dtex ++} + + declare void @llvm.amdgcn.image.store.v4i32(<4 x float>, <4 x i32>, <8 x i32>, i32, i1, i1, i1, i1) #1 + declare void @llvm.amdgcn.buffer.store.f32(float, <4 x i32>, i32, i32, i1, i1) #1 diff --git a/srcpkgs/llvm3.9/template b/srcpkgs/llvm3.9/template new file mode 100644 index 0000000000..86a14c1300 --- /dev/null +++ b/srcpkgs/llvm3.9/template @@ -0,0 +1,112 @@ +# Template file for 'llvm3.9' +# Only a transitional package until Rust works with LLVM 4.0. +pkgname=llvm3.9 +version=3.9.1 +revision=2 +wrksrc="llvm-${version}.src" +lib32disabled=yes +build_style=cmake +configure_args=" + -Wno-dev + -DCMAKE_BUILD_TYPE=Release + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=OFF + -DLLVM_DYLIB_EXPORT_ALL=ON + -DLLVM_ENABLE_RTTI=ON + -DLLVM_ENABLE_FFI=ON + -DLLVM_BUILD_TESTS=OFF + -DLLVM_BINUTILS_INCDIR=/usr/include + -DCMAKE_INSTALL_DO_STRIP=0" +nodebug=yes # while -DLLVM_LINK_LLVM_DYLIB=OFF +short_desc="Low Level Virtual Machine (3.9.x series)" +maintainer="Leah Neukirchen " +homepage="http://www.llvm.org" +license="BSD" +distfiles="http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.xz" +checksum=1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee + +# XXX Investigate ocaml bindings. +hostmakedepends="groff perl python zlib-devel libffi-devel swig" +makedepends="python-devel zlib-devel libffi-devel libedit-devel libxml2-devel binutils-devel" +depends="libllvm3.9" +conflicts="llvm>=0" + +subpackages="libllvm3.9" + +post_extract() { + # patches + cd ${XBPS_BUILDDIR}/llvm-${version}.src + for i in ${FILESDIR}/patches/llvm/llvm-*.patch; do + msg_normal "Applying $i to llvm\n" + patch -sNp1 -i ${i} + done + + # https://bugs.freedesktop.org/show_bug.cgi?id=99078 + patch -RsNp1 -i ${FILESDIR}/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch + + # Move compiler-rt files into the llvm source. + if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then + mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt + fi +} + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + msg_normal "Building host tblgen\n" + mkdir -p build/HOST + cd build/HOST + CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \ + CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ + cmake ../.. -DCMAKE_BUILD_TYPE=Release + make ${makejobs} -C utils/TableGen + make ${makejobs} -C tools/clang/utils/TableGen + configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen" + configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/build/HOST/bin/clang-tblgen" + cd ../.. + fi + + case "$XBPS_TARGET_MACHINE" in + i686*) _arch="X86";; + x86_64*) _arch="X86";; + arm*) _arch="ARM";; + aarch64*) _arch="AArch64";; + mips*) _arch="Mips";; + esac + configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" + configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" +} +post_configure() { + # Don't leak CFLAGS into llvm-config. + sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" tools/llvm-config/BuildVariables.inc +} + +do_install() { + vlicense LICENSE.TXT + + cd build + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake + + # Fix permissions of static libs + chmod -x ${DESTDIR}/usr/lib/*.a + + # Required for multilib. + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + for _header in llvm-config; do + mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h + vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \ + usr/include/llvm/Config ${_header}.h + done + fi + + # Remove llvm-config-host in cross builds. + if [ "$CROSS_BUILD" ]; then + rm -f ${DESTDIR}/usr/bin/llvm-config-host + fi +} + +libllvm3.9_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/libLLVM-*.so*" + } +} diff --git a/srcpkgs/llvm3.9/update b/srcpkgs/llvm3.9/update new file mode 100644 index 0000000000..49e4f464a9 --- /dev/null +++ b/srcpkgs/llvm3.9/update @@ -0,0 +1 @@ +site="http://www.llvm.org/releases/download.html" From 444f7ce432a505a684e5c275b7424415595182d4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 19 Apr 2017 21:02:16 +0200 Subject: [PATCH 0108/1145] rust: use llvm3.9. --- srcpkgs/rust/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 2acdc6a512..c0a85573f6 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,7 +1,7 @@ # Template file for 'rust' pkgname=rust version=1.16.0 -revision=1 +revision=2 # NB. if you push any(!) new version, don't forget to put a build # output of musl to https://repo.voidlinux.eu/distfiles/ wrksrc="rustc-${version}-src" @@ -11,7 +11,7 @@ build_style=configure make_build_args="dist VERBOSE=1" only_for_archs="i686 x86_64 x86_64-musl" hostmakedepends="cmake curl pkg-config python" -makedepends="libffi-devel lld-devel llvm ncurses-devel zlib-devel" +makedepends="libffi-devel llvm3.9 ncurses-devel zlib-devel" short_desc="Safe, concurrent, practical systems language" maintainer="Leah Neukirchen " homepage="http://www.rust-lang.org/" From 42812dc53758e8fae4b493a847fc47bd57dfa1da Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 3 May 2017 19:39:57 +0200 Subject: [PATCH 0109/1145] rust: update to 1.17.0. --- srcpkgs/rust/patches/cargo.patch | 20 --------- .../rust/patches/link-musl-dynamically.patch | 8 ++++ srcpkgs/rust/template | 42 +++++++++---------- 3 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/rust/patches/cargo.patch diff --git a/srcpkgs/rust/patches/cargo.patch b/srcpkgs/rust/patches/cargo.patch deleted file mode 100644 index 5f1febd4c7..0000000000 --- a/srcpkgs/rust/patches/cargo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- rustc-1.16.0-src/src/tools/rustbook/Cargo.toml.orig -+++ rustc-1.16.0-src/src/tools/rustbook/Cargo.toml -@@ -2,7 +2,6 @@ - authors = ["The Rust Project Developers"] - name = "rustbook" - version = "0.0.0" --build = false - - [[bin]] - name = "rustbook" ---- rustc-1.16.0-src/src/librustc_plugin/Cargo.toml.orig -+++ rustc-1.16.0-src/src/librustc_plugin/Cargo.toml -@@ -2,7 +2,6 @@ - authors = ["The Rust Project Developers"] - name = "rustc_plugin" - version = "0.0.0" --build = false - - [lib] - name = "rustc_plugin" diff --git a/srcpkgs/rust/patches/link-musl-dynamically.patch b/srcpkgs/rust/patches/link-musl-dynamically.patch index 95917fe651..29681d205f 100644 --- a/srcpkgs/rust/patches/link-musl-dynamically.patch +++ b/srcpkgs/rust/patches/link-musl-dynamically.patch @@ -22,6 +22,14 @@ /// Build and prepare startup objects like rsbegin.o and rsend.o --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs +@@ -21,7 +21,6 @@ + use std::collections::HashSet; + use std::env; + use std::ffi::{OsStr, OsString}; +-use std::fs; + use std::process::Command; + + use build_helper::output; @@ -132,27 +132,6 @@ panic!("the iOS target is only supported on OSX"); } diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index c0a85573f6..adeb1056fa 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,7 +1,7 @@ # Template file for 'rust' pkgname=rust -version=1.16.0 -revision=2 +version=1.17.0 +revision=1 # NB. if you push any(!) new version, don't forget to put a build # output of musl to https://repo.voidlinux.eu/distfiles/ wrksrc="rustc-${version}-src" @@ -21,36 +21,37 @@ checksum=4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87 case "$XBPS_MACHINE" in x86_64-musl) + hostmakedepends+=" libcurl libgit2" distfiles+=" - https://repo.voidlinux.eu/distfiles/rustc-1.15.1-x86_64-unknown-linux-musl.tar.gz - https://repo.voidlinux.eu/distfiles/rust-std-1.15.1-x86_64-unknown-linux-musl.tar.gz - https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz" + https://repo.voidlinux.eu/distfiles/rustc-1.16.0-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/rust-std-1.16.0-x86_64-unknown-linux-musl.tar.gz + https://repo.voidlinux.eu/distfiles/cargo-0.17.0-x86_64-unknown-linux-musl.tar.gz" checksum+=" - e7518b083cfa871ff84b589db754ebf9cbf727e3be37e6df4169056c9b34b45e - ac65873446807038df761ba94e00ba5aaa51efd379a69b938102773cbad7f2dc - 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9" + 9ffc7e168bd6fcdb912535506efb15b06d85dc4bed79c11d5f2651978cf6116b + 8ccb1ba07a1ccd146f29eb0b3f3d6feffed55b987d524c8955f6c3f50c587ae5 + 0150d5b249fa66a5d2515e6beb27aa6dfb25301bb50522fab7c2445bb7ecdd09" ;; x86_64) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-x86_64-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/cargo-dist/2016-11-26/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/2017-03-11/rustc-1.16.0-x86_64-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-03-11/rust-std-1.16.0-x86_64-unknown-linux-gnu.tar.gz + https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 33ff44672b731fc71145974ce84194a1a9bafe6da3a74fd1e7543f12467f8894 - 69b251b478e284dfcaefc1153183f26f41d504ae213a81224f2101d8dbd52bb0 - 4a76ae206dba572e3de3f2fd7b906b42866ca4fd5f929a6f52d38579d2794e61" + b1dc3f754eeaf03891a3bd398c8c5024404c0078a334e5d8795e9dc419d147b3 + cbd43de2ab819d3332ce309046f3b5d715c1b47877a237791b99c96b1fe0d555 + d9e69d2b87dc0cf7fafe0e0eb64f82fe3414ef14fcb27f5eeff34df860e459d9" ;; i686) # extract from src/stage0.txt distfiles+=" - https://static.rust-lang.org/dist/2017-02-09/rustc-1.15.1-i686-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/dist/2017-02-09/rust-std-1.15.1-i686-unknown-linux-gnu.tar.gz - https://static.rust-lang.org/cargo-dist/2016-11-28/cargo-nightly-i686-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/2017-03-11/rustc-1.16.0-i686-unknown-linux-gnu.tar.gz + https://static.rust-lang.org/dist/2017-03-11/rust-std-1.16.0-i686-unknown-linux-gnu.tar.gz + https://s3.amazonaws.com/rust-lang-ci/cargo-builds/6b05583d71f982bcad049b9fa094c637c062e751/cargo-nightly-i686-unknown-linux-gnu.tar.gz" checksum+=" - a833304f99071600c72ecd868c1c7bd5ce49d1102332637a8eb7adb942f349ab - eff452a54b208a83b35432f226cb7de046d27b5e43edfc31d71ff340af686db0 - 8fb0cacdd2ab32b8dbdf74ae63914e1f97baf8bac0e8c1db1414a57677b93f88" + f8e0f96c17d8345be7818035e9bcae8e809a1b13635fe9a322df4a82d6dd1275 + 5a74e3661f4b300bf73353389acab097f3e07813b0f3073007830a549656054a + 863a4f92bbeec76257403fd571a90b90bd759ec8bcaddb7517fb89d40959e9e5" ;; esac @@ -111,7 +112,6 @@ do_configure() { --release-channel=stable --disable-rpath --enable-ccache - --enable-rustbuild --llvm-root=/usr " case "$XBPS_TARGET_MACHINE" in From a58424c522aa538014039151839b59021d322150 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 3 May 2017 20:03:41 +0200 Subject: [PATCH 0110/1145] ldc: update to 1.2.0. --- common/shlibs | 8 ++++---- srcpkgs/ldc/template | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 018cf0f234..afafd54236 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1992,10 +1992,10 @@ libfcitx-qt.so.0 libfcitx-qt-4.2.8_1 liblastfm.so.1 liblastfm-1.0.9_1 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 -libdruntime-ldc-debug.so.71 ldc-runtime-1.1.1_1 -libdruntime-ldc.so.71 ldc-runtime-1.1.1_1 -libphobos2-ldc.so.71 ldc-runtime-1.1.1_1 -libphobos2-ldc-debug.so.71 ldc-runtime-1.1.1_1 +libdruntime-ldc-debug.so.72 ldc-runtime-1.2.0_1 +libdruntime-ldc.so.72 ldc-runtime-1.2.0_1 +libphobos2-ldc.so.72 ldc-runtime-1.2.0_1 +libphobos2-ldc-debug.so.72 ldc-runtime-1.2.0_1 libmarblewidget.so.19 marble-4.14.3_2 libastro.so.1 marble-4.14.3_2 libparrot.so.6.9.0 parrot-6.9.0_1 diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 6cf51a3202..e79576f645 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,6 +1,6 @@ # Template file for 'ldc' pkgname=ldc -version=1.1.1 +version=1.2.0 revision=1 wrksrc="ldc-${version}-src" build_style=cmake @@ -14,7 +14,7 @@ homepage="http://wiki.dlang.org/LDC" license="3-clause-BSD, Boost Software License 1.0" short_desc="Portable D programming language compiler based on LLVM" distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz" -checksum=3d35253a76288a78939fea467409462f0b87461ffb89550eb0d9958e59eb7e97 +checksum=910e8a670f0fadcaf64403c924091d6debf7ad29e203808f5f2b6899217e6f2b nopie=yes nocross=yes From 994512b79be86d82d9e76a66b91ad42e65ffbde8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 13:26:17 +0200 Subject: [PATCH 0111/1145] libclc-git: update to 20170225. --- srcpkgs/libclc-git/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libclc-git/template b/srcpkgs/libclc-git/template index b74ecefbe5..a300a2714d 100644 --- a/srcpkgs/libclc-git/template +++ b/srcpkgs/libclc-git/template @@ -1,9 +1,8 @@ # Template file for 'libclc-git' pkgname=libclc-git -reverts=20160921_1 -version=20160905 -revision=3 -_git_hash=88b82a6f70012a903b10dfc1e2304d3ef2e76dbc +version=20170225 +revision=1 +_git_hash=17648cd846390e294feafef21c32c7106eac1e24 wrksrc="libclc-${_git_hash}" build_style=configure configure_script="./configure.py" @@ -18,7 +17,7 @@ provides="libclc-${version}_${revision}" replaces="libclc>=0" noarch=yes distfiles="https://github.com/llvm-mirror/libclc/archive/${_git_hash}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=4d01522ad7228fa91d46ccad68cac9fc6d2079bad23b4f0479f378dd9e9dc52e +checksum=2ca9f06a75ed9a914e4197598a7bc396f93edc3063a9f219b425f70e261b84e2 pre_build() { sed -i Makefile \ From 02f199c80355826cd570d5ced47544cc07e314c4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 13:36:30 +0200 Subject: [PATCH 0112/1145] gnome-builder: rebuild for clang 4. --- srcpkgs/gnome-builder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index c1f6ab7ef0..2b1b0b1a78 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=3.24.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools From 2b4c210c2715134d536b6649cb649e1754a0571b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 13:39:21 +0200 Subject: [PATCH 0113/1145] afl: rebuild for llvm 4. --- srcpkgs/afl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/afl/template b/srcpkgs/afl/template index 0fbc889aed..d6ac2707f7 100644 --- a/srcpkgs/afl/template +++ b/srcpkgs/afl/template @@ -1,7 +1,7 @@ # Template file for 'afl' pkgname=afl version=2.41b -revision=1 +revision=2 build_style=gnu-makefile # x86 only currently only_for_archs="i686 i686-musl x86_64 x86_64-musl" From e215739502eeadae9caa9f5b6a28e22e20f6f724 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 13:56:27 +0200 Subject: [PATCH 0114/1145] libGL: rebuild for llvm 4. --- srcpkgs/libGL/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 3416f8bc6b..e8b23f18e8 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,7 +1,7 @@ # Template build file for 'libGL'. pkgname=libGL version=17.0.5 -revision=1 +revision=2 wrksrc="mesa-${version}" build_style=gnu-configure configure_args="--enable-shared-glapi --enable-gbm From b689f01f983d77cb803f19da151547a7cfd8a074 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 14:01:02 +0200 Subject: [PATCH 0115/1145] bcc: rebuild for llvm 4. --- srcpkgs/bcc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index ff974066ba..4dc7eef64f 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,7 +1,7 @@ # Template file for 'bcc' pkgname=bcc version=0.3.0 -revision=1 +revision=2 build_style=cmake configure_args="-DREVISION=${version}" hostmakedepends="flex" From b6cfb3339b7fe811201eda83e5b27008e6107597 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 14:49:01 +0200 Subject: [PATCH 0116/1145] llvm: fix i686. --- srcpkgs/llvm/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index da60558228..9280d93d73 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -55,10 +55,6 @@ post_extract() { msg_normal "Applying $i to compiler-rt\n" patch -sNp1 -i ${i} done - # FIX BUG 22661 - case "$XBPS_TARGET_MACHINE" in - i686*) sed -ri "/ifeq.*CompilerTargetArch/s#i386#i686#g" make/platform/clang_linux.mk ;; - esac cd ${XBPS_BUILDDIR}/cfe-${version}.src for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do From 0eab78fd2e89d9f6ecd3f514193c264ae75230b8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 4 May 2017 20:11:39 +0200 Subject: [PATCH 0117/1145] shlibs: clean for clang. --- common/shlibs | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index afafd54236..9a719355f1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -955,8 +955,6 @@ libyaml-0.so.2 libyaml-0.1.4_1 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 libyajl.so.2 yajl-2.0.1_1 libconfuse.so.1 confuse-3.0_1 -libclang.so clang-3.4.2_1 -libclang.so.3.9 clang-3.9.1_2 libclang.so.4 clang-4.0.0_1 liblldb.so lldb-3.5.1_1 libLLVM-3.5.so libllvm-3.5.0_1 From 90817cf7ca904a18e4f13224540da02e5a1ef28a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 00:56:17 +0200 Subject: [PATCH 0118/1145] fwup: update to 0.14.1. --- srcpkgs/fwup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 5168907129..017fe32c5c 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,6 +1,6 @@ # Template file for 'fwup' pkgname=fwup -version=0.14.0 +version=0.14.1 revision=1 build_style=gnu-configure configure_args="ac_vc_func_open_memstream=yes" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=4ccd0ae1d3db46f25cb3df6f1b60a2e9bdba687e60b37b07d947eab835023ec9 +checksum=0da1b24485bb17be6689418a25adfa69ca5fdfe341fc557c6a1682efea46eea4 if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" From 964bb4ba8c237eed33897c61b8155007ea81c5bd Mon Sep 17 00:00:00 2001 From: Alvaro Castillo Date: Tue, 2 May 2017 22:35:32 +0100 Subject: [PATCH 0119/1145] New package: mate-calc-1.18.0 --- srcpkgs/mate-calc/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/mate-calc/template diff --git a/srcpkgs/mate-calc/template b/srcpkgs/mate-calc/template new file mode 100644 index 0000000000..2574449a33 --- /dev/null +++ b/srcpkgs/mate-calc/template @@ -0,0 +1,13 @@ +# Template file for 'mate-calc' +pkgname=mate-calc +version=1.18.0 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config glib-devel intltool itstool" +makedepends="gtk+3-devel libxml2-devel" +short_desc="MATE Calculator" +maintainer="Álvaro Castillo " +license="GPL-2" +homepage="http://mate-desktop.org/" +distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=9e02ea711000378d25274e532dd161f09172d1dcefdb3aa4b1ab7a2bfa34da61 From 041af69b2d06fdda66c8aa80703f13eee22465bd Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 10:53:22 +0000 Subject: [PATCH 0120/1145] zstd: update to 1.2.0. --- srcpkgs/zstd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zstd/template b/srcpkgs/zstd/template index 57b7f61576..469c2aca1b 100644 --- a/srcpkgs/zstd/template +++ b/srcpkgs/zstd/template @@ -1,13 +1,13 @@ # Template file for 'zstd' pkgname=zstd -version=1.1.4 +version=1.2.0 revision=1 short_desc="Fast real-time compression algorithm" maintainer="Michael Gehring " license="BSD" homepage="http://www.zstd.net" distfiles="https://github.com/facebook/zstd/archive/v${version}.tar.gz" -checksum=6aae2b586e359344cb8ecfe6917a407dc7e01b5d7d7388559714de37900fb9fb +checksum=4a7e4593a3638276ca7f2a09dc4f38e674d8317bbea51626393ca73fc047cbfb do_build() { make From bf1779fdb52c10547355bb578902f47b626bda26 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 10:53:55 +0200 Subject: [PATCH 0121/1145] btrbk: needs pv for --progress --- srcpkgs/btrbk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template index d3e153ad38..4e58360599 100644 --- a/srcpkgs/btrbk/template +++ b/srcpkgs/btrbk/template @@ -1,9 +1,9 @@ # Template file for 'btrbk' pkgname=btrbk version=0.25.0 -revision=1 +revision=2 build_style=gnu-makefile -depends="perl btrfs-progs openssh" +depends="perl btrfs-progs openssh pv" short_desc="backup tool for btrfs subvolumes" maintainer="Enno Boland " license="GPL-3" From a0919a38fb1a988be25e5f57054ec123066e99a8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:12:05 +0200 Subject: [PATCH 0122/1145] nodejs: update to 7.10.0. --- srcpkgs/nodejs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 4f38678ef8..c79dceb5ae 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs -version=7.9.0 -revision=2 +version=7.10.0 +revision=1 wrksrc=node-v${version} hostmakedepends="pkg-config python $(vopt_if icu icu)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=5cc131bb16f7ca688c29634a18b3c6a7816609a431a509f31baedf7caf25d626 +checksum=c4843fe8bffb59c2327063a5e67a89af60d7927f7ace7548695a2cf4c1aa6d03 # TODO: Fix cross compiling nocross="https://api.travis-ci.org/jobs/208411830/log.txt?deansi=true" From 8bb1b07edbd72b1d9bc14a30241ec6570f035cb1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:12:33 +0200 Subject: [PATCH 0123/1145] gnome-font-viewer: update to 3.24.0. --- srcpkgs/gnome-font-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 9bec304f70..5caded494b 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,6 +1,6 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=3.22.0 +version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" @@ -12,4 +12,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0 +checksum=f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76 From 132f66ace6ec25a72ac80decb4db49eea64096dd Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:14:10 +0200 Subject: [PATCH 0124/1145] file-roller: update to 3.24.1. --- srcpkgs/file-roller/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 518ffc796e..cef3c3dbb4 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.24.0 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" @@ -12,4 +12,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f4b72dba69b1984d96a1a9a6c544a9f94e54a531612b299251ef2702e0b0ad21 +checksum=011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a From b4322967206eba10e911980f679c8bc8f3b66e00 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:24:14 +0200 Subject: [PATCH 0125/1145] nautilus: update to 3.24.1. --- srcpkgs/nautilus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index b8289e6b22..344a6bef2e 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.24.0 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb --disable-debug --disable-selinux @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Nautilus" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=8a499247caff3c02437c0ad955f043e675a056912d8553d9c9783c762f5dbbbd +checksum=47383d0e5f8a8c1cf6fdefaa3b6a3768a8dd4cdf9ad2471ae3f443557f5dc6b2 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From f9ff7cdfa1913c86f8856f5ab6296cbc86076569 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:24:10 +0200 Subject: [PATCH 0126/1145] sushi: update to 3.24.0. --- srcpkgs/sushi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 4553c384f3..7deef2351d 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,6 +1,6 @@ # Template file for 'sushi' pkgname=sushi -version=3.20.0 +version=3.24.0 revision=1 lib32disabled=yes build_style=gnu-configure @@ -14,7 +14,7 @@ homepage="http://www.gnome.org" license="GPL-2" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=6e729c789e9e7f02505e25d4ac6cfed47e676366f0942fca740094f7fe9eae9e +checksum=f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From be3fc1e9c81a7e36521a0fa8f04178bd3d23de5e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:24:06 +0200 Subject: [PATCH 0127/1145] vala: update to 0.36.3. --- srcpkgs/vala/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index be1ead85c0..aed77fa520 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,6 +1,6 @@ # Template file for 'vala' pkgname=vala -version=0.36.1 +version=0.36.3 revision=1 build_style=gnu-configure configure_args="--enable-vapigen" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/Vala" license="LGPL-2.1" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07 +checksum=ac8a4ecd01f62d0c5f62ba50b7290d8c5a1edb308eec772a65b8e79be68f061c libvala_package() { short_desc+=" - shared library" From de8474bd1b56205145f5e91b242086ed32d05961 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 5 May 2017 13:32:00 +0200 Subject: [PATCH 0128/1145] gnome-font-viewer: fix crossbuild --- srcpkgs/gnome-font-viewer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 5caded494b..4c7add89e1 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -4,7 +4,7 @@ version=3.24.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" -hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" +hostmakedepends="which pkg-config intltool itstool gnome-doc-utils glib" makedepends="gtk+3-devel gnome-desktop-devel" depends="desktop-file-utils" short_desc="A font viewer for GNOME" From adc9f77a3ba62473dca3dc31effb513abea90eb3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 5 May 2017 11:18:00 +0200 Subject: [PATCH 0129/1145] perl-IO-Socket-Socks: update to 0.74. --- srcpkgs/perl-IO-Socket-Socks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-IO-Socket-Socks/template b/srcpkgs/perl-IO-Socket-Socks/template index 588db12c4f..cbed1d2d6a 100644 --- a/srcpkgs/perl-IO-Socket-Socks/template +++ b/srcpkgs/perl-IO-Socket-Socks/template @@ -1,6 +1,6 @@ # Template build file for 'perl-IO-Socket-Socks'. pkgname=perl-IO-Socket-Socks -version=0.73 +version=0.74 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Christian Neukirchen " homepage="http://search.cpan.org/dist/IO-Socket-Socks" license="LGPL-2" distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz" -checksum=6e2678a3544de366e29164a0c2daa9bfb7dd85cddbf510b7f2f408eaa320681f +checksum=37f071a2cf4ba8f090a2297c6482b7a2c509eb52dcd6ce5d8035d4ee2c6824b1 From 8121ff0521889dcddad5cca7b76caf9b51f4d427 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 5 May 2017 16:32:18 +0200 Subject: [PATCH 0130/1145] redsocks: rebuild for libevent 2.1. --- srcpkgs/redsocks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/redsocks/template b/srcpkgs/redsocks/template index b53399be9c..062cd568bd 100644 --- a/srcpkgs/redsocks/template +++ b/srcpkgs/redsocks/template @@ -1,7 +1,7 @@ # Template file for 'redsocks' pkgname=redsocks version=0.5 -revision=2 +revision=3 build_style=gnu-makefile wrksrc="${pkgname}-release-${version}" makedepends="libevent-devel" From f0b7dff814d3ef2e09ec1553fa5e02dd20ac7fe8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 5 May 2017 13:26:07 +0200 Subject: [PATCH 0131/1145] cargo: update to 0.18.0. --- srcpkgs/cargo/template | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 9a675bbfaa..9bf55c777d 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo -version=0.17.0 -revision=3 +version=0.18.0 +revision=1 _githash_installer=4f994850808a572e2cc8d43f968893c8e942e9bf patch_args="-Np1" build_style=gnu-configure @@ -10,33 +10,33 @@ hostmakedepends="rust python curl cmake pkg-config" makedepends="libcurl-devel http-parser-devel libgit2-devel" depends="rust" short_desc="Rust package manager" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz https://github.com/rust-lang/rust-installer/archive/${_githash_installer}.tar.gz" -checksum="fc689ca7a09f1e6a1c31e69f0e2616a93576a68e0e1d7f0ae4c0d3301ff21ff8 +checksum="19b5c142c194fc2f940d93b4679850980ed077db0ff7c558122c7ef865e24983 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae" nocross=yes case "$XBPS_MACHINE" in x86_64-musl) distfiles+=" - https://alpine.geeknet.cz/distfiles/cargo-0.11.0-nightly-x86_64-alpine-linux-musl.tar.gz" + https://repo.voidlinux.eu/distfiles/cargo-0.17.0-x86_64-unknown-linux-musl.tar.gz" checksum+=" - 587172026c0565e839d96b0c1d4c68c000927817398241f96682dca47fa8c3b9" + 0150d5b249fa66a5d2515e6beb27aa6dfb25301bb50522fab7c2445bb7ecdd09" ;; x86_64) distfiles+=" - https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/cargo-0.18.0-x86_64-unknown-linux-gnu.tar.gz" checksum+=" - 55ad9a8929303b4e06c18d0dd30b0d6296da784606d9c55cce98d5d7fc39a0b2" + 3601e95c968850230b137b849ff08a507e50d77ab584c779143a100f1843d8dd" ;; i686) distfiles+=" - https://static.rust-lang.org/cargo-dist/2016-03-21/cargo-nightly-i686-unknown-linux-gnu.tar.gz" + https://static.rust-lang.org/dist/cargo-0.18.0-i686-unknown-linux-gnu.tar.gz" checksum+=" - b2a1c4c33fb9274771c8d830cd8ac07f7ae96af341fa30399d6929ffd6c8b425" + fbc5a0614345dfb2b41e133bd821257906a839753a9aa4c4590cc9d658164e58" ;; esac @@ -45,8 +45,7 @@ post_extract() { mv ../rust-installer-${_githash_installer} src/rust-installer sed -i 's,/etc/bash_completion.d,/share/bash-completion/completions,g' Makefile.in mkdir -p target/snapshot - cp ../cargo-nightly*/cargo/bin/cargo cargo - rm Cargo.lock # unlock rust-openssl 0.9.4 + cp ../cargo-*/cargo/bin/cargo cargo } pre_configure() { configure_args+=" --host=${XBPS_TRIPLET/-pc-/-unknown-} --build=${XBPS_TRIPLET/-pc-/-unknown-} --cargo=$wrksrc/cargo" From 68c79e71d01058e7dc576cdd96c5f3f1a5bd47b9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 15:43:41 +0200 Subject: [PATCH 0132/1145] fwup: update to 0.14.2. --- srcpkgs/fwup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 017fe32c5c..0b90151912 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,6 +1,6 @@ # Template file for 'fwup' pkgname=fwup -version=0.14.1 +version=0.14.2 revision=1 build_style=gnu-configure configure_args="ac_vc_func_open_memstream=yes" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=0da1b24485bb17be6689418a25adfa69ca5fdfe341fc557c6a1682efea46eea4 +checksum=2ef13f2e8c55d9914788e01c7e0d1c65526643f96a505237f013018e4d08abc5 if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" From b9efef34aea1fe738a8707fb0f7a776cd3dd2f7b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 15:51:15 +0200 Subject: [PATCH 0133/1145] nmon: update to 16g. --- srcpkgs/nmon/patches/endmntent.patch | 19 ------------- srcpkgs/nmon/patches/musl-fixes.patch | 30 ++++++++++++++++++++ srcpkgs/nmon/patches/musl-string-macro.patch | 13 --------- srcpkgs/nmon/template | 4 +-- 4 files changed, 32 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/nmon/patches/endmntent.patch create mode 100644 srcpkgs/nmon/patches/musl-fixes.patch delete mode 100644 srcpkgs/nmon/patches/musl-string-macro.patch diff --git a/srcpkgs/nmon/patches/endmntent.patch b/srcpkgs/nmon/patches/endmntent.patch deleted file mode 100644 index 67a9db1e4a..0000000000 --- a/srcpkgs/nmon/patches/endmntent.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- lmon16f.c.orig 2016-05-14 18:38:40.459977271 +0200 -+++ lmon16f.c 2016-05-14 18:38:58.012263072 +0200 -@@ -706,7 +706,6 @@ - int isroot = 0; - - #include --#include - #include - #include - #include -@@ -3456,7 +3455,7 @@ - mp->mnt_dir[JFSNAMELEN - 1] = 0; - mp->mnt_type[JFSTYPELEN - 1] = 0; - } -- endfsent(); -+ endmntent(mfp); - jfs_loaded = 1; - jfses = i; - } diff --git a/srcpkgs/nmon/patches/musl-fixes.patch b/srcpkgs/nmon/patches/musl-fixes.patch new file mode 100644 index 0000000000..9dc92e2d55 --- /dev/null +++ b/srcpkgs/nmon/patches/musl-fixes.patch @@ -0,0 +1,30 @@ +--- lmon16g.c.orig ++++ lmon16g.c +@@ -63,7 +63,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -72,6 +72,10 @@ + #include + #include + ++#ifndef __STRING ++#define __STRING(x) #x ++#endif ++ + /* Windows moved here so they can be cleared when the screen mode changes */ + WINDOW *padwelcome = NULL; + WINDOW *padtop = NULL; +@@ -576,7 +580,6 @@ + int isroot = 0; + + #include +-#include + #include + #include + #include diff --git a/srcpkgs/nmon/patches/musl-string-macro.patch b/srcpkgs/nmon/patches/musl-string-macro.patch deleted file mode 100644 index aaa8820e20..0000000000 --- a/srcpkgs/nmon/patches/musl-string-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lmon16f.c.orig 2016-03-04 18:41:57.788556435 +0100 -+++ lmon16f.c 2016-03-04 22:23:27.977248021 +0100 -@@ -58,6 +58,10 @@ - #include - #include - -+#ifndef __STRING -+#define __STRING(x) #x -+#endif -+ - /* Windows moved here so they can be cleared when the screen mode changes */ - WINDOW *padwelcome = NULL; - WINDOW *padtop = NULL; diff --git a/srcpkgs/nmon/template b/srcpkgs/nmon/template index 4ca107eb0d..f6665972d3 100644 --- a/srcpkgs/nmon/template +++ b/srcpkgs/nmon/template @@ -1,6 +1,6 @@ # Template file for 'nmon' pkgname=nmon -version=16f +version=16g revision=1 build_style=fetch maintainer="Orphaned " @@ -10,7 +10,7 @@ license="GPL-3" homepage="http://nmon.sourceforge.net/pmwiki.php?n=Main.HomePage" short_desc="Nigel's performance Monitor for Linux" distfiles="${SOURCEFORGE_SITE}/nmon/files/lmon${version}.c" -checksum=280a371e17488f8a2c5e0c64273155789be6fa5b937ab5c465488e591bdc5cd9 +checksum=da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688 do_build() { $CC ${CFLAGS} ${LDFLAGS} -D JFS -D GETUSER -D LARGEMEM -D X86 \ From 06474c3c85b856282618edaff4360bf4bbec5009 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 16:05:29 +0200 Subject: [PATCH 0134/1145] LuaJIT: update to 2.0.5. --- srcpkgs/LuaJIT/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index 97eb702948..d092a4f626 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -1,14 +1,14 @@ # Template file for 'LuaJIT' pkgname=LuaJIT -version=2.0.4 -revision=2 +version=2.0.5 +revision=1 hostmakedepends="lua52-BitOp" short_desc="A Just-In-Time Compiler for Lua" maintainer="Juan RP " homepage="http://www.luajit.org" license="MIT" distfiles="http://luajit.org/download/$pkgname-$version.tar.gz" -checksum=620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d +checksum=874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979 case "$XBPS_TARGET_MACHINE" in armv[67]l-musl) broken="http://build.voidlinux.eu/builders/armv7l-musl_builder/builds/6757/steps/shell_3/logs/stdio";; From d00b58ce5b460251f7cfc2d1a6b530ec2077eb91 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 16:41:15 +0200 Subject: [PATCH 0135/1145] bind: update to 9.10.5. Fixes: * CVE-2016-2775 * CVE-2016-2776 * CVE-2016-6170 * CVE-2016-8864 * CVE-2016-9131 * CVE-2016-9147 * CVE-2016-9444 * CVE-2017-3135 * CVE-2017-3136 * CVE-2017-3137 * CVE-2017-3138 --- common/shlibs | 6 +- srcpkgs/bind/patches/libressl.patch | 148 ++++++++++++++++++++++++++++ srcpkgs/bind/patches/seccomp.patch | 38 ------- srcpkgs/bind/template | 14 +-- 4 files changed, 158 insertions(+), 48 deletions(-) create mode 100644 srcpkgs/bind/patches/libressl.patch delete mode 100644 srcpkgs/bind/patches/seccomp.patch diff --git a/common/shlibs b/common/shlibs index 9a719355f1..e124d1378a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -992,10 +992,10 @@ libtirpc.so.1 libtirpc-0.2.2_1 librpcsecgss.so.3 librpcsecgss-0.19_1 libnfsidmap.so.0 libnfsidmap-0.24_1 liblwres.so.141 bind-libs-9.10.2P3_2 -libdns.so.165 bind-libs-9.10.4P1_1 +libdns.so.170 bind-libs-9.10.5_1 libbind9.so.140 bind-libs-9.10.2P3_2 -libisccfg.so.140 bind-libs-9.10.2P3_2 -libisc.so.160 bind-libs-9.10.3_1 +libisccfg.so.144 bind-libs-9.10.5_1 +libisc.so.170 bind-libs-9.10.5_1 libisccc.so.140 bind-libs-9.10.2P3_2 libirs.so.141 bind-libs-9.10.2P3_2 libplist.so.3 libplist-1.12_1 diff --git a/srcpkgs/bind/patches/libressl.patch b/srcpkgs/bind/patches/libressl.patch new file mode 100644 index 0000000000..5982ed60af --- /dev/null +++ b/srcpkgs/bind/patches/libressl.patch @@ -0,0 +1,148 @@ +--- lib/isc/sha2.c.orig ++++ lib/isc/sha2.c +@@ -69,7 +69,7 @@ + #endif + + #ifdef ISC_PLATFORM_OPENSSLHASH +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_MD_CTX_new() &(context->_ctx) + #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) + #define EVP_MD_CTX_reset(c) EVP_MD_CTX_cleanup(c) +--- lib/isc/include/isc/sha2.h.orig ++++ lib/isc/include/isc/sha2.h +@@ -84,7 +84,7 @@ + + typedef struct { + EVP_MD_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX _ctx; + #endif + } isc_sha2_t; +--- lib/isc/include/isc/hmacmd5.h.orig ++++ lib/isc/include/isc/hmacmd5.h +@@ -42,7 +42,7 @@ + + typedef struct { + HMAC_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX _ctx; + #endif + } isc_hmacmd5_t; +--- lib/isc/hmacmd5.c.orig ++++ lib/isc/hmacmd5.c +@@ -43,7 +43,7 @@ + #endif + + #ifdef ISC_PLATFORM_OPENSSLHASH +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx)) + #define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr) + #endif +--- lib/isc/md5.c.orig ++++ lib/isc/md5.c +@@ -54,7 +54,7 @@ + #include + + #ifdef ISC_PLATFORM_OPENSSLHASH +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_MD_CTX_new() &(ctx->_ctx) + #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) + #endif +--- lib/isc/hmacsha.c.orig ++++ lib/isc/hmacsha.c +@@ -40,7 +40,7 @@ + #endif + + #ifdef ISC_PLATFORM_OPENSSLHASH +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx)) + #define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr) + #endif +--- lib/isc/include/isc/hmacsha.h.orig ++++ lib/isc/include/isc/hmacsha.h +@@ -42,7 +42,7 @@ + + typedef struct { + HMAC_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX _ctx; + #endif + } isc_hmacsha_t; +--- lib/isc/include/isc/sha1.h.orig ++++ lib/isc/include/isc/sha1.h +@@ -41,7 +41,7 @@ + + typedef struct { + EVP_MD_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX _ctx; + #endif + } isc_sha1_t; +--- lib/isc/include/isc/md5.h.orig ++++ lib/isc/include/isc/md5.h +@@ -60,7 +60,7 @@ + + typedef struct { + EVP_MD_CTX *ctx; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX _ctx; + #endif + } isc_md5_t; +--- lib/isc/aes.c.orig ++++ lib/isc/aes.c +@@ -33,7 +33,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context) + #define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1) + #endif +@@ -42,7 +42,7 @@ + isc_aes128_crypt(const unsigned char *key, const unsigned char *in, + unsigned char *out) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX _context; + #endif + EVP_CIPHER_CTX *c; +@@ -62,7 +62,7 @@ + isc_aes192_crypt(const unsigned char *key, const unsigned char *in, + unsigned char *out) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX _context; + #endif + EVP_CIPHER_CTX *c; +@@ -82,7 +82,7 @@ + isc_aes256_crypt(const unsigned char *key, const unsigned char *in, + unsigned char *out) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX _context; + #endif + EVP_CIPHER_CTX *c; +--- lib/isc/sha1.c.orig ++++ lib/isc/sha1.c +@@ -50,7 +50,7 @@ + #endif + + #ifdef ISC_PLATFORM_OPENSSLHASH +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_MD_CTX_new() &(context->_ctx) + #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) + #endif diff --git a/srcpkgs/bind/patches/seccomp.patch b/srcpkgs/bind/patches/seccomp.patch deleted file mode 100644 index dc6bbb8e43..0000000000 --- a/srcpkgs/bind/patches/seccomp.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- bin/named/include/named/seccomp.h.orig -+++ bin/named/include/named/seccomp.h -@@ -57,6 +57,8 @@ - SCMP_SYS(rt_sigsuspend), - SCMP_SYS(fstat), - SCMP_SYS(epoll_ctl), - SCMP_SYS(gettimeofday), -+ SCMP_SYS(getpid), -+ SCMP_SYS(getrandom), - SCMP_SYS(unlink), - SCMP_SYS(socket), -@@ -121,6 +123,8 @@ - "fstat", - "epoll_ctl", - "gettimeofday", -+ "getpid", -+ "getrandom", - "unlink", - "socket", - "sendto", -@@ -190,6 +194,8 @@ - SCMP_SYS(fstat64), - SCMP_SYS(epoll_ctl), - SCMP_SYS(gettimeofday), -+ SCMP_SYS(getpid), -+ SCMP_SYS(getrandom), - SCMP_SYS(unlink), - #ifndef ISC_PLATFORM_USETHREADS - SCMP_SYS(fcntl64), -@@ -226,6 +232,8 @@ - "fstat64", - "epoll_ctl", - "gettimeofday", -+ "getpid", -+ "getrandom", - "unlink", - #ifndef ISC_PLATFORM_USETHREADS - "fcntl64", diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index e41d8434dd..7946d9cac8 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,16 +1,16 @@ # Template file for 'bind' pkgname=bind -_distver=9.10.4 -_patchver=P6 -version="${_distver}${_patchver}" -revision=4 -wrksrc="${pkgname}-${_distver}-${_patchver}" +_distver=9.10.5 +# _patchver= +version="${_distver}${_patchver:+$_patchver}" +revision=1 +wrksrc="${pkgname}-${_distver}${_patchver:+-$_patchver}" short_desc="Berkeley Internet Name Domain server" maintainer="Juan RP " license="ISC" homepage="http://www.isc.org/software/bind/" -distfiles="http://ftp.isc.org/isc/bind9/${_distver}-${_patchver}/bind-${_distver}-${_patchver}.tar.gz" -checksum=a1dfbfd1d11cb52f2d9e5af0def25763798bda243841722dd0b319086a73ee65 +distfiles="http://ftp.isc.org/isc/bind9/${_distver}${_patchver:+-$_patchver}/bind-${_distver}${_patchver:+-$_patchver}.tar.gz" +checksum=71688d2e134e42205075eef93cc1b78b42a140a2d61bf8263afc9c92fc872b0e build_options="geoip seccomp" build_options_default="geoip" From baede45a12673fed4e98408d2612993e9eea51cd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 16:46:54 +0200 Subject: [PATCH 0136/1145] bind: xbps-checkvers crash... --- srcpkgs/bind/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 7946d9cac8..f9673157f7 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,7 +1,6 @@ # Template file for 'bind' pkgname=bind _distver=9.10.5 -# _patchver= version="${_distver}${_patchver:+$_patchver}" revision=1 wrksrc="${pkgname}-${_distver}${_patchver:+-$_patchver}" From 1f296e83a755d3d02ba2e02e03b849f339c75e4f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 5 May 2017 16:50:40 +0200 Subject: [PATCH 0137/1145] bind: really fix --- srcpkgs/bind/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index f9673157f7..2d32aac1fe 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,14 +1,13 @@ # Template file for 'bind' pkgname=bind -_distver=9.10.5 -version="${_distver}${_patchver:+$_patchver}" +version=9.10.5 revision=1 -wrksrc="${pkgname}-${_distver}${_patchver:+-$_patchver}" +wrksrc="${pkgname}-${version}" short_desc="Berkeley Internet Name Domain server" maintainer="Juan RP " license="ISC" homepage="http://www.isc.org/software/bind/" -distfiles="http://ftp.isc.org/isc/bind9/${_distver}${_patchver:+-$_patchver}/bind-${_distver}${_patchver:+-$_patchver}.tar.gz" +distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz" checksum=71688d2e134e42205075eef93cc1b78b42a140a2d61bf8263afc9c92fc872b0e build_options="geoip seccomp" From 02644b4d8ba8925531ac93a1d57044d057024ba4 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Mon, 1 May 2017 19:07:31 +0200 Subject: [PATCH 0138/1145] mpv: fix libdvdread/libdvdnav being disabled in configure Closes: #6300 [via git-merge-pr] --- srcpkgs/mpv/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 14c1e7c6c2..df9e67b32a 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.25.0 -revision=2 +revision=3 build_options="vapoursynth" short_desc="Video player based on MPlayer/mplayer2" maintainer="Juan RP " @@ -9,7 +9,8 @@ license="GPL-2" homepage="https://mpv.io" build_style=waf configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv - --enable-cdda --enable-libmpv-shared --disable-oss-audio --disable-sdl2 + --enable-dvdread --enable-dvdnav --enable-cdda --enable-libmpv-shared + --disable-oss-audio --disable-sdl2 $(vopt_enable vapoursynth)" hostmakedepends="pkg-config python-docutils perl" makedepends=" From c5aeb20c773ed09a8055c519571b8b449278c8c2 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 12:55:06 +0000 Subject: [PATCH 0139/1145] mercurial: update to 4.2. --- srcpkgs/mercurial/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 07469646a7..0c9e7949d3 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,6 +1,6 @@ # Template file for 'mercurial' pkgname=mercurial -version=4.1.3 +version=4.2 revision=1 build_style=python2-module hostmakedepends="python-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://www.mercurial-scm.org/" distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz" -checksum=103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8 +checksum=23a412308fc9c2b354a0e91a89588a4af2af061b47da80bc4233ccb0cceef47d post_install() { vmkdir usr/share/man/man1 From 1b24e3338c90a8ce3afa66344c2d44ce645d7fca Mon Sep 17 00:00:00 2001 From: cr6-git Date: Tue, 2 May 2017 04:43:48 +0200 Subject: [PATCH 0140/1145] ardour: update to 5.8 --- .../ardour/patches/fix-gcc6-ambigous_max.patch | 16 ---------------- srcpkgs/ardour/template | 9 ++++++--- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch diff --git a/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch b/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch deleted file mode 100644 index 50783d5f27..0000000000 --- a/srcpkgs/ardour/patches/fix-gcc6-ambigous_max.patch +++ /dev/null @@ -1,16 +0,0 @@ -The value 1.0 without f is a double constant and gcc6 complains -about a not existing template for max(double,float). - ---- libs/ardour/parameter_descriptor.cc 2016-10-04 09:19:13.780997674 +0200 -+++ libs/ardour/parameter_descriptor.cc 2016-10-04 09:19:45.237999989 +0200 -@@ -178,8 +178,8 @@ - largestep = largestep / logf(30.0f); - } else if (integer_step) { - smallstep = 1.0; -- step = std::max(1.0, rint(step)); -- largestep = std::max(1.0, rint(largestep)); -+ step = std::max(1.0f, rint(step)); -+ largestep = std::max(1.0f, rint(largestep)); - } - } - } diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index 24125c4df5..974f791e5b 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -1,11 +1,14 @@ # Template file for 'ardour' pkgname=ardour -version=4.7 -revision=2 +version=5.8 +revision=1 build_style=waf configure_args="--with-backends=jack,alsa --libjack=weak --optimize --docs" hostmakedepends="python git graphviz doxygen pkg-config clang perl" -makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2 sratom-devel gtkmm2-devel" +makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel + taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel + vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2 + sratom-devel gtkmm2-devel libarchive-devel" short_desc="Professional-grade digital audio workstation" maintainer="Andrea Brancaleoni " license="GPL-2" From f646dbba3ba015059b858a5ec6e4b95f000e87a2 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 19:07:25 +0000 Subject: [PATCH 0141/1145] ardour: nocross --- srcpkgs/ardour/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index 974f791e5b..b5eaa92d1e 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -15,6 +15,8 @@ license="GPL-2" homepage="http://ardour.org" CXXFLAGS="-std=c++11" +nocross="executes test binaries during configure" + do_fetch() { git clone --branch=$version https://github.com/Ardour/$pkgname $pkgname-$version } From 0a46d5bc5fbd467d8cb6090a30cd96160317e1a0 Mon Sep 17 00:00:00 2001 From: Nicklaus McClendon Date: Tue, 2 May 2017 23:58:52 -0500 Subject: [PATCH 0142/1145] New package: sunwait-0.20041208 Closes: #6318 [via git-merge-pr] --- srcpkgs/sunwait/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/sunwait/template diff --git a/srcpkgs/sunwait/template b/srcpkgs/sunwait/template new file mode 100644 index 0000000000..0720e2da2f --- /dev/null +++ b/srcpkgs/sunwait/template @@ -0,0 +1,19 @@ +# Template file for 'sunwait' +pkgname=sunwait +version=0.20041208 +revision=1 +wrksrc="${pkgname}-${version##*.}" +build_style=gnu-makefile +short_desc="A small C program calculating sunrise and sunset" +maintainer="Nicklaus McClendon " +license="GPL-2" +homepage="http://www.risacher.org/sunwait/" +distfiles="${homepage}${pkgname}-${version##*.}.tar.gz" +checksum=46ecd64142e0c7c2decac8df241b78ccae0d1b323929fb4d61aa1acc16a9ff96 + +pre_build() { + sed -i 's/\(-lm\)/\1 $(LDFLAGS)/' Makefile +} +do_install() { + vbin sunwait +} From 73cc98d6cbf6986ab89a73575dbbe4ac9fe7eacf Mon Sep 17 00:00:00 2001 From: Pierre Allegraud Date: Thu, 4 May 2017 01:56:56 +0200 Subject: [PATCH 0143/1145] New package: udftools-1.3 Closes: #6323 [via git-merge-pr] --- srcpkgs/udftools/patches/musl-fixes.patch | 10 ++++++++++ srcpkgs/udftools/template | 12 ++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 srcpkgs/udftools/patches/musl-fixes.patch create mode 100644 srcpkgs/udftools/template diff --git a/srcpkgs/udftools/patches/musl-fixes.patch b/srcpkgs/udftools/patches/musl-fixes.patch new file mode 100644 index 0000000000..f1aa5f1626 --- /dev/null +++ b/srcpkgs/udftools/patches/musl-fixes.patch @@ -0,0 +1,10 @@ +--- pktsetup/pktsetup.c.orig ++++ pktsetup/pktsetup.c +@@ -26,7 +26,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/srcpkgs/udftools/template b/srcpkgs/udftools/template new file mode 100644 index 0000000000..3b12fd415d --- /dev/null +++ b/srcpkgs/udftools/template @@ -0,0 +1,12 @@ +# Template file for 'udftools' +pkgname=udftools +version=1.3 +revision=1 +build_style=gnu-configure +makedepends="ncurses-devel readline-devel" +short_desc="Linux tools for UDF filesystems and DVD/CD-R(W) drives" +maintainer="Pierre Allegraud " +license="GPL-2" +homepage="https://github.com/pali/udftools/" +distfiles="https://github.com/pali/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" +checksum=00562a440de7b855df8127f8f798df657d53f20d9a205a7041fed37c8a07d4cb From 40f49156f8a931c029c5125ea02db97b6ae948d0 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Wed, 26 Apr 2017 17:04:27 +0200 Subject: [PATCH 0144/1145] New package: poco-1.7.8p2 Closes: #6267 [via git-merge-pr] --- common/shlibs | 9 +++++++++ srcpkgs/poco-devel | 1 + srcpkgs/poco/template | 26 ++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 120000 srcpkgs/poco-devel create mode 100644 srcpkgs/poco/template diff --git a/common/shlibs b/common/shlibs index e124d1378a..c2b3f97da0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2826,3 +2826,12 @@ libsigrok.so.3 libsigrok-0.4.0_1 libsigrokcxx.so.3 libsigrok-0.4.0_1 libsigrokdecode.so.3 libsigrokdecode-0.4.1_1 libglyr.so.1 glyr-1.0.8_1 +libPocoJSON.so.48 poco-1.7.8p2_1 +libPocoMongoDB.so.48 poco-1.7.8p2_1 +libPocoZip.so.48 poco-1.7.8p2_1 +libPocoData.so.48 poco-1.7.8p2_1 +libPocoNet.so.48 poco-1.7.8p2_1 +libPocoDataSQLite.so.48 poco-1.7.8p2_1 +libPocoFoundation.so.48 poco-1.7.8p2_1 +libPocoXML.so.48 poco-1.7.8p2_1 +libPocoUtil.so.48 poco-1.7.8p2_1 diff --git a/srcpkgs/poco-devel b/srcpkgs/poco-devel new file mode 120000 index 0000000000..b4dd0515ce --- /dev/null +++ b/srcpkgs/poco-devel @@ -0,0 +1 @@ +poco \ No newline at end of file diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template new file mode 100644 index 0000000000..1e73841776 --- /dev/null +++ b/srcpkgs/poco/template @@ -0,0 +1,26 @@ +# Template build file for 'poco'. +pkgname=poco +version=1.7.8p2 +revision=1 +build_style=cmake +short_desc="C++ class libraries for building network-based applications" +maintainer="Julien Dehos " +license="Boost Software License 1.0" +homepage="https://pocoproject.org" +distfiles="https://pocoproject.org/releases/${pkgname}-${version%p*}/${pkgname}-${version}-all.tar.gz" +checksum=4e4d0de6fbdb1016cd68f85c32d7260e950c93aa453686a3141ea3f9ca6f409a +wrksrc="${pkgname}-${version}-all" + +post_install() { + vlicense LICENSE +} + +poco-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + vmove usr/lib/cmake + } +} From 9abd31d72b11f30f9e52649a14d8f84e23163cf2 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Wed, 19 Apr 2017 15:04:04 +0200 Subject: [PATCH 0145/1145] New package: openblas-0.2.19 Closes: #6222 [via git-merge-pr] --- common/shlibs | 1 + srcpkgs/openblas-devel | 1 + srcpkgs/openblas/template | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 120000 srcpkgs/openblas-devel create mode 100644 srcpkgs/openblas/template diff --git a/common/shlibs b/common/shlibs index c2b3f97da0..f13f8c8647 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2835,3 +2835,4 @@ libPocoDataSQLite.so.48 poco-1.7.8p2_1 libPocoFoundation.so.48 poco-1.7.8p2_1 libPocoXML.so.48 poco-1.7.8p2_1 libPocoUtil.so.48 poco-1.7.8p2_1 +libopenblas.so.0 openblas-0.2.19_1 diff --git a/srcpkgs/openblas-devel b/srcpkgs/openblas-devel new file mode 120000 index 0000000000..6d65db3260 --- /dev/null +++ b/srcpkgs/openblas-devel @@ -0,0 +1 @@ +openblas \ No newline at end of file diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template new file mode 100644 index 0000000000..46a00bad59 --- /dev/null +++ b/srcpkgs/openblas/template @@ -0,0 +1,37 @@ +# Template file for 'openblas' +pkgname=openblas +version=0.2.19 +revision=1 +wrksrc="OpenBLAS-${version}" +build_style=gnu-makefile +make_build_args="HOSTCC=gcc USE_OPENMP=1" +hostmakedepends="perl gcc-fortran" +makedepends="cblas-devel lapack-devel lapacke-devel libgomp-devel" +short_desc="Basic Linear Algebra Subprograms based on GotoBLAS2" +maintainer="Julien Dehos " +homepage="http://www.openblas.net/" +license="3-clause-BSD" +distfiles="https://github.com/xianyi/${pkgname}/archive/v${version}.tar.gz" +checksum="9c40b5e4970f27c5f6911cb0a28aa26b6c83f17418b69f8e5a116bb983ca8557" + +case "${XBPS_TARGET_MACHINE}" in +armv6*) make_build_args+=" TARGET=ARMV6" ;; +armv7*) make_build_args+=" TARGET=ARMV7" ;; +aarch64*) make_build_args+=" TARGET=ARMV8" ;; +i686*) make_build_args+=" BINARY=32 " ;; +esac + +post_install() { + vlicense LICENSE +} + +openblas-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake/openblas + vmove usr/lib/libopenblas*.a* + vmove usr/lib/libopenblas.so + } +} From f5756fe5c9dbb25e164ae8563693cb5a4fabbffb Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 10:57:44 +0000 Subject: [PATCH 0146/1145] gstreamer1: update to 1.12.0. --- srcpkgs/gstreamer1/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 11911c0281..0646903717 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,7 +1,6 @@ # Template file for 'gstreamer1'. pkgname=gstreamer1 -reverts="1:1.4.5_1" -version=1.10.4 +version=1.12.0 revision=1 wrksrc="gstreamer-${version}" build_style=gnu-configure @@ -15,7 +14,7 @@ maintainer="Juan RP " homepage="https://gstreamer.freedesktop.org" license="LGPL-2.1" distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218 +checksum=14d5eef8297d2bf2a728d38fa43cd92cc267a0ad260cf83d770215212aff4302 # Package build options build_options="gir" From 32155e51c1ccb16c22c62d12d9c7eb9004ba45b0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:23:48 +0000 Subject: [PATCH 0147/1145] gst1-python: update to 1.12.0. --- srcpkgs/gst1-python/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-python/template b/srcpkgs/gst1-python/template index 847e4f79c8..b057761c56 100644 --- a/srcpkgs/gst1-python/template +++ b/srcpkgs/gst1-python/template @@ -1,6 +1,6 @@ # Template file for 'gst1-python'. pkgname=gst1-python -version=1.10.4 +version=1.12.0 revision=1 wrksrc="gst-python-${version}" build_style=gnu-configure @@ -14,7 +14,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=59508174b8bc86c05290aa9a7c5d480ac556a6f36306ddbc1d0eacf4f7868212 +checksum=be33de6b9f21e95f677ef91b142e5249e71c8d7e894a5a4a53e19cf18d5d9c07 pre_configure() { if [ "$CROSS_BUILD" ]; then From 02251d0e473153ade887edc6d1a89977134f2629 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:01 +0000 Subject: [PATCH 0148/1145] gst-plugins-base1: update to 1.12.0. --- srcpkgs/gst-plugins-base1/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 97dc7b28aa..38601eb841 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,7 +1,6 @@ # Template file for 'gst-plugins-base1'. pkgname=gst-plugins-base1 -reverts="1:1.4.5_3" -version=1.10.4 +version=1.12.0 revision=1 wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure @@ -20,7 +19,7 @@ maintainer="Juan RP " homepage="https://gstreamer.freedesktop.org" license="GPL-2, LGPL-2.1" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7 +checksum=345fc6877f54b8b6e97aacf2996be37a51a0e369f53fc2cf83108af9f764364d case "$XBPS_TARGET_MACHINE" in i686*) CFLAGS="-O2 -msse2";; From b4be12fe6df9921071055546e0ac3a15f976d2a7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:04 +0000 Subject: [PATCH 0149/1145] gst-plugins-good1: update to 1.12.0. --- srcpkgs/gst-plugins-good1/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 7981f114fd..942df4ab70 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,8 +1,7 @@ # Template file for 'gst-plugins-good1'. pkgname=gst-plugins-good1 -reverts="1:1.4.5_3" -version=1.10.4 -revision=2 +version=1.12.0 +revision=1 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -23,4 +22,4 @@ maintainer="Juan RP " homepage="https://gstreamer.freedesktop.org" license="LGPL-2.1" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e +checksum=8a1d734db7338e00c28b794a7f0a5a9e67d1c5c8b0074075b50638207d372ebc From dde38f19029b861a1039a9958fdf4cef0c437bb3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:07 +0000 Subject: [PATCH 0150/1145] gst-plugins-bad1: update to 1.12.0. --- srcpkgs/gst-plugins-bad1/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 2767f24af5..4883382441 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,8 +1,7 @@ # Template file for 'gst-plugins-bad1'. pkgname=gst-plugins-bad1 -reverts="1:1.4.5_6" -version=1.10.4 -revision=5 +version=1.12.0 +revision=1 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -22,7 +21,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966 +checksum=11b73cfff1b315a8e9be1756435ea84937e7cb90afbab0e8e6975367dbfb8534 case "$XBPS_TARGET_MACHINE" in armv6*) # libvpx can't be built for armv6l From 2714a183b0512f557a076484150745d09fd9d5a1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:10 +0000 Subject: [PATCH 0151/1145] gst-plugins-ugly1: update to 1.12.0. --- srcpkgs/gst-plugins-ugly1/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 9d4b2d53b8..d95a7dade0 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,7 +1,6 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 -reverts="1:1.4.5_2" -version=1.10.4 +version=1.12.0 revision=1 lib32disabled=yes wrksrc="${pkgname/1/}-${version}" @@ -18,4 +17,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=6386c77ca8459cba431ed0b63da780c7062c7cc48055d222024d8eaf198ffa59 +checksum=5e68ba5046e83ee87b17d7a13931e6091466fd771e1338c5b929ee0944d40ad6 From 84aae163ff68c1ce60d2c599bf14d043b0743d78 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:16 +0000 Subject: [PATCH 0152/1145] gst-libav: update to 1.12.0. --- srcpkgs/gst-libav/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index b98da96611..bc33c4f028 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,7 +1,6 @@ # Template file for 'gst-libav' pkgname=gst-libav -reverts="1:1.4.5_4" -version=1.10.4 +version=1.12.0 revision=1 lib32disabled=yes wrksrc="${pkgname}-${version}" @@ -15,7 +14,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b +checksum=39d1477f642ee980b008e78d716b16801eec9a6e5958c5a6cdc0cb04ab0750c4 case "$XBPS_TARGET_MACHINE" in *-musl) # Required by musl for M_SQRT1_2 From df47f13cfcf2585d3975e0d1a5ffc0f4dc1e934a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:20 +0000 Subject: [PATCH 0153/1145] gst-omx: update to 1.12.0. --- srcpkgs/gst-omx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template index 31a4812a4a..3c879ffdd4 100644 --- a/srcpkgs/gst-omx/template +++ b/srcpkgs/gst-omx/template @@ -1,6 +1,6 @@ # Template file for 'gst-omx' pkgname=gst-omx -version=1.10.4 +version=1.12.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config python glib-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=45072925cf262f0fd528fab78f0de52734e46a5a88aa802fae51c67c09c81aa2 +checksum=acee8c8a88b995fb95601b7b43bf0c83f502d9026bca5705f9c0dc44a757997e case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|aarch64*) From 54d8cb3f5fb51c1bac990509e734dda42db858dd Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:25 +0000 Subject: [PATCH 0154/1145] gst1-editing-services: update to 1.12.0. --- srcpkgs/gst1-editing-services/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index af292a5990..3c9da43c97 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,6 +1,6 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services -version=1.10.4 +version=1.12.0 revision=1 wrksrc="${pkgname/gst1/gstreamer}-${version}" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Toyam Cox " license="LGPL-2" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gstreamer}-${version}.tar.xz" -checksum=f2ad6d02dc9d12e899059796e8de03a662f41e4d732797fb4b5ecbc973582144 +checksum=993372f80cafd5395e90a4bc8bf28733513949a2ae4df987ab0dcc99fc5bab66 gst1-editing-services-devel_package() { short_desc+=" - development files" From c16c6ba51f5291d31f87c0f64339ced69efb50f1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 11:24:31 +0000 Subject: [PATCH 0155/1145] gstreamer-vaapi: update to 1.12.0. --- srcpkgs/gstreamer-vaapi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index 0dea63ed24..e6694d0723 100644 --- a/srcpkgs/gstreamer-vaapi/template +++ b/srcpkgs/gstreamer-vaapi/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer-vaapi' pkgname=gstreamer-vaapi -version=1.10.4 +version=1.12.0 revision=1 build_style=gnu-configure lib32disabled=yes @@ -12,4 +12,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" -checksum=03e690621594d9f9495d86c7dac8b8590b3a150462770ed070dc76f66a70de75 +checksum=4a1a5a174b3d3a76ce6c123203e7ee535a347d77f9d4f4ffaf69bfbbfeb03ddb From 5d02f4089623f7fa97158a5d7ecca7f658fad710 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 17:24:08 +0000 Subject: [PATCH 0156/1145] gst-libav: use system libav* --- srcpkgs/gst-libav/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index bc33c4f028..158dfb10f7 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -5,9 +5,9 @@ revision=1 lib32disabled=yes wrksrc="${pkgname}-${version}" build_style=gnu-configure -configure_args="--with-libav-extra-configure=--enable-runtime-cpudetect" +configure_args="--with-system-libav" hostmakedepends="pkg-config yasm python" -makedepends="orc-devel gst-plugins-base1-devel" +makedepends="orc-devel gst-plugins-base1-devel ffmpeg-devel" depends="orc>=0.4.18 gst-plugins-base1>=${version}" short_desc="GStreamer libav plugin (1.x)" maintainer="Juan RP " From e719f0d12cfb5849abb83918488019a9a67dc38d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 20:31:04 +0000 Subject: [PATCH 0157/1145] the_silver_searcher: update to 1.0.3. --- srcpkgs/the_silver_searcher/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/the_silver_searcher/template b/srcpkgs/the_silver_searcher/template index c23dfcadaa..ded91a9618 100644 --- a/srcpkgs/the_silver_searcher/template +++ b/srcpkgs/the_silver_searcher/template @@ -1,6 +1,6 @@ # Template file for 'the-silver-searcher' pkgname=the_silver_searcher -version=1.0.2 +version=1.0.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake" @@ -10,7 +10,7 @@ maintainer="Jan S. " license="Apache-2.0" homepage="http://geoff.greer.fm/ag/" distfiles="http://geoff.greer.fm/ag/releases/${pkgname}-${version}.tar.gz" -checksum=6f4a78e1f1dfa5434c19e5a585ac8cefee69986f90920928498217b36b84a46c +checksum=d586f483a0e709dd383f82006495550114171719f0633a24f09fab6c8dde009e post_install() { rm ${DESTDIR}/usr/share/the_silver_searcher/completions/ag.bashcomp.sh From 3ed2b1f8294092949bdc87d239e3c8ecfc6c6e9c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 20:31:12 +0000 Subject: [PATCH 0158/1145] cmake: update to 3.8.1. --- srcpkgs/cmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 79fb442e81..8368550dc0 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.8.0 +version=3.8.1 revision=1 build_style=configure makedepends="zlib-devel bzip2-devel expat-devel libcurl-devel ncurses-devel libarchive-devel @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-2.1, 3-clause-BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v${version%.*}/$pkgname-$version.tar.gz" -checksum=cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 +checksum=ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 if [ "$CROSS_BUILD" ]; then # XXX ugly :-) From b7bf69362f002e315201079932cdd8c628921504 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 20:31:14 +0000 Subject: [PATCH 0159/1145] cmake-gui: update to 3.8.1. --- srcpkgs/cmake-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index d9180621c9..70b4856385 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.8.0 +version=3.8.1 revision=1 wrksrc="cmake-${version}" build_style=configure @@ -15,7 +15,7 @@ maintainer="Juan RP " license="LGPL-2.1, 3-clause-BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v${version%.*}/cmake-$version.tar.gz" -checksum=cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 +checksum=ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 nocross=yes do_install() { From 2680ed2e85a1db983c248b5f1757e73ab8ac86e8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 20:39:21 +0000 Subject: [PATCH 0160/1145] vice: update to 3.1. --- srcpkgs/vice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template index f03de02c5e..c2d14a503c 100644 --- a/srcpkgs/vice/template +++ b/srcpkgs/vice/template @@ -1,6 +1,6 @@ # Template file for 'vice' pkgname=vice -version=2.4.33 +version=3.1 revision=1 build_style=gnu-configure configure_args="--enable-sdlui $(vopt_with pulseaudio pulse)" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://vice-emu.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/vice-emu/$pkgname-$version.tar.gz" -checksum=111bb26310bd660802767084f6840a75156158134689a23a3c8a0e0d817ee36d +checksum=3eb8159633816095006dec36c5c3edd055a87fd8bda193a1194a6801685d1240 nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/15374/steps/shell_3/logs/stdio" # Package build options From 21abedad84b72df93f793b5a654ffc4da3137b8c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 20:51:42 +0000 Subject: [PATCH 0161/1145] musescore: update to 2.1.0. --- srcpkgs/musescore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template index 37180afd85..c366f8e08d 100644 --- a/srcpkgs/musescore/template +++ b/srcpkgs/musescore/template @@ -1,6 +1,6 @@ # Template file for 'musescore' pkgname=musescore -version=2.0.3 +version=2.1.0 revision=1 wrksrc="MuseScore-${version}" build_style=gnu-makefile @@ -19,4 +19,4 @@ maintainer="Brian Olsen " license="GPL-2" homepage="https://musescore.org/" distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz" -checksum=66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 +checksum=0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 From 6cbc9fee6e0c0fdc1425c09e2b62775804166de8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 5 May 2017 22:05:10 +0000 Subject: [PATCH 0162/1145] fstrm: update to 0.3.2. --- srcpkgs/fstrm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fstrm/template b/srcpkgs/fstrm/template index 8d35b763e0..451bf3c144 100644 --- a/srcpkgs/fstrm/template +++ b/srcpkgs/fstrm/template @@ -1,7 +1,7 @@ # Template file for 'fstrm' pkgname=fstrm -version=0.3.1 -revision=2 +version=0.3.2 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libevent-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="Apache-2.0" homepage="https://github.com/farsightsec/fstrm" distfiles="https://github.com/farsightsec/fstrm/archive/v${version}.tar.gz" -checksum=a61ec0bb88b1e7bab05a6c854219deb451137c4de15800fc1ee2bee4b9b0d22a +checksum=16112cda18aece363e32a04cd2265174b09944f3f3dcffa5c8312a293ec93737 pre_configure() { autoreconf -fi From e265bc3639e5b3dbc7e0335236be7e7b4f5e0921 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 01:33:26 +0200 Subject: [PATCH 0163/1145] linux4.9: update to 4.9.26. --- srcpkgs/linux4.9/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 0504a0c1e7..6f8a24f132 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.21 +version=4.9.26 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=97503749bf7997b3e55a5126080df348e74c0bb0e10ad85b1b2ec9db7e5e6c24 +checksum=dfc615e19752dbd9f2b13ab4c211ffafe02150775d086deb24fe94398abce9d3 nodebug=yes # -dbg package is generated below manually nostrip=yes From 1491d01ed0fc280e94684aed35f4323eceaa6829 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 01:33:34 +0200 Subject: [PATCH 0164/1145] linux4.4: update to 4.4.66. --- srcpkgs/linux4.4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index db567fa66c..a56450eda6 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,6 +1,6 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.59 +version=4.4.66 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -8,7 +8,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=64e9523c4c7fdaf391a16dd19541bb58e39943cb2151aa0c3d15b6aeaba996ca +checksum=9a440787c938b5a8850a274cf3cf726ba5b276e1f937ec3761c3b7dff420d483 nocross=yes nodebug=yes From c272738965ab8709b3fe872925082fce70c4fc32 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 01:38:31 +0200 Subject: [PATCH 0165/1145] rpi-kernel: update to 4.4.50. --- srcpkgs/rpi-kernel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 418b84b112..9c11f994bc 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -1,10 +1,10 @@ # Template file for 'rpi-kernel' # -_githash="c376c9f540932820080c7ffee571e7248d705335" +_githash="04c8e47067d4873c584395e5cb260b4f170a99ea" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.4.47 +version=4.4.50 revision=1 wrksrc="linux-${_githash}" maintainer="Juan RP " @@ -12,7 +12,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=975c46abbeff0c8d35e1262c7859942e8b923d69f10370aa05c4280849a4bc01 +checksum=681e8aaa538fc9a7de48aa7909173664b07fbd97798afdc1064062689bcc5e2a _kernver="${version}_${revision}" From a260aeee134e516991f0131d5dcd280b9660bcb2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 01:46:51 +0200 Subject: [PATCH 0166/1145] linux4.9: fix dotconfigs --- srcpkgs/linux4.9/files/i386-dotconfig | 3 ++- srcpkgs/linux4.9/files/x86_64-dotconfig | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.9/files/i386-dotconfig b/srcpkgs/linux4.9/files/i386-dotconfig index 13da537178..434efef27d 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.0 Kernel Configuration +# Linux/x86 4.9.26 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5298,6 +5298,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m diff --git a/srcpkgs/linux4.9/files/x86_64-dotconfig b/srcpkgs/linux4.9/files/x86_64-dotconfig index 4a5a0922ad..626db112fb 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_64 4.9.3 Kernel Configuration +# Linux/x86_64 4.9.26 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5314,6 +5314,7 @@ CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m @@ -5388,7 +5389,8 @@ CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5670=m -# CONFIG_SND_SOC_RT5677_SPI is not set +CONFIG_SND_SOC_RT5677=m +CONFIG_SND_SOC_RT5677_SPI=m CONFIG_SND_SOC_SGTL5000=m CONFIG_SND_SOC_SI476X=m CONFIG_SND_SOC_SIGMADSP=m From bd6cfa095f2090413d0b0f7c9849cff9b7ae4d20 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 6 May 2017 08:10:27 +0200 Subject: [PATCH 0167/1145] calibre: update to 2.84.0. --- srcpkgs/calibre/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index 3cdf2955de..f7234a78dc 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre -version=2.83.0 -revision=2 +version=2.84.0 +revision=1 hostmakedepends="qt5-qmake python-devel pkg-config python-dateutil python-lxml python-Pillow python-PyQt5-webkit python-apsw python-cssutils python-CherryPy" @@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://calibre-ebook.com" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=96166e8c74047cfbae9289c38ab5e2f661168048e568cd187f908242d98426ab +checksum=75a6c2f142ccee594d6e208c4c7f57e137e2c4f06c81d36d5bc42f0dcdaa76cf nocross=yes pycompile_dirs="/usr/lib/calibre/" From ea168cfdb705da4b623f1efce419966e27a95891 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:20:12 +0000 Subject: [PATCH 0168/1145] hdparm: update to 9.52. --- srcpkgs/hdparm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template index 5a3d63328b..8786cb492d 100644 --- a/srcpkgs/hdparm/template +++ b/srcpkgs/hdparm/template @@ -1,7 +1,7 @@ # Template file for 'hdparm' pkgname=hdparm -version=9.51 -revision=2 +version=9.52 +revision=1 build_style=gnu-makefile make_install_args="exec_prefix=/usr sbindir=/usr/bin" short_desc="Utility to access IDE device parameters" @@ -9,4 +9,4 @@ maintainer="Juan RP " homepage="http://sourceforge.net/projects/hdparm/" license="BSD" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=1afad8891ecbe644c283f7d725157660ebf8bd5b4d9d67232afd45f83d2d5d91 +checksum=c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6 From 49cb3113afafea0ba72b2f1578e64d8ccd288752 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:25:11 +0000 Subject: [PATCH 0169/1145] git-extras: update to 4.3.0. --- srcpkgs/git-extras/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git-extras/template b/srcpkgs/git-extras/template index cc064c4d89..81368f7d40 100644 --- a/srcpkgs/git-extras/template +++ b/srcpkgs/git-extras/template @@ -1,6 +1,6 @@ # Template file for 'git-extras' pkgname=git-extras -version=4.2.0 +version=4.3.0 revision=1 noarch=yes build_style=gnu-makefile @@ -10,7 +10,7 @@ maintainer="Eivind Uggedal " license="MIT" homepage="https://github.com/tj/git-extras" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=53668af26c58e7866addbd2b14b29f63ee39029bdcee5f48957c4a958bdb225f +checksum=25e608ba17b49d38e1f1f9938cceb9a7406f4e2a5e9488898c193e82ac42e3be pre_build() { sed -i 's|$(SYSCONFDIR)/bash_completion.d|/usr/share/bash-completion/completions|' Makefile From b69e4b2062185bb3e544b2d684d94054e560bd3b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:26:09 +0000 Subject: [PATCH 0170/1145] libmediainfo: update to 0.7.95. --- srcpkgs/libmediainfo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmediainfo/template b/srcpkgs/libmediainfo/template index fbc6ec1f19..3f9953e308 100644 --- a/srcpkgs/libmediainfo/template +++ b/srcpkgs/libmediainfo/template @@ -1,6 +1,6 @@ # Template file for 'libmediainfo' pkgname=libmediainfo -version=0.7.94 +version=0.7.95 revision=1 short_desc="Shared library for mediainfo" homepage="http://mediaarea.net/MediaInfo" @@ -8,7 +8,7 @@ maintainer="Georg Schabel " license="BSD" distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.bz2" -checksum=e41483a7a7323a74315e95db4573fb5bd057e78f5d0eaf630e48df153bc421b5 +checksum=8b70dc7dc4346707c68e8d45af9af682d697184cc1ec1e6df907ac82848190cd build_style=gnu-configure hostmakedepends="automake libtool pkg-config" From 6deefc3a7339014b54574c660113ff95a3f72b00 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:26:13 +0000 Subject: [PATCH 0171/1145] mediainfo: update to 0.7.95. --- srcpkgs/mediainfo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template index 11300bc97d..b1ca1382b9 100644 --- a/srcpkgs/mediainfo/template +++ b/srcpkgs/mediainfo/template @@ -1,6 +1,6 @@ # Template file for 'mediainfo' pkgname=mediainfo -version=0.7.94 +version=0.7.95 revision=1 short_desc="Display technical and tag data for video and audio files" homepage="http://mediaarea.net/MediaInfo" @@ -14,7 +14,7 @@ _gnudir="MediaInfo/Project/GNU" replaces="mediainfo-gui>=0" license="BSD" distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz" -checksum=fe7cfe1551cc6d0e4a1deb32c55d9b8aee860b1fcacc1edb9b4092a103b18cd4 +checksum=37b73c0a36666901ae11ad44c893113dfa43b69a98e25f29142fea5108dcb258 nocross=yes # wxWidgets do_configure() { From 98405a5c7b17c185c5903f26d5cacd4a2e347518 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 6 May 2017 08:34:48 +0200 Subject: [PATCH 0172/1145] xfsprogs: update to 4.11.0. --- srcpkgs/xfsprogs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index d673f07a24..6930caa0a8 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -1,6 +1,6 @@ # Template file for 'xfsprogs' pkgname=xfsprogs -version=4.10.0 +version=4.11.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" homepage="http://xfs.org/" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" -checksum=d8cb9ab2c686699d37914354ce3992b4aff3677093cbce06ad18bf798da8a8a7 +checksum=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 do_install() { make install install-dev DIST_ROOT=${DESTDIR} \ From f88681e9a8232c70f840940b907a7ef9b5c1b14a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:42:00 +0000 Subject: [PATCH 0173/1145] hoogle: update to 5.0.11. --- srcpkgs/hoogle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template index 043d822aec..5d6cec801b 100644 --- a/srcpkgs/hoogle/template +++ b/srcpkgs/hoogle/template @@ -1,6 +1,6 @@ # Template file for 'hoogle' pkgname=hoogle -version=5.0.9 +version=5.0.11 revision=1 build_style=haskell-stack nocross=yes # Can't yet cross compile Haskell @@ -11,7 +11,7 @@ maintainer="Inokentiy Babushkin " license="BSD-3" homepage="http://hoogle.haskell.org/" distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz" -checksum="6f181b5d8f061a7679c8d394676201d23be363f4612fd0c93f908e7792591ed3" +checksum=9854fa6ad00d7869e4afce601be74d1d6743d96d4e86ea9cccc666d6edd1cbe8 nopie=yes # network-2.6.3.1 build fails with a relocation post_install() { From 2ec4799834692ab7d21caf5b911559ae14aaf55f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:42:03 +0000 Subject: [PATCH 0174/1145] hxtools: update to 20170430. --- srcpkgs/hxtools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hxtools/template b/srcpkgs/hxtools/template index 253ed9f1ec..8f16f1a7ad 100644 --- a/srcpkgs/hxtools/template +++ b/srcpkgs/hxtools/template @@ -1,6 +1,6 @@ #Template file for 'hxtools' pkgname=hxtools -version=20170114 +version=20170430 revision=1 build_style=gnu-configure short_desc="Collection of small tools over the years by j.eng (inai.de)" @@ -8,6 +8,6 @@ maintainer="nexolight " license="WTFPL-2.0+, LGPL-2.1/LGPL-3.0, GPL-2.0+" homepage="http://inai.de/projects/hxtools" distfiles="http://jftp.inai.de/hxtools/hxtools-${version}.tar.xz" -checksum=83c4a67aefef7a63b3d7f446fb83a95a40638792326fb3659c3dccb3dc3c4998 +checksum=ba6128d48c365d6f07d2698cd33aa76dfd47a2e813c067dcc340588c471bbcfb hostmakedepends="pkg-config" makedepends="libHX-devel" From 1d208fe31ecf04b436e5f5f481e3f23eaa966de5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 08:52:59 +0200 Subject: [PATCH 0175/1145] LuaJIT: fix .so symlink --- srcpkgs/LuaJIT/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index d092a4f626..ccf75b0969 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -1,7 +1,7 @@ # Template file for 'LuaJIT' pkgname=LuaJIT version=2.0.5 -revision=1 +revision=2 hostmakedepends="lua52-BitOp" short_desc="A Just-In-Time Compiler for Lua" maintainer="Juan RP " @@ -42,7 +42,7 @@ do_install() { make DPREFIX=${DESTDIR}/usr DESTDIR=${DESTDIR} \ INSTALL_SHARE=${DESTDIR}/usr/share PREFIX=/usr install - ln -fs libluajit-5.1.so.2.0.4 ${DESTDIR}/usr/lib/libluajit-5.1.so.2 + ln -fs libluajit-5.1.so.${version} ${DESTDIR}/usr/lib/libluajit-5.1.so.2 } LuaJIT-devel_package() { From 0e40d5560e24ee97eae830d8763207da5d1f990a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:46:40 +0000 Subject: [PATCH 0176/1145] libqmi: update to 1.18.0. --- srcpkgs/libqmi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template index 998b0e020c..b9814b8f5c 100644 --- a/srcpkgs/libqmi/template +++ b/srcpkgs/libqmi/template @@ -1,17 +1,17 @@ # Template file for 'libqmi' pkgname=libqmi -version=1.16.2 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config python glib-devel" -makedepends="libglib-devel" +makedepends="libglib-devel libgudev-devel" short_desc="QMI modem protocol helper library" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/libqmi/" license="GPL-2" distfiles="${FREEDESKTOP_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=290bb367b12de1a24c3d2dee83886ca9669e281505ac3ee0bfdbe6bd84c44b81 +checksum=a0a42c55935e75a630208e2f70840bd4407f56fe1c5258f5b0f6c0aaedf88cec libqmi-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" From 154c1132198f335e63e14e92a438007afa1d4095 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 06:48:01 +0000 Subject: [PATCH 0177/1145] libmicrohttpd: update to 0.9.54. --- srcpkgs/libmicrohttpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template index 0d21048a70..3241c96f5e 100644 --- a/srcpkgs/libmicrohttpd/template +++ b/srcpkgs/libmicrohttpd/template @@ -1,6 +1,6 @@ # Template file for 'libmicrohttpd' pkgname=libmicrohttpd -version=0.9.53 +version=0.9.54 revision=1 build_style=gnu-configure makedepends="libgcrypt-devel gnutls-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://www.gnu.org/software/libmicrohttpd/" license="LGPL-2.1" distfiles="${GNU_SITE}/libmicrohttpd/${pkgname}-${version}.tar.gz" -checksum=9b15ec2d381f44936323adfd4f989fa35add517cccbbfa581896b02a393c2cc4 +checksum=bcc721895d4a114b0548a39d2241c35caacb9e2e072d40e11b55c60e3d5ddcbe libmicrohttpd-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" From f0a6cc6e02507fb6526d90c3d0843b54b6130efe Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 07:02:53 +0000 Subject: [PATCH 0178/1145] libqmi: fix musl --- srcpkgs/libqmi/patches/musl.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/libqmi/patches/musl.patch diff --git a/srcpkgs/libqmi/patches/musl.patch b/srcpkgs/libqmi/patches/musl.patch new file mode 100644 index 0000000000..49c181fa8d --- /dev/null +++ b/srcpkgs/libqmi/patches/musl.patch @@ -0,0 +1,11 @@ +--- src/libqmi-glib/qmi-utils.c.orig 2017-03-21 13:26:54.000000000 +0000 ++++ src/libqmi-glib/qmi-utils.c 2017-05-06 07:01:21.180900541 +0000 +@@ -740,7 +740,7 @@ + * /sys/bus/usb/drivers/qmi_wwan + */ + tmp = g_strdup_printf ("/sys/class/%s/%s/device/driver", subsystems[i], device_basename); +- path = canonicalize_file_name (tmp); ++ path = realpath (tmp, NULL); + g_free (tmp); + + if (g_file_test (path, G_FILE_TEST_EXISTS)) From 0119bf7576f370dc2a7992e42cf7c9030f657a9a Mon Sep 17 00:00:00 2001 From: Alexander Mamay Date: Tue, 14 Feb 2017 12:47:50 +0600 Subject: [PATCH 0179/1145] New package: azpainter-2.0.1 Closes: #5749 [via git-merge-pr] --- srcpkgs/azpainter/patches/cross.patch | 11 +++++++++++ srcpkgs/azpainter/template | 19 +++++++++++++++++++ srcpkgs/azpainter/update | 1 + 3 files changed, 31 insertions(+) create mode 100644 srcpkgs/azpainter/patches/cross.patch create mode 100644 srcpkgs/azpainter/template create mode 100644 srcpkgs/azpainter/update diff --git a/srcpkgs/azpainter/patches/cross.patch b/srcpkgs/azpainter/patches/cross.patch new file mode 100644 index 0000000000..b9066c4079 --- /dev/null +++ b/srcpkgs/azpainter/patches/cross.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig ++++ configure.ac +@@ -30,7 +30,7 @@ + [AC_DEFINE([HAVE_PTHREAD_H], [1], [pthread.h])], + AC_MSG_ERROR(pthread.h not found)) + +-AC_CHECK_FILE("$freetype_dir/ft2build.h",,AC_MSG_ERROR([(freetype) ft2build.h not found])) ++ + AC_CHECK_HEADER([fontconfig/fontconfig.h],,AC_MSG_ERROR(fontconfig.h not found)) + AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR(zlib.h not found)) + AC_CHECK_HEADER([png.h],,AC_MSG_ERROR(png.h not found)) diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template new file mode 100644 index 0000000000..068ff01b43 --- /dev/null +++ b/srcpkgs/azpainter/template @@ -0,0 +1,19 @@ +# Template file for 'azpainter' +pkgname=azpainter +version=2.0.1 +revision=1 +build_style=gnu-configure +hostmakedepends="automake" +makedepends="fontconfig-devel libjpeg-turbo-devel libXi-devel" +short_desc="A full-color painting software for illustration drawing" +maintainer="Alexander Mamay " +license="GPL-3" +homepage="http://azsky2.html.xdomain.jp/linux/azpainter/" +distfiles="http://osdn.dl.osdn.net/azpainter/67071/azpainter-${version}.tar.bz2" +checksum=8b773f0cf6ca6d39edddc928b09026bc5b1ec6ec4ffcb39edb2e19f2e9629e85 + +CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/azpainter/update b/srcpkgs/azpainter/update new file mode 100644 index 0000000000..3ef55f6de1 --- /dev/null +++ b/srcpkgs/azpainter/update @@ -0,0 +1 @@ +pattern='\-\ ver\ \K[\d.]+' From 576c89c34ef5d4313163b75e3ddcbeb7c2e4b8f7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 16:12:53 +0200 Subject: [PATCH 0180/1145] New package: rtmidi-2.1.1 --- common/shlibs | 1 + srcpkgs/rtmidi-devel | 1 + srcpkgs/rtmidi/template | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 120000 srcpkgs/rtmidi-devel create mode 100644 srcpkgs/rtmidi/template diff --git a/common/shlibs b/common/shlibs index f13f8c8647..b0e2753324 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2836,3 +2836,4 @@ libPocoFoundation.so.48 poco-1.7.8p2_1 libPocoXML.so.48 poco-1.7.8p2_1 libPocoUtil.so.48 poco-1.7.8p2_1 libopenblas.so.0 openblas-0.2.19_1 +librtmidi.so.3 rtmidi-2.1.1_1 diff --git a/srcpkgs/rtmidi-devel b/srcpkgs/rtmidi-devel new file mode 120000 index 0000000000..1dd69e0a10 --- /dev/null +++ b/srcpkgs/rtmidi-devel @@ -0,0 +1 @@ +rtmidi \ No newline at end of file diff --git a/srcpkgs/rtmidi/template b/srcpkgs/rtmidi/template new file mode 100644 index 0000000000..b175c97eaa --- /dev/null +++ b/srcpkgs/rtmidi/template @@ -0,0 +1,30 @@ +# Template file for 'rtmidi' +pkgname=rtmidi +version=2.1.1 +revision=1 +build_style=gnu-configure +configure_args="--with-alsa --with-jack" +hostmakedepends="automake libtool" +makedepends="alsa-lib-devel jack-devel" +short_desc="C++ classes for realtime MIDI input/output" +maintainer="Duncaen " +license="RtMidi, MIT" +homepage="http://www.music.mcgill.ca/~gary/rtmidi/" +distfiles="https://github.com/thestk/rtmidi/archive/${version}.tar.gz" +checksum=a015fbed67c777c7bc7bbcb96c07386ba3a8ff21006b411331e6f0b9f3f14d11 + +pre_configure() { + sed -i 's/\($cppflag\)/\1 $CFLAGS/' configure.ac + autoreconf -fi +} + +rtmidi-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 5399cf97874b1ebef0476997a5bdb491a808d4e2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 17:14:31 +0200 Subject: [PATCH 0181/1145] New package: giada-0.13.4 --- srcpkgs/giada/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/giada/template diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template new file mode 100644 index 0000000000..aade93b3a7 --- /dev/null +++ b/srcpkgs/giada/template @@ -0,0 +1,21 @@ +# Template file for 'giada' +pkgname=giada +version=0.13.4 +revision=1 +build_style=gnu-configure +configure_args="--target=linux" +hostmakedepends="automake" +makedepends="fltk-devel jack-devel jansson-devel libsamplerate-devel + libsndfile-devel libXpm-devel pulseaudio-devel rtmidi-devel" +short_desc="Loop machine, audio tool for DJs, live performers and musicians" +maintainer="Duncaen " +license="GPL-3" +homepage="https://www.giadamusic.com/" +distfiles="https://github.com/monocasual/giada/archive/v${version}.tar.gz" +checksum=9cfeeede201afc1c03f820ddf2dc354a2853bcb8ad8d1114b3bbe3f1e4968fc6 + +CPPFLAGS="-Wno-error=cpp" + +pre_configure() { + autoreconf -fi +} From da21f9efb37fc02c7ab923ac775d52b97f35f4b1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 6 May 2017 18:00:29 +0200 Subject: [PATCH 0182/1145] smtube: update to 17.5.0. --- srcpkgs/smtube/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template index 81c9e2da7b..1af67b4ecb 100644 --- a/srcpkgs/smtube/template +++ b/srcpkgs/smtube/template @@ -1,6 +1,6 @@ # Template file for 'smtube' pkgname=smtube -version=17.1.0 +version=17.5.0 revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-script-devel qt5-tools-devel qt5-webkit-devel" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.smtube.org/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=c128f52bfb71ca2ba1d4b8178ed1466d1b3befa29b081893876cdb93272ee4cd +checksum=8dca5245e2d2be4cb472b7a6e9e7ccafa52f25b0ef2c924944aa058b02a5a08e pre_build() { export QMAKE_OPTS="QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\"" From c13df3444af46d4d3e0a1a1c0ce539f1e99bb2e4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 6 May 2017 18:01:32 +0200 Subject: [PATCH 0183/1145] libevdev: update to 1.5.7. --- srcpkgs/libevdev/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libevdev/template b/srcpkgs/libevdev/template index e09bcea28e..8c194cc725 100644 --- a/srcpkgs/libevdev/template +++ b/srcpkgs/libevdev/template @@ -1,6 +1,6 @@ # Template file for 'libevdev' pkgname=libevdev -version=1.5.6 +version=1.5.7 revision=1 build_style=gnu-configure configure_args="--disable-gcov" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="https://www.freedesktop.org/wiki/Software/libevdev/" distfiles="https://freedesktop.org/software/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 +checksum=a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422 libevdev-devel_package() { short_desc+=" - development files" From f959f6e666cb0dd0d8235b3d2d52e0b621e5f86c Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Tue, 7 Feb 2017 01:45:49 -0200 Subject: [PATCH 0184/1145] New package: srw-0.7 Closes: #5689 [via git-merge-pr] --- srcpkgs/srw/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/srw/template diff --git a/srcpkgs/srw/template b/srcpkgs/srw/template new file mode 100644 index 0000000000..9225bf94a9 --- /dev/null +++ b/srcpkgs/srw/template @@ -0,0 +1,18 @@ +# Template file for 'srw' +pkgname=srw +version=0.7 +revision=1 +wrksrc=emg-srw-14f0a3c1f3bb +build_style=gnu-makefile +short_desc="Simple read wrapper" +maintainer="Diogo Leal " +license="GPL-3" +homepage="https://bitbucket.org/emg/srw" +distfiles="https://bitbucket.org/emg/srw/get/${version}.tar.bz2" +checksum=7e0c3a30747bd58b46a9266303e59a587e0859d3803971fe36dbf57c68e04e27 +nostrip=yes + +pre_build() { + sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk + sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk +} From 0ee534e42a23c9aa22aa89d6b9758fcdcc9b7fc6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 18:02:48 +0200 Subject: [PATCH 0185/1145] srw: fix musl --- srcpkgs/srw/patches/musl-fixes.patch | 10 ++++++++++ srcpkgs/srw/template | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/srw/patches/musl-fixes.patch diff --git a/srcpkgs/srw/patches/musl-fixes.patch b/srcpkgs/srw/patches/musl-fixes.patch new file mode 100644 index 0000000000..fc3916d869 --- /dev/null +++ b/srcpkgs/srw/patches/musl-fixes.patch @@ -0,0 +1,10 @@ +--- srw.c.orig ++++ srw.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #ifdef __linux__ + #include diff --git a/srcpkgs/srw/template b/srcpkgs/srw/template index 9225bf94a9..fc0748a4f6 100644 --- a/srcpkgs/srw/template +++ b/srcpkgs/srw/template @@ -10,7 +10,6 @@ license="GPL-3" homepage="https://bitbucket.org/emg/srw" distfiles="https://bitbucket.org/emg/srw/get/${version}.tar.bz2" checksum=7e0c3a30747bd58b46a9266303e59a587e0859d3803971fe36dbf57c68e04e27 -nostrip=yes pre_build() { sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk From 478d487d48577ee9c5d411588305ad20f016ccae Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 18:14:28 +0200 Subject: [PATCH 0186/1145] New package: youtube-viewer-3.2.7 Closes #6315. --- srcpkgs/youtube-viewer/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/youtube-viewer/template diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template new file mode 100644 index 0000000000..76dc5c7443 --- /dev/null +++ b/srcpkgs/youtube-viewer/template @@ -0,0 +1,13 @@ +# Template file for 'youtube-viewer' +pkgname=youtube-viewer +version=3.2.7 +revision=1 +build_style=perl-module +hostmakedepends="perl" +depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https" +short_desc="Command-line client to search and stream from YouTube" +maintainer="Duncaen " +license="Artistic-2.0" +homepage="https://github.com/trizen/youtube-viewe" +distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz" +checksum=cea80063a472c0b08aa907d936018eba1d1243f148d8437bd98a636adee72eb9 From 3cad8e84f4f58d8f0c8b44258862231b0b63eec4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 6 May 2017 18:42:21 +0200 Subject: [PATCH 0187/1145] smtube: fix cross builds and paths --- srcpkgs/smtube/template | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template index 1af67b4ecb..3bde2dd787 100644 --- a/srcpkgs/smtube/template +++ b/srcpkgs/smtube/template @@ -1,8 +1,13 @@ # Template file for 'smtube' pkgname=smtube version=17.5.0 -revision=1 -build_style=gnu-makefile +revision=2 +build_style=qmake +make_build_args=" + DATA_PATH=\\\"/usr/share/smtube\\\" + TRANSLATION_PATH=\\\"/usr/share/smtube/translations\\\" + DOC_PATH=\\\"/usr/share/doc/smtube\\\"" +build_wrksrc=src hostmakedepends="qt5-host-tools qt5-script-devel qt5-tools-devel qt5-webkit-devel" makedepends="zlib-devel qt5-script-devel qt5-tools-devel qt5-webkit-devel" depends="hicolor-icon-theme desktop-file-utils" @@ -13,9 +18,10 @@ homepage="http://www.smtube.org/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=8dca5245e2d2be4cb472b7a6e9e7ccafa52f25b0ef2c924944aa058b02a5a08e -pre_build() { - export QMAKE_OPTS="QMAKE_CXXFLAGS=\"${CXXFLAGS}\" QMAKE_LFLAGS=\"${LDFLAGS}\"" +post_build() { + lrelease smtube.pro } -do_build() { - make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX" LD="$CXX" +do_install() { + cd "${wrksrc}" + make install PREFIX=/usr DESTDIR=${DESTDIR} } From ef0da5a5b06a5c8c1aeea9284656fe38b6e05bb9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:03:45 +0000 Subject: [PATCH 0188/1145] tig: update to 2.2.2. --- srcpkgs/tig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template index aba2dae6b5..03df890bd5 100644 --- a/srcpkgs/tig/template +++ b/srcpkgs/tig/template @@ -1,6 +1,6 @@ # Template file for 'tig' pkgname=tig -version=2.2.1 +version=2.2.2 revision=1 build_style=gnu-configure make_install_args="install-doc-man" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://jonas.github.io/tig/" distfiles="https://github.com/jonas/tig/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=0b48080896de59179c45c980080b4b414bb235df65ad08d661a9c9e169c3fa71 +checksum=316214d87f7693abc0cbe8ebbb85decdf5e1b49d7ad760ac801af3dd73385e35 post_install() { vinstall contrib/tig-completion.bash 644 usr/share/bash-completion/completions tig From b4cbfbf0673174d26b7ca29316eab4943d77bff8 Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Sat, 6 May 2017 10:04:08 +0100 Subject: [PATCH 0189/1145] neovim-qt: update to 0.2.7. Closes: #6333 [via git-merge-pr] --- srcpkgs/neovim-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neovim-qt/template b/srcpkgs/neovim-qt/template index 95e5adbdd6..ca338209f2 100644 --- a/srcpkgs/neovim-qt/template +++ b/srcpkgs/neovim-qt/template @@ -1,6 +1,6 @@ # Template file for 'neovim-qt' pkgname=neovim-qt -version=0.2.6 +version=0.2.7 revision=1 build_style=cmake makedepends="qt5-devel neovim" @@ -10,7 +10,7 @@ maintainer="Dominic Monroe " license="ISC" homepage="https://github.com/equalsraf/neovim-qt" distfiles="https://github.com/equalsraf/neovim-qt/archive/v${version}.tar.gz" -checksum=91b07a5e7130d75a012094f6ace3efef991bc861114fe740d77bed54b6a21bd2 +checksum=28f2b890eb74c6ab3c772523fe053b9db5c0823eaf259d6eb4ca5f568901540b post_install() { vlicense LICENSE From 74e09bdfda2dfa836c5aed47e0631e0ffed28611 Mon Sep 17 00:00:00 2001 From: lemmi Date: Sat, 6 May 2017 11:55:17 +0200 Subject: [PATCH 0190/1145] abcm2ps: update to 8.13.9. Closes: #6334 [via git-merge-pr] --- srcpkgs/abcm2ps/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index 653a09a268..c159846e68 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,7 +1,7 @@ # Template file for 'abcm2ps' pkgname=abcm2ps -version=8.12.9 -revision=3 +version=8.13.9 +revision=1 build_style=configure hostmakedepends="pkg-config" makedepends="pango-devel" @@ -10,7 +10,7 @@ maintainer="lemmi " license="GPL-2" homepage="http://moinejf.free.fr/" distfiles="${homepage}/abcm2ps-${version}.tar.gz" -checksum=72b8f40964234edf2043bdc83527c37989bbb5fb3b4c108c2ef3cd1883399af4 +checksum=372bc6d5bb5ba087b71abeb6240c806f940a59e9664f46e5f4f1faec52e815a7 pre_configure() { echo CC=${CC} >> custom From 04a6428fc4db1513b00848dcb4da2c936de9aa3d Mon Sep 17 00:00:00 2001 From: lemmi Date: Sat, 6 May 2017 11:51:37 +0200 Subject: [PATCH 0191/1145] obs: update to 18.0.2. Closes: #6335 [via git-merge-pr] --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index eb2bfb2bce..04e6c40c70 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=18.0.1 +version=18.0.2 revision=1 wrksrc=obs-studio-${version} only_for_archs="i686 x86_64 i686-musl x86_64-musl" @@ -15,7 +15,7 @@ maintainer="lemmi " license="GPL-2" homepage="https://obsproject.com" distfiles="https://github.com/jp9000/obs-studio/archive/${version}.tar.gz" -checksum=7945c184833ea8957d55ff81989fe693e5186d1ccfdf1d2f049412d85c456e10 +checksum=1cfbad3439b1d581b4f5b47792ccc4dae231acaf37178808811ff4e2b68feb0a obs-devel_package() { short_desc+=" - development files" From 1ab43f605e7c42c8725e967d373170ab13737f1c Mon Sep 17 00:00:00 2001 From: Jasu Koponen Date: Sat, 6 May 2017 17:35:15 +0300 Subject: [PATCH 0192/1145] love: update to 0.10.2 Closes: #6338 [via git-merge-pr] --- srcpkgs/love/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/love/template b/srcpkgs/love/template index 2b801fcc74..a06d11b1c3 100644 --- a/srcpkgs/love/template +++ b/srcpkgs/love/template @@ -1,6 +1,6 @@ # Template file for 'love' pkgname=love -version=0.10.1 +version=0.10.2 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -12,5 +12,5 @@ maintainer="Caleb Pilon " license="zlib" homepage="https://love2d.org/" distfiles="https://bitbucket.org/rude/love/downloads/${pkgname}-${version}-linux-src.tar.gz" -checksum=a2b0c9a1096a064c40f9f4bafd7ee92c0aa64f70146f7574992425c24e4541fb +checksum=b26b306b113158927ae12d2faadb606eb1db49ffdcd7592d6a0a3fc0af21a387 lib32disabled=yes From 6f4381813407b82aed9c275c499f435f09d7423a Mon Sep 17 00:00:00 2001 From: binladen17 Date: Sat, 6 May 2017 06:39:18 +0200 Subject: [PATCH 0193/1145] nano: update to 2.8.2 Closes: #6332 [via git-merge-pr] --- srcpkgs/nano/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index f34f366353..587d83aef4 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,6 +1,6 @@ # Template file for 'nano' pkgname=nano -version=2.8.1 +version=2.8.2 revision=1 build_style=gnu-configure makedepends="file-devel zlib-devel ncurses-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="https://www.nano-editor.org/" license="GPL-3" distfiles="https://www.nano-editor.org/dist/v${version%.*}/$pkgname-$version.tar.xz" -checksum=e935a8bb373345c833dff3a304c6d392775d206b94c802d9285ae80ac6b66d0b +checksum=023e8a7b38b2420d5476d7b2b4d8524d7de55c0853b4dc0b02e4a4adf7ecb9e0 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DREG_STARTEND=0";; From 0c4df716efdadc1003e748fbbd793eac400cf57d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:15:15 +0000 Subject: [PATCH 0194/1145] bluez: update to 5.45. --- srcpkgs/bluez/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index f152baad23..774e0297da 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,6 +1,6 @@ # Template file for 'bluez' pkgname=bluez -version=5.44 +version=5.45 revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.bluez.org/" license="GPL-2" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" -checksum=0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85 +checksum=4cacb00703a6bc149cb09502257d321597d43952374a16f3558766ffa85364e9 pre_configure() { autoreconf -fi From 208841418f2fe2fb156840433b21d212685b12cb Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:23:46 +0000 Subject: [PATCH 0195/1145] python-protobuf: update to 3.3.0. --- srcpkgs/python-protobuf/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-protobuf/template b/srcpkgs/python-protobuf/template index b2c24ca203..0e888cf230 100644 --- a/srcpkgs/python-protobuf/template +++ b/srcpkgs/python-protobuf/template @@ -1,6 +1,6 @@ # Template file for 'python-protobuf' pkgname=python-protobuf -version=3.1.0.post1 +version=3.3.0 revision=1 noarch=yes wrksrc="protobuf-${version}" @@ -15,9 +15,8 @@ license="BSD" distfiles=" ${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz https://raw.githubusercontent.com/google/protobuf/master/LICENSE" -checksum=" -1a2e989ff8820ef2eaf56b07cd40ad764ec505a0f0b52b69f7fa9e0d5afbddb7 -af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262" +checksum="1cbcee2c45773f57cb6de7ee0eceb97f92b9b69c0178305509b162c0160c1f04 + af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262" skip_extraction=LICENSE post_install() { From b157b6b16854bc74e4b01148153485782ea17c28 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:05:15 +0000 Subject: [PATCH 0196/1145] mate-icon-theme-faenza: update to 1.18.1. --- srcpkgs/mate-icon-theme-faenza/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-icon-theme-faenza/template b/srcpkgs/mate-icon-theme-faenza/template index 0e9f71ee9e..2d6b411c8e 100644 --- a/srcpkgs/mate-icon-theme-faenza/template +++ b/srcpkgs/mate-icon-theme-faenza/template @@ -1,6 +1,6 @@ # Template file for 'mate-icon-theme-faenza' pkgname=mate-icon-theme-faenza -version=1.18.0 +version=1.18.1 revision=1 noarch=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1ba1593b2deddaa454ab18fafd18baf4cb8587de2b09518f3a6c493ab4d92eb3 +checksum=8920a19b5c1755bf3b489b3bf45b90d88e273825ff455a3ba83dfb42d3e3836d pre_configure() { autoreconf -fi From 97b4bcf8b65067c5b33386f104b69e03631de953 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:05:18 +0000 Subject: [PATCH 0197/1145] mate-terminal: update to 1.18.1. --- srcpkgs/mate-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-terminal/template b/srcpkgs/mate-terminal/template index 3d6235eb75..4b28b6f15d 100644 --- a/srcpkgs/mate-terminal/template +++ b/srcpkgs/mate-terminal/template @@ -1,6 +1,6 @@ # Template file for 'mate-terminal' pkgname=mate-terminal -version=1.18.0 +version=1.18.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=227dac7bea1fc19a7c5195bf05cbfeff3c6e2543e1d186fb696622363f7ae81f +checksum=4135b2212a2ed5d6c20b645e17a76d814aa8212f68f83c0a67a9899680a930fe From f6194a1d0f85937f2be07ed9c05abfdd743f7ed9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:05:22 +0000 Subject: [PATCH 0198/1145] mate-utils: update to 1.18.2. --- srcpkgs/mate-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template index d10c3ed04e..1eb86fc967 100644 --- a/srcpkgs/mate-utils/template +++ b/srcpkgs/mate-utils/template @@ -1,6 +1,6 @@ # Template file for 'mate-utils' pkgname=mate-utils -version=1.18.1 +version=1.18.2 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f5209744668e51d7d9f4ec9edb03d25d5e155759186e7df0061be7e07f74da95 +checksum=bbd80f772d9f4dd379794105fd7a4f5452c71ff3e634a06f0af245875b492373 pre_configure() { NOCONFIGURE=1 ./autogen.sh From 020c49585fbd3b2d154a62b48d1477e0d231c4f0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:51:22 +0000 Subject: [PATCH 0199/1145] pluma: update to 1.18.2. --- srcpkgs/pluma/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template index dea5963e6b..4b513326be 100644 --- a/srcpkgs/pluma/template +++ b/srcpkgs/pluma/template @@ -1,6 +1,6 @@ # Template file for 'pluma' pkgname=pluma -version=1.18.1 +version=1.18.2 revision=1 build_style=gnu-configure pycompile_dirs="usr/lib/pluma/plugins" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3ad4ef5c67ee0edef15e4549b1d9de49bd106b551a5b6d17517860ad413873b6 +checksum=ff0f29d4eaa946cbb2b26bbdc2b2d5a308b2d16ec99ea384bcb13f1f3d1a09fc pre_configure() { NOCONFIGURE=1 ./autogen.sh From 147af4e88037af4234b0678916f5a5d6bad0c0ff Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 17:52:16 +0000 Subject: [PATCH 0200/1145] graphite: update to 1.3.10. --- srcpkgs/graphite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/graphite/template b/srcpkgs/graphite/template index 9be5818366..6ff405be46 100644 --- a/srcpkgs/graphite/template +++ b/srcpkgs/graphite/template @@ -1,6 +1,6 @@ # Template file for 'graphite' pkgname=graphite -version=1.3.9 +version=1.3.10 revision=1 wrksrc="${pkgname}2-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://projects.palaso.org/projects/graphitedev" license="LGPL-2.1, GPL-2, BSD" distfiles="${SOURCEFORGE_SITE}/silgraphite/graphite2-${version}.tgz" -checksum=ec0185b663059553fd46e8c4a4f0dede60a02f13a7a1fefc2ce70332ea814567 +checksum=90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae post_install() { vlicense COPYING From 8261ed4f77de4feeaf8bb7776db847d18db27a3c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 6 May 2017 20:44:15 +0200 Subject: [PATCH 0201/1145] neatvi: update to 05. --- srcpkgs/neatvi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/neatvi/template b/srcpkgs/neatvi/template index dba217b06e..7bbef277ab 100644 --- a/srcpkgs/neatvi/template +++ b/srcpkgs/neatvi/template @@ -1,14 +1,14 @@ # Template file for 'neatvi' pkgname=neatvi -version=04 +version=05 revision=1 build_style=gnu-makefile short_desc="Small ex/vi editor" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="ISC" homepage="http://litcave.rudi.ir/" distfiles="https://github.com/litcave/${pkgname}/archive/${version}.tar.gz" -checksum=aadbf71d82e3bffcffc885a281a87b8ae474b5c5a0bad3d2edcb14b425959e92 +checksum=a9be9a2d68a03c3c3de666290beb004e291e159844e441d1842d7f5bbc0bf0af alternatives=" vi:ex:/usr/bin/neatvi From 967c8b9181a691c2e5005349311026b68b54b33e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 6 May 2017 20:53:28 +0200 Subject: [PATCH 0202/1145] trace-cmd: update to 2.6.1. --- srcpkgs/trace-cmd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template index 22f92953fa..6a655e16a3 100644 --- a/srcpkgs/trace-cmd/template +++ b/srcpkgs/trace-cmd/template @@ -1,6 +1,6 @@ # Template file for 'trace-cmd' pkgname=trace-cmd -version=2.6 +version=2.6.1 revision=1 wrksrc="${pkgname}-v${version}" build_style=gnu-makefile @@ -9,11 +9,11 @@ make_install_args="prefix=/usr install install_gui install_doc" hostmakedepends="git asciidoc pkg-config" makedepends="gtk+-devel libxml2-devel" short_desc="Tools to use Ftrace Linux kernel internal tracer" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2, LGPL-2.1" homepage="http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/" distfiles="http://git.kernel.org/cgit/linux/kernel/git/rostedt/${pkgname}.git/snapshot/${pkgname}-v${version}.tar.gz" -checksum=d59563e2db36b7c851e18a115801dea105b9c29949cd5ba72fe220bd0079eb80 +checksum=4eb79001778a77c0ada10265e7f4b5515a3e21a46f0a15c2e8cc614efdf3f5df kernelshark_package() { depends="${sourcepkg}>=${version}_${revision}" From 82b0dca31c8fa527293cf33bcbea0cfe213b076a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 6 May 2017 21:07:16 +0200 Subject: [PATCH 0203/1145] trace-cmd: musl fix. --- srcpkgs/trace-cmd/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template index 6a655e16a3..dbc4e91954 100644 --- a/srcpkgs/trace-cmd/template +++ b/srcpkgs/trace-cmd/template @@ -15,6 +15,10 @@ homepage="http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/" distfiles="http://git.kernel.org/cgit/linux/kernel/git/rostedt/${pkgname}.git/snapshot/${pkgname}-v${version}.tar.gz" checksum=4eb79001778a77c0ada10265e7f4b5515a3e21a46f0a15c2e8cc614efdf3f5df +post_extract() { + sed -i '1i#include ' trace-listen.c +} + kernelshark_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc="GUI for Ftrace Linux kernel internal tracer" From b94c53a27cafe3f720d93246ecdd7e909df60069 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 19:33:14 +0000 Subject: [PATCH 0204/1145] ccnet: libressl fix --- srcpkgs/ccnet/patches/libressl.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/ccnet/patches/libressl.patch diff --git a/srcpkgs/ccnet/patches/libressl.patch b/srcpkgs/ccnet/patches/libressl.patch new file mode 100644 index 0000000000..ce7cd35460 --- /dev/null +++ b/srcpkgs/ccnet/patches/libressl.patch @@ -0,0 +1,11 @@ +--- lib/rsa.c.orig 2017-05-06 19:32:15.000000000 +0000 ++++ lib/rsa.c 2017-05-06 19:32:23.971214589 +0000 +@@ -13,7 +13,7 @@ + + /* Forward compatibility functions if libssl < 1.1.0. */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) + { From 073d4536c656162c275c4d7512b9bb72efd45ced Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 19:33:21 +0000 Subject: [PATCH 0205/1145] ccnet: update to 6.0.6. --- srcpkgs/ccnet/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ccnet/template b/srcpkgs/ccnet/template index d838c0b5e5..2f5cffe210 100644 --- a/srcpkgs/ccnet/template +++ b/srcpkgs/ccnet/template @@ -1,7 +1,7 @@ # Template file for 'ccnet' pkgname=ccnet -version=6.0.4 -revision=3 +version=6.0.6 +revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -13,7 +13,7 @@ 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=2156787fc9ae1e4293493f0ce398aa8b97d84b9f0201d2fd6986b736bd249b04 +checksum=6b3ac78f645929f6b8633fdd65c1e7b4066cf9038b4228c64f7f389c7c446f46 pre_configure() { ./autogen.sh From 4692de3d7696eb04cee26dc89c0b9dcc3eb1259e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 19:33:26 +0000 Subject: [PATCH 0206/1145] seafile-libclient: update to 6.0.6. --- srcpkgs/seafile-libclient/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index dfe126b7d0..a181cdf9fa 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.0.4 -revision=3 +version=6.0.6 +revision=1 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="yopito " license="GPL-3" homepage="https://github.com/haiwen/seafile" distfiles="${homepage}/archive/v${version}.tar.gz>${_distname}-${version}.tar.gz" -checksum=b3919bff1e0f974483df129e500868332e752dec6380556839e006bf9d5b425e +checksum=3f4e25211c301d18fa0ff0be0f9ba0fcbc2649a5092b10cdb960a78be2062aed pre_configure() { ./autogen.sh From 3020c5ed248fb5c3d89e824c6a5e2f2d0d843aab Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 19:33:32 +0000 Subject: [PATCH 0207/1145] seafile-client-qt: update to 6.0.6. --- srcpkgs/seafile-client-qt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template index 88d75b4eaa..9a11edb0a6 100644 --- a/srcpkgs/seafile-client-qt/template +++ b/srcpkgs/seafile-client-qt/template @@ -1,7 +1,7 @@ # Template file for 'seafile-client-qt' pkgname=seafile-client-qt -version=6.0.4 -revision=3 +version=6.0.6 +revision=1 _sourcename="seafile-client" wrksrc="${_sourcename}-${version}" build_style=cmake @@ -19,7 +19,7 @@ maintainer="yopito " license="ASL-2" homepage="https://github.com/haiwen/${_sourcename}" distfiles="https://github.com/haiwen/${_sourcename}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=530c9f12176b69117f319fb3cfd5d2624825df20a44ea6760530a47bf60ba535 +checksum=73f61ba702323724ab40f4ef8ea0f58094585341ecc25dd9ceacfdbc447fd943 case "$XBPS_TARGET_MACHINE" in *-musl) # Add musl-fts implementation From 004a6218751a0e75e40d68040cec75c9e3c1ecee Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 19:33:37 +0000 Subject: [PATCH 0208/1145] thefuck: update to 3.16. --- srcpkgs/thefuck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 1650ea6c0a..5e2d2a0ab1 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,6 +1,6 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.15 +version=3.16 revision=1 build_style=python2-module pycompile_module="thefuck" @@ -13,7 +13,7 @@ maintainer='Benjamin "Doctors" Hoffmeyer ' license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=30d0c1e2c2540396c9719316f2f0d14fa1820ee8c71d6f160bc4d50283d0aaef +checksum=536582810a522144c8bc1ce69b3882979841af1b7aa61e9b245d2b216b77304b post_install() { vlicense LICENSE.md From b5d09dc79a0d689391757a44b7114dbf8a03e03c Mon Sep 17 00:00:00 2001 From: Matthias Fulz Date: Thu, 9 Feb 2017 00:04:35 +0100 Subject: [PATCH 0209/1145] New package: bacula-common-7.4.7 Closes: #5701 [via git-merge-pr] --- common/shlibs | 5 + srcpkgs/bacula-common-mariadb | 1 + srcpkgs/bacula-common-postgresql | 1 + srcpkgs/bacula-common/files/bacula-dir/run | 3 + srcpkgs/bacula-common/files/bacula-fd/run | 3 + srcpkgs/bacula-common/files/bacula-sd/run | 3 + srcpkgs/bacula-common/patches/fix-cross.patch | 48 +++++++ srcpkgs/bacula-common/patches/fix-musl.patch | 12 ++ srcpkgs/bacula-common/template | 119 ++++++++++++++++++ srcpkgs/bacula-console | 1 + srcpkgs/bacula-dir | 1 + srcpkgs/bacula-fd | 1 + srcpkgs/bacula-sd | 1 + 13 files changed, 199 insertions(+) create mode 120000 srcpkgs/bacula-common-mariadb create mode 120000 srcpkgs/bacula-common-postgresql create mode 100755 srcpkgs/bacula-common/files/bacula-dir/run create mode 100755 srcpkgs/bacula-common/files/bacula-fd/run create mode 100755 srcpkgs/bacula-common/files/bacula-sd/run create mode 100644 srcpkgs/bacula-common/patches/fix-cross.patch create mode 100644 srcpkgs/bacula-common/patches/fix-musl.patch create mode 100644 srcpkgs/bacula-common/template create mode 120000 srcpkgs/bacula-console create mode 120000 srcpkgs/bacula-dir create mode 120000 srcpkgs/bacula-fd create mode 120000 srcpkgs/bacula-sd diff --git a/common/shlibs b/common/shlibs index b0e2753324..c89b9121b9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2837,3 +2837,8 @@ libPocoXML.so.48 poco-1.7.8p2_1 libPocoUtil.so.48 poco-1.7.8p2_1 libopenblas.so.0 openblas-0.2.19_1 librtmidi.so.3 rtmidi-2.1.1_1 +libbac-7.4.7.so bacula-common-7.4.7_1 +libbaccfg-7.4.7.so bacula-common-7.4.7_1 +libbacfind-7.4.7.so bacula-common-7.4.7_1 +libbacsql-7.4.7.so bacula-common-7.4.7_1 +libbaccats-7.4.7.so bacula-common-7.4.7_1 diff --git a/srcpkgs/bacula-common-mariadb b/srcpkgs/bacula-common-mariadb new file mode 120000 index 0000000000..df0fa22f12 --- /dev/null +++ b/srcpkgs/bacula-common-mariadb @@ -0,0 +1 @@ +bacula-common \ No newline at end of file diff --git a/srcpkgs/bacula-common-postgresql b/srcpkgs/bacula-common-postgresql new file mode 120000 index 0000000000..df0fa22f12 --- /dev/null +++ b/srcpkgs/bacula-common-postgresql @@ -0,0 +1 @@ +bacula-common \ No newline at end of file diff --git a/srcpkgs/bacula-common/files/bacula-dir/run b/srcpkgs/bacula-common/files/bacula-dir/run new file mode 100755 index 0000000000..be89aac607 --- /dev/null +++ b/srcpkgs/bacula-common/files/bacula-dir/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ ! -d /run/bacula ] && mkdir /run/bacula +exec bacula-dir -f -c /etc/bacula/bacula-dir.conf diff --git a/srcpkgs/bacula-common/files/bacula-fd/run b/srcpkgs/bacula-common/files/bacula-fd/run new file mode 100755 index 0000000000..6f3765f1fa --- /dev/null +++ b/srcpkgs/bacula-common/files/bacula-fd/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ ! -d /run/bacula ] && mkdir /run/bacula +exec bacula-fd -f -c /etc/bacula/bacula-fd.conf diff --git a/srcpkgs/bacula-common/files/bacula-sd/run b/srcpkgs/bacula-common/files/bacula-sd/run new file mode 100755 index 0000000000..6ef1480466 --- /dev/null +++ b/srcpkgs/bacula-common/files/bacula-sd/run @@ -0,0 +1,3 @@ +#!/bin/sh +[ ! -d /run/bacula ] && mkdir /run/bacula +exec bacula-sd -f -c /etc/bacula/bacula-sd.conf diff --git a/srcpkgs/bacula-common/patches/fix-cross.patch b/srcpkgs/bacula-common/patches/fix-cross.patch new file mode 100644 index 0000000000..52c03d014f --- /dev/null +++ b/srcpkgs/bacula-common/patches/fix-cross.patch @@ -0,0 +1,48 @@ +--- configure 2016-09-29 15:59:30.000000000 +0200 ++++ configure 2017-02-14 01:48:10.874916913 +0100 +@@ -23873,6 +23873,14 @@ + POSTGRESQL_LIBDIR=/usr/lib/postgresql + fi + POSTGRESQL_BINDIR=/usr/bin ++ elif test -f ${XBPS_CROSS_BASE}/usr/include/libpq-fe.h; then ++ POSTGRESQL_INCDIR=${XBPS_CROSS_BASE}/usr/include ++ if test -d ${XBPS_CROSS_BASE}/usr/lib64; then ++ POSTGRESQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64 ++ else ++ POSTGRESQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib ++ fi ++ POSTGRESQL_BINDIR=${XBPS_CROSS_BASE}/usr/bin + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -24182,6 +24190,15 @@ + MYSQL_LIBDIR=/usr/local/lib + fi + MYSQL_BINDIR=/usr/local/bin ++ elif test -f ${XBPS_CROSS_BASE}/usr/include/mysql.h; then ++ MYSQL_INCDIR=${XBPS_CROSS_BASE}/usr/include ++ if test -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.a \ ++ -o -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.so; then ++ MYSQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64 ++ else ++ MYSQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib ++ fi ++ MYSQL_BINDIR=${XBPS_CROSS_BASE}/usr/bin + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -24587,6 +24604,14 @@ + SQLITE_LIBDIR=$prefix/lib + fi + SQLITE_BINDIR=$prefix/bin ++ elif test -f ${XBPS_CROSS_BASE}/usr/include/sqlite3.h; then ++ SQLITE_INCDIR=${XBPS_CROSS_BASE}/usr/include ++ if test -d ${XBPS_CROSS_BASE}/usr/lib64; then ++ SQLITE_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64 ++ else ++ SQLITE_LIBDIR=${XBPS_CROSS_BASE}/usr/lib ++ fi ++ SQLITE_BINDIR=${XBPS_CROSS_BASE}/usr/bin + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } diff --git a/srcpkgs/bacula-common/patches/fix-musl.patch b/srcpkgs/bacula-common/patches/fix-musl.patch new file mode 100644 index 0000000000..4710bc9435 --- /dev/null +++ b/srcpkgs/bacula-common/patches/fix-musl.patch @@ -0,0 +1,12 @@ +--- src/findlib/fstype.c 2016-09-29 15:59:30.000000000 +0200 ++++ src/findlib/fstype.c 2017-02-19 19:24:02.050639457 +0100 +@@ -162,6 +162,9 @@ + + #include + #include ++#ifndef _PATH_MOUNTED ++#include ++#endif + + /* + * Linux statfs() does not return the filesystem name type. It diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template new file mode 100644 index 0000000000..d943dbb1e6 --- /dev/null +++ b/srcpkgs/bacula-common/template @@ -0,0 +1,119 @@ +# Template file for 'bacula-common' +pkgname="bacula-common" +version="7.4.7" +revision=1 +build_style=gnu-configure +_common_desc="Bacula - A Network Backup Tool " +short_desc="${_common_desc} (common libs)" +maintainer="Matthias Fulz " +license="AGPL-3" +homepage="http://www.bacula.org" +distfiles="${SOURCEFORGE_SITE}/bacula/bacula-${version}.tar.gz" +checksum="6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40" +configure_args=" + --with-openssl --with-sqlite3 --with-mysql --with-postgresql + --enable-smartalloc --sysconfdir=/etc/bacula + --with-scriptdir=/etc/bacula/scripts + --with-working-dir=/run/bacula" +makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel + libressl-devel ncurses-devel zlib-devel acl-devel" +wrksrc="${pkgname%-*}-${version}" +shlib_provides="libbaccats-${version}.so" +alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-sqlite3-${version}.so" + +post_install() { + rm "${DESTDIR}/usr/bin/bacula" + rm -rf "${DESTDIR}/usr/share/doc" + rm "${DESTDIR}/usr/share/man/man1/bat.1.gz" +} + +bacula-console_package() { + short_desc="Bacula - A Network Backup Tool (management cli)" + conf_files="/etc/${pkgname%-*}/bconsole.conf" + depends="bacula-common" + pkg_install() { + vmove "etc/${pkgname%-*}/bconsole.conf" + vmove "etc/${pkgname%-*}/scripts/bconsole" + vmove "usr/bin/bconsole" + vmove "usr/share/man/man8/bconsole.8.gz" + } +} + +bacula-fd_package() { + short_desc="Bacula - A Network Backup Tool (file daemon)" + conf_files="/etc/${pkgname%-*}/${pkgname}.conf" + depends="bacula-common" + pkg_install() { + vmove "etc/${pkgname%-*}/${pkgname}.conf" + vmove "usr/bin/${pkgname}" + vmove "usr/lib/bpipe-fd.so" + vmove "usr/share/man/man8/${pkgname}.8.gz" + vsv "${pkgname}" + } +} + +bacula-sd_package() { + short_desc="Bacula - A Network Backup Tool (storage daemon)" + conf_files="/etc/${pkgname%-*}/${pkgname}.conf" + depends="bacula-common" + pkg_install() { + vmove "etc/${pkgname%-*}/${pkgname}.conf" + for x in ${pkgname} bextract bls bcopy bscan btape; do + vmove "usr/bin/$x" + vmove "usr/share/man/man8/$x.8.gz" + done + vsv "${pkgname}" + } +} + +bacula-dir_package() { + short_desc="Bacula - A Network Backup Tool (director daemon)" + conf_files="/etc/${pkgname%-*}/${pkgname}.conf" + depends="bacula-common" + pkg_install() { + vmove "etc/${pkgname%-*}/${pkgname}.conf" + vmove "etc/${pkgname%-*}/scripts/query.sql" + vmove "etc/${pkgname%-*}/scripts/create_${pkgname%-*}_database" + vmove "etc/${pkgname%-*}/scripts/delete_catalog_backup" + vmove "etc/${pkgname%-*}/scripts/drop_${pkgname%-*}_database" + vmove "etc/${pkgname%-*}/scripts/drop_${pkgname%-*}_tables" + vmove "etc/${pkgname%-*}/scripts/grant_${pkgname%-*}_privileges" + vmove "etc/${pkgname%-*}/scripts/make_${pkgname%-*}_tables" + vmove "etc/${pkgname%-*}/scripts/make_catalog_backup.pl" + vmove "etc/${pkgname%-*}/scripts/make_catalog_backup" + vmove "etc/${pkgname%-*}/scripts/update_${pkgname%-*}_tables" + vmove "usr/bin/bsmtp" + vmove "usr/share/man/man1/bsmtp.1.gz" + for x in ${pkgname} bregex bwild dbcheck; do + vmove "usr/bin/$x" + vmove "usr/share/man/man8/$x.8.gz" + done + vsv "${pkgname}" + } +} + +bacula-common-mariadb_package() { + short_desc="${_common_desc} (MariaDB support)" + depends="bacula-common" + alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-mysql-${version}.so" + pkg_install() { + vmove "usr/lib/libbaccats-mysql-${version}.so" + vmove "usr/lib/libbaccats-mysql.so" + for file in etc/bacula/scripts/*mysql*; do + vmove "$file" + done + } +} + +bacula-common-postgresql_package() { + short_desc="${_common_desc} (PostgreSQL support)" + depends="bacula-common" + alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-postgresql-${version}.so" + pkg_install() { + vmove "usr/lib/libbaccats-postgresql-${version}.so" + vmove "usr/lib/libbaccats-postgresql.so" + for file in etc/bacula/scripts/*postgresql*; do + vmove "$file" + done + } +} diff --git a/srcpkgs/bacula-console b/srcpkgs/bacula-console new file mode 120000 index 0000000000..df0fa22f12 --- /dev/null +++ b/srcpkgs/bacula-console @@ -0,0 +1 @@ +bacula-common \ No newline at end of file diff --git a/srcpkgs/bacula-dir b/srcpkgs/bacula-dir new file mode 120000 index 0000000000..df0fa22f12 --- /dev/null +++ b/srcpkgs/bacula-dir @@ -0,0 +1 @@ +bacula-common \ No newline at end of file diff --git a/srcpkgs/bacula-fd b/srcpkgs/bacula-fd new file mode 120000 index 0000000000..df0fa22f12 --- /dev/null +++ b/srcpkgs/bacula-fd @@ -0,0 +1 @@ +bacula-common \ No newline at end of file diff --git a/srcpkgs/bacula-sd b/srcpkgs/bacula-sd new file mode 120000 index 0000000000..df0fa22f12 --- /dev/null +++ b/srcpkgs/bacula-sd @@ -0,0 +1 @@ +bacula-common \ No newline at end of file From eddc8926819fde0a820a63b46b08697371e63c62 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 20:05:57 +0000 Subject: [PATCH 0210/1145] capnproto: fix update-check --- srcpkgs/capnproto/update | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/capnproto/update diff --git a/srcpkgs/capnproto/update b/srcpkgs/capnproto/update new file mode 100644 index 0000000000..0ea36708f7 --- /dev/null +++ b/srcpkgs/capnproto/update @@ -0,0 +1,2 @@ +site='https://api.github.com/repos/sandstorm-io/capnproto/tags' +pattern='v\K([\d\.]+)' From f3de5fc9289e791b1f1b330d244e1859912928c0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 19:58:26 +0000 Subject: [PATCH 0211/1145] capnproto: update to 0.6.0. (soname bump) --- common/shlibs | 13 ++++++++----- srcpkgs/capnproto/patches/musl_fix.patch | 20 -------------------- srcpkgs/capnproto/template | 17 ++++++++++------- 3 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/capnproto/patches/musl_fix.patch diff --git a/common/shlibs b/common/shlibs index c89b9121b9..e1333d097c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2736,11 +2736,14 @@ libite.so.3 libite-1.8.2_1 liblog4cplus-1.2.so.5 log4cplus-1.2.0_1 libpng12.so.0 libpng12-1.2.56_2 libpng.so.3 libpng12-1.2.56_2 -libcapnp-0.5.3.so capnproto-0.5.3_1 -libcapnp-rpc-0.5.3.so capnproto-0.5.3_1 -libcapnpc-0.5.3.so capnproto-0.5.3_1 -libkj-0.5.3.so capnproto-0.5.3_1 -libkj-async-0.5.3.so capnproto-0.5.3_1 +libcapnpc-0.6.0.so capnproto-0.6.0_1 +libcapnp-json-0.6.0.so capnproto-0.6.0_1 +libcapnp-rpc-0.6.0.so capnproto-0.6.0_1 +libcapnp-0.6.0.so capnproto-0.6.0_1 +libkj-http-0.6.0.so capnproto-0.6.0_1 +libkj-async-0.6.0.so capnproto-0.6.0_1 +libkj-test-0.6.0.so capnproto-0.6.0_1 +libkj-0.6.0.so capnproto-0.6.0_1 libkea-log.so.2 libkea-1.1.0_1 libkea-util.so.2 libkea-1.1.0_1 libkea-exceptions.so.0 libkea-1.1.0_1 diff --git a/srcpkgs/capnproto/patches/musl_fix.patch b/srcpkgs/capnproto/patches/musl_fix.patch deleted file mode 100644 index a2213b6ec7..0000000000 --- a/srcpkgs/capnproto/patches/musl_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/kj/exception.c++.fix 2016-11-10 10:30:39.182645852 +0100 -+++ src/kj/exception.c++ 2016-11-10 10:30:26.848646578 +0100 -@@ -28,7 +28,7 @@ - #include - #include - --#if (__linux__ && !__ANDROID__) || __APPLE__ -+#if (__GLIBC__) || __APPLE__ - #define KJ_HAS_BACKTRACE 1 - #include - #endif -@@ -43,7 +43,7 @@ - namespace { - - String getStackSymbols(ArrayPtr trace) { --#if (__linux__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG) -+#if (__GLIBC__ || __APPLE__) && !__ANDROID__ && defined(KJ_DEBUG) - // We want to generate a human-readable stack trace. - - // TODO(someday): It would be really great if we could avoid farming out to another process diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template index 9d82e88783..969edabf08 100644 --- a/srcpkgs/capnproto/template +++ b/srcpkgs/capnproto/template @@ -1,6 +1,6 @@ # Template file for 'capnproto' pkgname=capnproto -version=0.5.3 +version=0.6.0 revision=1 wrksrc="${pkgname}-c++-${version}" build_style=gnu-configure @@ -9,7 +9,7 @@ maintainer="eater " license="MIT" homepage="https://capnproto.org" distfiles="${homepage}/capnproto-c++-${version}.tar.gz" -checksum="cdb17c792493bdcd4a24bcd196eb09f70ee64c83a3eccb0bc6534ff560536afb" +checksum=e50911191afc44d6ab03b8e0452cf8c00fd0edfcd34b39f169cea6a53b0bf73e nocross="Tries to execute compiled code during build" post_install() { @@ -22,11 +22,14 @@ capnproto-devel_package() { vmove usr/include vmove usr/lib/*.a vmove usr/lib/*.la - vmove usr/lib/libcapnp-rpc.so - vmove usr/lib/libcapnp.so - vmove usr/lib/libcapnpc.so - vmove usr/lib/libkj-async.so - vmove usr/lib/libkj.so + vmove /usr/lib/libkj.so + vmove /usr/lib/libkj-test.so + vmove /usr/lib/libkj-http.so + vmove /usr/lib/libkj-async.so + vmove /usr/lib/libcapnpc.so + vmove /usr/lib/libcapnp.so + vmove /usr/lib/libcapnp-rpc.so + vmove /usr/lib/libcapnp-json.so vmove usr/lib/pkgconfig } } From 43806202542fcea60a418c687bc8fe07f3ebe80e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 6 May 2017 20:13:02 +0000 Subject: [PATCH 0212/1145] mongo-tools: fix update-check --- srcpkgs/mongo-tools/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/mongo-tools/update diff --git a/srcpkgs/mongo-tools/update b/srcpkgs/mongo-tools/update new file mode 100644 index 0000000000..6ed841b503 --- /dev/null +++ b/srcpkgs/mongo-tools/update @@ -0,0 +1 @@ +pattern='r\K([\d\.]+)' From 4026b764b7ec21c9b96e02b4c403da6c1fa22ac0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 08:46:24 +0200 Subject: [PATCH 0213/1145] xf86-input-libinput: update to 0.25.1. --- srcpkgs/xf86-input-libinput/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template index 538160f9de..d5e0558255 100644 --- a/srcpkgs/xf86-input-libinput/template +++ b/srcpkgs/xf86-input-libinput/template @@ -1,6 +1,6 @@ # Template build file for 'xf86-input-libinput'. pkgname=xf86-input-libinput -version=0.25.0 +version=0.25.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=bb7fd1658fa7e6c757fd55480aa8a07f8ccfb0a80ae42c29dbc67d57958c556f +checksum=489f7d591c9ef08463d4966e61f7c6ea433f5fcbb9f5370fb621da639a84c7e0 post_install() { vlicense COPYING From 94acd1de1d4cff751a9cc5a03bc6291aacc81d65 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 08:49:47 +0200 Subject: [PATCH 0214/1145] wlc: update to 0.0.9. --- srcpkgs/wlc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wlc/template b/srcpkgs/wlc/template index af237aaee2..ddc3ab6230 100644 --- a/srcpkgs/wlc/template +++ b/srcpkgs/wlc/template @@ -1,6 +1,6 @@ # Template build file for 'wlc' pkgname=wlc -version=0.0.8 +version=0.0.9 revision=1 build_style=cmake hostmakedepends="pkg-config wayland-devel wayland-protocols" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="https://github.com/Cloudef/wlc" license="MIT" distfiles="https://github.com/Cloudef/$pkgname/releases/download/v${version}/${pkgname}-${version}.tar.bz2" -checksum=1a7d7758028b0caa75418268f59e2290420850d0f3226ecf74316405d2c5ace5 +checksum=cc239283c1d87aff9d258e0f4dd5a3ad441d8c6e52be8204abd8694435e4c3b5 post_install() { vlicense LICENSE From ab5ad7b32393ea4e5d3a0bf3bf423d7f755b3e2d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 08:58:00 +0200 Subject: [PATCH 0215/1145] v4l-utils: update to 1.12.4. --- srcpkgs/v4l-utils/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index 42d8674465..1def6685e8 100644 --- a/srcpkgs/v4l-utils/template +++ b/srcpkgs/v4l-utils/template @@ -1,18 +1,18 @@ # Template file for 'v4l-utils' pkgname=v4l-utils -version=1.12.3 +version=1.12.4 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-qv4l2 --with-udevdir=/usr/lib/udev" hostmakedepends="automake libtool pkg-config gettext-devel" -makedepends="libjpeg-turbo-devel libsysfs-devel" +makedepends="libjpeg-turbo-devel libsysfs-devel eudev-libudev-devel alsa-lib-devel" conf_files="/etc/rc_maps.cfg" short_desc="Userspace tools and libraries for Video 4 Linux" maintainer="Juan RP " homepage="http://freshmeat.net/projects/libv4l" license="GPL-2, LGPL-2.1" distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2" -checksum=5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e +checksum=96ee79b35c54c175f39c9303ab71c5e46f07b2ad688f4aaa64f11a1e3ad579cc case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" From ba4e68af942bcd55159fd02cf8761d5ce4ad6152 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 08:59:57 +0200 Subject: [PATCH 0216/1145] libinput: update to 1.7.2. --- srcpkgs/libinput/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template index f225189610..b4e8d0096a 100644 --- a/srcpkgs/libinput/template +++ b/srcpkgs/libinput/template @@ -1,6 +1,6 @@ # Template file for 'libinput' pkgname=libinput -version=1.7.1 +version=1.7.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.freedesktop.org/wiki/Software/libinput/" distfiles="$FREEDESKTOP_SITE/$pkgname/$pkgname-$version.tar.xz" -checksum=2e56bc5bbf7d202dd94e1a5673489ce86fe10b1d4b5145948e9ba15f053247c1 +checksum=0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2 post_install() { vlicense COPYING From d71f423e79c3852c78ae04e543cf7008b8dbb038 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 09:00:38 +0200 Subject: [PATCH 0217/1145] qv4l2: update to 1.12.4. --- srcpkgs/qv4l2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index 3ccfd1b17a..c423c0cd15 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -1,19 +1,19 @@ # Template file for 'qv4l2' pkgname=qv4l2 -version=1.12.3 +version=1.12.4 revision=1 wrksrc="v4l-utils-${version}" build_style=gnu-configure configure_args="--enable-qv4l2 --with-udevdir=/usr/lib/udev" hostmakedepends="pkg-config perl" -makedepends="libjpeg-turbo-devel libsysfs-devel alsa-lib-devel qt5-devel" +makedepends="libjpeg-turbo-devel libsysfs-devel eudev-libudev-devel alsa-lib-devel qt5-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Qt v4l2 control panel application" maintainer="Juan RP " homepage="https://linuxtv.org/" license="GPL-2, LGPL-2.1" distfiles="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2" -checksum=5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e +checksum=96ee79b35c54c175f39c9303ab71c5e46f07b2ad688f4aaa64f11a1e3ad579cc if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" From 4a8eddbcbf24ecd6cffa2697e46020a8c1072086 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:06:29 +0200 Subject: [PATCH 0218/1145] elfutils: update to 0.169. (#6328) * elfutils: update to 0.169. * elfutils: fix musl build --- srcpkgs/elfutils/patches/fix-system_h.patch | 21 -------------- srcpkgs/elfutils/patches/musl-macros.patch | 30 -------------------- srcpkgs/elfutils/patches/musl-strndupa.patch | 18 ++++++++++++ srcpkgs/elfutils/template | 4 +-- 4 files changed, 20 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/elfutils/patches/fix-system_h.patch create mode 100644 srcpkgs/elfutils/patches/musl-strndupa.patch diff --git a/srcpkgs/elfutils/patches/fix-system_h.patch b/srcpkgs/elfutils/patches/fix-system_h.patch deleted file mode 100644 index e996c29ee5..0000000000 --- a/srcpkgs/elfutils/patches/fix-system_h.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/crc32_file.c.orig -+++ lib/crc32_file.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include "system.h" - - int - crc32_file (int fd, uint32_t *resp) ---- lib/system.h.orig -+++ lib/system.h -@@ -81,7 +81,7 @@ - do \ - __res = expression; \ - while (__res == -1 && errno == EINTR); \ -- __res; }); -+ __res; }) - #endif - - static inline ssize_t __attribute__ ((unused)) diff --git a/srcpkgs/elfutils/patches/musl-macros.patch b/srcpkgs/elfutils/patches/musl-macros.patch index 1185ee9439..cbd68b16fe 100644 --- a/srcpkgs/elfutils/patches/musl-macros.patch +++ b/srcpkgs/elfutils/patches/musl-macros.patch @@ -1,33 +1,3 @@ ---- libdw/libdw.h 2015-08-21 14:22:37.000000000 +0200 -+++ libdw/libdw.h 2015-11-20 08:31:14.160067056 +0100 -@@ -33,7 +33,27 @@ - #include - #include - #include -+#include -+#include -+#include - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ -+#ifndef strndupa -+#define strndupa(s, n) \ -+ (__extension__ ({const char *__in = (s); \ -+ size_t __len = strnlen (__in, (n)) + 1; \ -+ char *__out = (char *) alloca (__len); \ -+ __out[__len-1] = '\0'; \ -+ (char *) memcpy (__out, __in, __len-1);})) -+#endif - - #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) - # define __nonnull_attribute__(...) __attribute__ ((__nonnull__ (__VA_ARGS__))) --- src/arlib.h 2015-08-21 14:22:37.000000000 +0200 +++ src/arlib.h 2015-11-20 08:02:55.153199611 +0100 @@ -29,6 +29,16 @@ diff --git a/srcpkgs/elfutils/patches/musl-strndupa.patch b/srcpkgs/elfutils/patches/musl-strndupa.patch new file mode 100644 index 0000000000..f365fb019f --- /dev/null +++ b/srcpkgs/elfutils/patches/musl-strndupa.patch @@ -0,0 +1,18 @@ +--- src/unstrip.c.orig 2017-04-27 14:26:26.000000000 +0000 ++++ src/unstrip.c 2017-05-05 15:51:33.515154220 +0000 +@@ -56,6 +56,15 @@ + # define _(str) gettext (str) + #endif + ++#ifndef strndupa ++#define strndupa(s, n) \ ++ (__extension__ ({const char *__in = (s); \ ++ size_t __len = strnlen (__in, (n)) + 1; \ ++ char *__out = (char *) alloca (__len); \ ++ __out[__len-1] = '\0'; \ ++ (char *) memcpy (__out, __in, __len-1);})) ++#endif ++ + /* Name and version of program. */ + ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; + diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 987935a53f..8aa7ef76c2 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,6 +1,6 @@ # Template file for 'elfutils' pkgname=elfutils -version=0.168 +version=0.169 revision=1 build_style=gnu-configure configure_args="--program-prefix=eu-" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://sourceware.org/elfutils/" distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2" -checksum=b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276 +checksum=9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2 # Suppress certain warnings to not fail for -Werror CFLAGS="-Wno-unused-result -Wno-format-nonliteral" From 1d62d6b2e2b8d7a65e33b893207a811dc933a269 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 09:15:33 +0200 Subject: [PATCH 0219/1145] qv4l2: nocross temporarily --- srcpkgs/qv4l2/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index c423c0cd15..36c59e3447 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -15,6 +15,8 @@ license="GPL-2, LGPL-2.1" distfiles="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2" checksum=96ee79b35c54c175f39c9303ab71c5e46f07b2ad688f4aaa64f11a1e3ad579cc +nocross="detects X11/GL support incorrectly" + if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" LDFLAGS="-lpthread" From 95d4d161942f4f71873837068f8dab0cc61c9cf2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 May 2017 09:21:09 +0200 Subject: [PATCH 0220/1145] efl: update to 1.18.5. --- srcpkgs/efl/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index b201052099..8abf5e9136 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,7 +1,7 @@ # Template file for 'efl' pkgname=efl -version=1.18.4 -revision=4 +version=1.18.5 +revision=1 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 --disable-systemd $(vopt_enable framebuffer fb) $(vopt_enable pulseaudio) @@ -17,11 +17,8 @@ homepage="http://enlightenment.org" short_desc="Enlightenment Foundation Libraries" maintainer="Juan RP " license="BSD" -distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.gz" -checksum=d19669eece770cc09733568c7dfef9870daa0f8b9f613ab76ad14b2f5de20040 - -provides="emotion_generic_players-${version}_${revision} evas_generic_loaders-${version}_${revision} elementary-${version}_${revision}" -replaces="emotion_generic_players>=0 evas_generic_loaders>=0 elementary>=0" +distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" +checksum=56f02aa6b2c4ca0252fb6547fa8d2fdfff842e245a93ae41adca7a191900bf73 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake gettext-devel libtool efl-devel" From 16650a0e618b42688b5cf1fe05653f48d572d101 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 07:39:20 +0000 Subject: [PATCH 0221/1145] par2cmdline: update to 0.7.0. --- srcpkgs/par2cmdline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/par2cmdline/template b/srcpkgs/par2cmdline/template index 645d5d1385..5787a99d4a 100644 --- a/srcpkgs/par2cmdline/template +++ b/srcpkgs/par2cmdline/template @@ -1,6 +1,6 @@ # Template file for 'par2cmdline' pkgname=par2cmdline -version=0.6.14 +version=0.7.0 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://github.com/BlackIkeEagle/par2cmdline" distfiles="https://github.com/BlackIkeEagle/par2cmdline/archive/v${version}.tar.gz" -checksum=2fd831ba924d9f0ecd9242ca45551b6995ede1ed281af79aa30e7490d5596e7a +checksum=d877b728d6d3af422904644310980e4da9eba6685960950fd1cd8277c7b63bd5 pre_configure() { autoreconf -fi From 2e0e3bd9fb5f784091313bfb292f292845af62cc Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 07:42:44 +0000 Subject: [PATCH 0222/1145] mergerfs: update to 2.21.0. --- srcpkgs/mergerfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index 468cd71d9c..8ace188ff7 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -1,6 +1,6 @@ # Template file for 'mergerfs' pkgname="mergerfs" -version=2.20.0 +version=2.21.0 revision=1 build_style=gnu-makefile makedepends="fuse-devel attr-devel" @@ -10,7 +10,7 @@ maintainer="xinterer " license="ISC" homepage="https://github.com/trapexit/mergerfs" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=240c3dbbeb8b40494db9c345afe3410a6e4450ca4048c7d8f8c65eb333761b2a +checksum=a47e93c83b12527d08d04637f3df77003cd2ae4af50b1de26c172d7d1d546bce case "$XBPS_TARGET_MACHINE" in *-musl) # Does not have pandoc From ba59f1730ea16082d26c8e21f6641c2d7bcdf8c4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 07:39:16 +0000 Subject: [PATCH 0223/1145] youtube-dl: update to 2017.05.07. --- 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 46dc146ee1..8effd0642e 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.05.01 +version=2017.05.07 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=58e2151634a66fa9ab4a98978fa72bf15990ec1c088ac7e4393cca00c9a32e53 +checksum=45308c76b5e49b657ec7fa23b6b09e4d832355b54c86da79f09586b9664f6be0 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From f60cb708df83eb7a04b86211cd81b65c53457446 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 07:39:23 +0000 Subject: [PATCH 0224/1145] hoogle: update to 5.0.12. --- srcpkgs/hoogle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template index 5d6cec801b..035aaf9072 100644 --- a/srcpkgs/hoogle/template +++ b/srcpkgs/hoogle/template @@ -1,6 +1,6 @@ # Template file for 'hoogle' pkgname=hoogle -version=5.0.11 +version=5.0.12 revision=1 build_style=haskell-stack nocross=yes # Can't yet cross compile Haskell @@ -11,7 +11,7 @@ maintainer="Inokentiy Babushkin " license="BSD-3" homepage="http://hoogle.haskell.org/" distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz" -checksum=9854fa6ad00d7869e4afce601be74d1d6743d96d4e86ea9cccc666d6edd1cbe8 +checksum=a3d3fbffd9b6a0761ec7172efe5a21ea02448169e95b2704c5110e3409ed9bee nopie=yes # network-2.6.3.1 build fails with a relocation post_install() { From 5272a6760f58b793cf790a3111549562c6ee5850 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:22 +0000 Subject: [PATCH 0225/1145] notmuch: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/notmuch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index 4b757468b1..3cf6e2a472 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -1,7 +1,7 @@ # Template file for 'notmuch' pkgname=notmuch version=0.24.1 -revision=1 +revision=2 hostmakedepends="pkg-config perl python-Sphinx" makedepends="xapian-core-devel gmime-devel talloc-devel bash-completion" short_desc="The mail indexer" From dd69e602f269c084f99f1deb6cf601b9b0f47db3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:22 +0000 Subject: [PATCH 0226/1145] meld: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/meld/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index 39f678bd60..729702f36f 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -1,7 +1,7 @@ # Template file for 'meld' pkgname=meld version=3.17.1 -revision=1 +revision=2 noarch=yes build_style=python3-module hostmakedepends="pkg-config intltool gnome-doc-utils python3 itstool gtk-update-icon-cache" From df402296feb194cba033845d9e36ea2c1c12b57b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:22 +0000 Subject: [PATCH 0227/1145] perl-Test-Script: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/perl-Test-Script/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/perl-Test-Script/template b/srcpkgs/perl-Test-Script/template index 984ff3aa2d..1cc775bd8a 100644 --- a/srcpkgs/perl-Test-Script/template +++ b/srcpkgs/perl-Test-Script/template @@ -1,7 +1,7 @@ # Template build file for 'perl-Test-Script'. pkgname=perl-Test-Script version=1.16 -revision=1 +revision=2 wrksrc="${pkgname#*-}-${version}" build_style=perl-module hostmakedepends="perl perl-Probe-Perl perl-IPC-Run3" From a212fe1883238d43f1e87f4c3244dcbe2f9c2019 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:22 +0000 Subject: [PATCH 0228/1145] vidcutter: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/vidcutter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index 30f4972469..e455d81a7c 100644 --- a/srcpkgs/vidcutter/template +++ b/srcpkgs/vidcutter/template @@ -1,7 +1,7 @@ # Template file for 'vidcutter' pkgname=vidcutter version=3.0.1 -revision=1 +revision=2 noarch=yes build_style=python3-module pycompile_module="${pkgname}" From 304a9dfac50139b4c9de29ec0f8ce0443b8c2143 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:22 +0000 Subject: [PATCH 0229/1145] intel-ucode: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/intel-ucode/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index bafe175336..558d49f7cc 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,7 +1,7 @@ # Template file for 'intel-ucode' pkgname=intel-ucode version=20161104 -revision=1 +revision=2 noarch=yes create_wrksrc=yes short_desc="Microcode update files for Intel CPUs" From 49ca12172717595cc02470f53107eb5f79c1b647 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:22 +0000 Subject: [PATCH 0230/1145] python-jupyter_qtconsole: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/python-jupyter_qtconsole/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-jupyter_qtconsole/template b/srcpkgs/python-jupyter_qtconsole/template index e4af883830..da7c4b1bf3 100644 --- a/srcpkgs/python-jupyter_qtconsole/template +++ b/srcpkgs/python-jupyter_qtconsole/template @@ -1,7 +1,7 @@ # Template file for 'python-jupyter_qtconsole' pkgname=python-jupyter_qtconsole version=4.3.0 -revision=1 +revision=2 noarch=yes wrksrc="qtconsole-${version}" build_style=python-module From fb8135848dec83fc8cdd3612556d6760b06edfed Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:23 +0000 Subject: [PATCH 0231/1145] mozo: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/mozo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index 7757ff750e..3cdf967778 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,7 +1,7 @@ # Template file for 'mozo' pkgname=mozo version=1.18.0 -revision=1 +revision=2 noarch=yes nocross=yes build_style=gnu-configure From 0c68ae9ce30dfd216f8a4fc2306b71fd62d2b912 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:23 +0000 Subject: [PATCH 0232/1145] virt-manager: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/virt-manager/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template index 57fe174e26..1088192abf 100644 --- a/srcpkgs/virt-manager/template +++ b/srcpkgs/virt-manager/template @@ -1,7 +1,7 @@ # Template file for 'virt-manager' pkgname=virt-manager version=1.4.1 -revision=2 +revision=3 noarch=yes nocross=yes build_style=python2-module From ba954a564ae96ede7e56bba95164e8473fba9245 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:15:23 +0000 Subject: [PATCH 0233/1145] udiskie: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/udiskie/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template index 28aa186dd9..ab431ed8bf 100644 --- a/srcpkgs/udiskie/template +++ b/srcpkgs/udiskie/template @@ -1,7 +1,7 @@ # Template file for 'udiskie' pkgname=udiskie version=1.7.0 -revision=1 +revision=2 noarch=yes build_style=python3-module pycompile_module="udiskie" From 0f14ed643aa39ed823fb4a94affc937b4381d41c Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Sat, 6 May 2017 00:32:18 +0200 Subject: [PATCH 0234/1145] New package: superlu-5.2.1 --- common/shlibs | 1 + srcpkgs/superlu-devel | 1 + srcpkgs/superlu/template | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 120000 srcpkgs/superlu-devel create mode 100644 srcpkgs/superlu/template diff --git a/common/shlibs b/common/shlibs index e1333d097c..c23777289f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2845,3 +2845,4 @@ libbaccfg-7.4.7.so bacula-common-7.4.7_1 libbacfind-7.4.7.so bacula-common-7.4.7_1 libbacsql-7.4.7.so bacula-common-7.4.7_1 libbaccats-7.4.7.so bacula-common-7.4.7_1 +libsuperlu.so.5 superlu-5.2.1_1 diff --git a/srcpkgs/superlu-devel b/srcpkgs/superlu-devel new file mode 120000 index 0000000000..72ce48b1f9 --- /dev/null +++ b/srcpkgs/superlu-devel @@ -0,0 +1 @@ +superlu \ No newline at end of file diff --git a/srcpkgs/superlu/template b/srcpkgs/superlu/template new file mode 100644 index 0000000000..d79d9938f1 --- /dev/null +++ b/srcpkgs/superlu/template @@ -0,0 +1,33 @@ +# Template file for 'superlu' +pkgname=superlu +version=5.2.1 +revision=1 +build_style=cmake +hostmakedepends="gcc-fortran" +makedepends="openblas-devel" +short_desc="Solution of large, sparse, nonsymmetric systems of linear equations" +maintainer="Julien Dehos " +license="BSD" +homepage="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/" +distfiles="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/${pkgname}_${version}.tar.gz" +checksum=28fb66d6107ee66248d5cf508c79de03d0621852a0ddeba7301801d3d859f463 +configure_args="-DUSE_XSDK_DEFAULTS=TRUE" +wrksrc="SuperLU_${version}" + +pre_configure() { + export LDFLAGS="-fPIC" +} + +post_install() { + vlicense License.txt +} + +superlu-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/include" + vmove "usr/lib/libsuperlu.so" + } +} + From 6746d9a82c605555ed6f36bfc82fbe00f7186b17 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 09:21:09 +0000 Subject: [PATCH 0235/1145] emacs: rebuild for musl repo (noarch pkgs missing) --- srcpkgs/emacs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 82b1412866..42f16b2c1e 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -1,7 +1,7 @@ # Template file for 'emacs' pkgname=emacs version=25.2 -revision=1 +revision=2 nocross=yes nopie=yes hostmakedepends="pkg-config" From 86210a3f208cef685030973bd8910d76e87c52e4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 15:00:00 +0200 Subject: [PATCH 0236/1145] ledger: fix build with gcc6 --- srcpkgs/ledger/patches/gcc6.patch | 11 +++++++++++ srcpkgs/ledger/template | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ledger/patches/gcc6.patch diff --git a/srcpkgs/ledger/patches/gcc6.patch b/srcpkgs/ledger/patches/gcc6.patch new file mode 100644 index 0000000000..f076f8231d --- /dev/null +++ b/srcpkgs/ledger/patches/gcc6.patch @@ -0,0 +1,11 @@ +--- src/item.h.orig ++++ src/item.h +@@ -92,7 +92,7 @@ class item_t : public supports_flags, public scope_t + + typedef std::pair, bool> tag_data_t; + typedef std::map > string_map; ++ std::function > string_map; + + state_t _state; + optional _date; diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index 0a8d96b583..36ff07842c 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -11,8 +11,6 @@ short_desc="A powerful, double-entry accounting system that is accessed from the distfiles="https://github.com/ledger/${pkgname}/archive/v${version}.tar.gz" checksum="90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a" -broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2265/steps/shell_3/logs/stdio" - post_install() { rm -Rf ${DESTDIR}/usr/local if [ -e ${DESTDIR}/usr/lib64 ]; then From 182539ed36fa35150d00cb0c8bfa6815753c9e71 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 15:10:46 +0200 Subject: [PATCH 0237/1145] apache: remove references to -specs Closes #6322. --- srcpkgs/apache/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index fd5c503f63..bc3518a09f 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.25 -revision=3 +revision=4 wrksrc=httpd-${version} build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all @@ -110,6 +110,10 @@ post_install() { -e 's|#\(Include /etc/apache/extra/httpd-default.conf\)|\1|' \ -i "${DESTDIR}/etc/apache/httpd.conf" + # Remove references to hardening -specs. + sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \ + ${DESTDIR}/usr/share/apache/webroot/build/config{.nice,_vars.mk} + # Remove unused stuff. vmkdir usr/share/apache/webroot mv ${DESTDIR}/srv/www/$pkgname/cgi-bin ${DESTDIR}/usr/share/apache/webroot From 9f2f456f1091fc21d3ab1a86c422fe3b862a54f6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 15:18:55 +0200 Subject: [PATCH 0238/1145] virtualbox-ose-guest: install missing VBoxClient-all file Closes #6339. --- srcpkgs/virtualbox-ose/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 02511474df..8cb2b0011e 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,7 +1,7 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose version=5.1.22 -revision=1 +revision=2 wrksrc="VirtualBox-${version%*a}" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " @@ -150,6 +150,8 @@ virtualbox-ose-guest_package() { install -m755 VBoxClient VBoxControl VBoxService ${PKGDESTDIR}/usr/bin install -m755 mount.vboxsf ${PKGDESTDIR}/usr/bin + install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + ${PKGDESTDIR}/usr/bin/VBoxClient-all install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${PKGDESTDIR}/etc/xdg/autostart/vboxclient.desktop From d332ade60e828db095faefd5ecc6495bb396c4b3 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 15:50:13 +0200 Subject: [PATCH 0239/1145] nodejs: fix build with icu-59 --- srcpkgs/nodejs/patches/v8-icu59.patch | 59 +++++++++++++++++++++++++++ srcpkgs/nodejs/template | 4 +- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/nodejs/patches/v8-icu59.patch diff --git a/srcpkgs/nodejs/patches/v8-icu59.patch b/srcpkgs/nodejs/patches/v8-icu59.patch new file mode 100644 index 0000000000..a89325e0d9 --- /dev/null +++ b/srcpkgs/nodejs/patches/v8-icu59.patch @@ -0,0 +1,59 @@ +https://codereview.chromium.org/2738503008 + +--- deps/v8/src/i18n.cc.orig ++++ deps/v8/src/i18n.cc +@@ -30,8 +30,13 @@ + #include "unicode/ucol.h" + #include "unicode/ucurr.h" + #include "unicode/unum.h" ++#include "unicode/uvernum.h" + #include "unicode/uversion.h" + ++#if U_ICU_VERSION_MAJOR_NUM >= 59 ++#include "unicode/char16ptr.h" ++#endif ++ + namespace v8 { + namespace internal { + +@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat( + } + + UErrorCode status_digits = U_ZERO_ERROR; ++#if U_ICU_VERSION_MAJOR_NUM >= 59 + uint32_t fraction_digits = ucurr_getDefaultFractionDigits( +- currency.getTerminatedBuffer(), &status_digits); ++ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits); ++#else ++ uint32_t fraction_digits = ucurr_getDefaultFractionDigits( ++ currency.getTerminatedBuffer(), &status_digits); ++#endif + if (U_SUCCESS(status_digits)) { + number_format->setMinimumFractionDigits(fraction_digits); + number_format->setMaximumFractionDigits(fraction_digits); +--- deps/v8/src/runtime/runtime-i18n.cc.orig ++++ deps/v8/src/runtime/runtime-i18n.cc +@@ -43,6 +43,7 @@ + #include "unicode/uloc.h" + #include "unicode/unistr.h" + #include "unicode/unum.h" ++#include "unicode/ustring.h" + #include "unicode/uversion.h" + + +@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { + String::FlatContent flat2 = string2->GetFlatContent(); + std::unique_ptr sap1; + std::unique_ptr sap2; +- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1); +- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2); +- result = +- collator->compare(string_val1, length1, string_val2, length2, status); ++ icu::UnicodeString string_val1( ++ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); ++ icu::UnicodeString string_val2( ++ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); ++ result = collator->compare(string_val1, string_val2, status); + } + if (U_FAILURE(status)) return isolate->ThrowIllegalOperation(); + diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index c79dceb5ae..28e09de4f2 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs version=7.10.0 -revision=1 +revision=2 wrksrc=node-v${version} hostmakedepends="pkg-config python $(vopt_if icu icu)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) @@ -21,7 +21,7 @@ build_options="ssl libuv http_parser icu" desc_option_libuv="Enable shared libuv" desc_option_http_parser="Enable shared http-parser" desc_option_icu="Enable shared icu" -build_options_default="libuv http_parser" +build_options_default="libuv http_parser icu" replaces="iojs>=0" From 96494d17711e17d1d2eccea319a8062577e08880 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 7 May 2017 16:09:07 +0200 Subject: [PATCH 0240/1145] gjs: update to 1.48.3. --- srcpkgs/gjs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 7b479ae215..7079656888 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.48.2 +version=1.48.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel gobject-introspection" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MPL-1.1, LGPL-2.1, GPL-2" homepage="http://live.gnome.org/Gjs" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=99c225ab2149bd31f7ac84d6ee1ea9ae843bf9a806ca853786d90e3182c4f4a1 +checksum=669b7d78ad98390a762eec50d7cc637e25f196d986c0200d9f1c3a0e0cd90f33 gjs-devel_package() { depends="libgirepository-devel mozjs38-devel gjs>=${version}_${revision}" From e7b1aa72978dbe394621b196d7035a4d219a5a1f Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 16:07:50 +0200 Subject: [PATCH 0241/1145] zbar: unbreak cross due to old v4l1 v4l1 is not a thing since Linux 2.6.38. --- .../patches/new_autotools_build_fix.patch | 16 ++++ srcpkgs/zbar/patches/no-v4l1-check.patch | 74 +++++++++++++++++++ srcpkgs/zbar/patches/v4l1.patch | 24 ------ srcpkgs/zbar/template | 8 +- 4 files changed, 96 insertions(+), 26 deletions(-) create mode 100644 srcpkgs/zbar/patches/new_autotools_build_fix.patch create mode 100644 srcpkgs/zbar/patches/no-v4l1-check.patch delete mode 100644 srcpkgs/zbar/patches/v4l1.patch diff --git a/srcpkgs/zbar/patches/new_autotools_build_fix.patch b/srcpkgs/zbar/patches/new_autotools_build_fix.patch new file mode 100644 index 0000000000..4ab34e3f19 --- /dev/null +++ b/srcpkgs/zbar/patches/new_autotools_build_fix.patch @@ -0,0 +1,16 @@ +--- configure.ac.orig ++++ configure.ac +@@ -1,9 +1,11 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_PREREQ([2.61]) ++AC_PREREQ([2.68]) ++m4_ifndef([AC_LANG_DEFINES_PROVIDED], ++ [m4_define([AC_LANG_DEFINES_PROVIDED])]) + AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net]) + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_MACRO_DIR(config) +-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) ++AM_INIT_AUTOMAKE([1.13 foreign subdir-objects std-options dist-bzip2]) + AC_CONFIG_HEADERS([include/config.h]) + AC_CONFIG_SRCDIR(zbar/scanner.c) + LT_PREREQ([2.2]) diff --git a/srcpkgs/zbar/patches/no-v4l1-check.patch b/srcpkgs/zbar/patches/no-v4l1-check.patch new file mode 100644 index 0000000000..45a494323b --- /dev/null +++ b/srcpkgs/zbar/patches/no-v4l1-check.patch @@ -0,0 +1,74 @@ +--- configure.ac.orig ++++ configure.ac +@@ -147,19 +147,13 @@ + with_video="no" + AS_IF([test "x$enable_video" != "xno"], + [AS_IF([test "x$win32" = "xno"], +- [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"], +- [AC_MSG_FAILURE([test for video support failed! +-rebuild your kernel to include video4linux support or +-configure --disable-video to skip building video support.])]) +- AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"], ++ [AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"], + [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])], + [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"], + [AC_MSG_FAILURE([test for VfW video support failed! + configure --disable-video to skip building vidoe support.])])]) + ]) + AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"]) +-AM_CONDITIONAL([HAVE_V4L1], +- [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"]) + AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"]) + + dnl X +--- zbar/Makefile.am.inc.orig ++++ zbar/Makefile.am.inc +@@ -53,12 +53,9 @@ + zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c + endif + +-if HAVE_V4L1 +-zbar_libzbar_la_SOURCES += zbar/video/v4l1.c + if HAVE_V4L2 + zbar_libzbar_la_SOURCES += zbar/video/v4l2.c + endif +-endif + if WIN32 + if HAVE_VIDEO + zbar_libzbar_la_SOURCES += zbar/video/vfw.c +--- zbar/video/v4l2.c.orig ++++ zbar/video/v4l2.c +@@ -39,6 +39,9 @@ + # include + #endif + #include ++#include ++#include ++#include + + #include "video.h" + #include "image.h" +@@ -507,3 +507,23 @@ + vdo->dq = v4l2_dq; + return(0); + } ++ ++int _zbar_video_open (zbar_video_t *vdo, ++ const char *dev) ++{ ++ vdo->fd = open(dev, O_RDWR); ++ if(vdo->fd < 0) ++ return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, ++ "opening video device '%s'", dev)); ++ zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd); ++ ++ int rc = -1; ++ if(vdo->intf != VIDEO_V4L1) ++ rc = _zbar_v4l2_probe(vdo); ++ ++ if(rc && vdo->fd >= 0) { ++ close(vdo->fd); ++ vdo->fd = -1; ++ } ++ return(rc); ++} diff --git a/srcpkgs/zbar/patches/v4l1.patch b/srcpkgs/zbar/patches/v4l1.patch deleted file mode 100644 index 150b0e6952..0000000000 --- a/srcpkgs/zbar/patches/v4l1.patch +++ /dev/null @@ -1,24 +0,0 @@ -Thanks to Andy Weidenbaum for providing this patch! - ---- ./zbar/video/v4l1.c 2013-03-06 23:24:22.996336417 -0800 -+++ ./zbar/video/v4l1.c 2013-03-06 23:29:29.789662369 -0800 -@@ -41,7 +41,7 @@ - #ifdef HAVE_SYS_MMAN_H - # include - #endif --#include -+#include - - #include "video.h" - #include "image.h" ---- ./configure 2009-10-23 11:17:24.000000000 -0700 -+++ ./configure 2013-03-06 23:47:33.902966990 -0800 -@@ -18709,7 +18709,7 @@ - if test "x$enable_video" != "xno"; then - if test "x$win32" = "xno"; then - --for ac_header in linux/videodev.h -+for ac_header in libv4l1-videodev.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index b0737d9a99..a58ee5072f 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -4,7 +4,7 @@ version=0.10 revision=1 build_style=gnu-configure configure_args="--with-qt --with-gtk" -hostmakedepends="pkg-config qt-qmake qt-host-tools glib-devel" +hostmakedepends="automake pkg-config libtool gettext-devel python qt-qmake qt-host-tools glib-devel" makedepends="libmagick-devel libXv-devel pygtk-devel qt-devel v4l-utils-devel" short_desc="A barcode reading library and application" maintainer="Jürgen Buchmüller " @@ -13,10 +13,14 @@ homepage="https://zbar.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/zbar/${version}/${pkgname}-${version}.tar.bz2" checksum=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 depends="libzbar-${version}_${revision}" -nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/2508/steps/shell_3/logs/stdio" CFLAGS="-DNDEBUG" +pre_configure() { + export PYTHON_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" + autoreconf -fi +} + libzbar_package() { short_desc+=" - library files" pkg_install() { From 9eb79d1051a7eee56379219ed711e9785dedcc53 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 7 May 2017 16:20:43 +0200 Subject: [PATCH 0242/1145] profile-cleaner: update to 2.36. --- srcpkgs/profile-cleaner/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template index bb755e095e..a6c94027bd 100644 --- a/srcpkgs/profile-cleaner/template +++ b/srcpkgs/profile-cleaner/template @@ -1,6 +1,6 @@ # Template file for 'profile-cleaner' pkgname=profile-cleaner -version=2.35 +version=2.36 revision=1 noarch="yes" build_style=gnu-makefile @@ -10,7 +10,7 @@ maintainer="Philipp Hirsch " license="MIT" homepage="https://github.com/graysky2/profile-cleaner" distfiles="http://repo-ck.com/source/$pkgname/$pkgname-$version.tar.xz" -checksum=d02f31fb0c5a7a07da33c8e9f1ccc3d814f2ddefa427d4b3422889b54fcdb92f +checksum=a8b10fd212e0b0011e020bb3e65889970dcf0db043776358ca31bb3675b76279 post_install() { vlicense LICENSE From e14615a6bb1b2d5f9c94c882d5fbd3db42935b14 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 7 May 2017 16:21:46 +0200 Subject: [PATCH 0243/1145] glusterfs: update to 3.8.11. --- srcpkgs/glusterfs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 3971f1cbe3..7f5bfced5b 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,7 +1,7 @@ # Template file for 'glusterfs' pkgname=glusterfs -version=3.8.5 -revision=3 +version=3.8.11 +revision=1 build_style=gnu-configure configure_args="--disable-glupy --enable-crypt-xlator --sbindir=/usr/bin --with-mountutildir=/usr/bin @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-3" homepage="http://www.gluster.org/" distfiles="http://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz" -checksum=476527c7bc7403128d6cafe54b81bf4896cc6cd96505f42e85380f2588cc3846 +checksum=2285c02f9449168eabeaa7b72706e80f3de659eb685293dd899c71c33798702e nocross=yes case "$XBPS_TARGET_MACHINE" in From fdc192e90f2b2baf4ea779296a645e930c475da8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 7 May 2017 16:36:36 +0200 Subject: [PATCH 0244/1145] Revert "glusterfs: update to 3.8.11." This reverts commit e14615a6bb1b2d5f9c94c882d5fbd3db42935b14. --- srcpkgs/glusterfs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 7f5bfced5b..3971f1cbe3 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,7 +1,7 @@ # Template file for 'glusterfs' pkgname=glusterfs -version=3.8.11 -revision=1 +version=3.8.5 +revision=3 build_style=gnu-configure configure_args="--disable-glupy --enable-crypt-xlator --sbindir=/usr/bin --with-mountutildir=/usr/bin @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-3" homepage="http://www.gluster.org/" distfiles="http://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz" -checksum=2285c02f9449168eabeaa7b72706e80f3de659eb685293dd899c71c33798702e +checksum=476527c7bc7403128d6cafe54b81bf4896cc6cd96505f42e85380f2588cc3846 nocross=yes case "$XBPS_TARGET_MACHINE" in From 5aa46abfec77f14dc9e88dd7cc4b9777b49a6f39 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 16:23:43 +0200 Subject: [PATCH 0245/1145] ansible: patch to fix prompt for become-method=su --- srcpkgs/ansible/patches/23710.patch | 21 +++++++++++++++++++++ srcpkgs/ansible/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ansible/patches/23710.patch diff --git a/srcpkgs/ansible/patches/23710.patch b/srcpkgs/ansible/patches/23710.patch new file mode 100644 index 0000000000..2d5d72798c --- /dev/null +++ b/srcpkgs/ansible/patches/23710.patch @@ -0,0 +1,21 @@ +From 0dd0600a6be610a6eeec68332e10e18fb1560304 Mon Sep 17 00:00:00 2001 +From: Matt Martz +Date: Tue, 18 Apr 2017 11:34:07 -0500 +Subject: [PATCH] When become_method is su, self._play_context.prompt is a + function. Fixes #23689 + +--- + lib/ansible/plugins/connection/__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +--- lib/ansible/plugins/connection/__init__.py.orig ++++ lib/ansible/plugins/connection/__init__.py +@@ -258,6 +258,8 @@ def check_password_prompt(self, b_output): + if not b_lines: + return False + return b_lines[-1].strip().endswith(b_prompt) or b_lines[0].strip().endswith(b_prompt) ++ else: ++ return self._play_context.prompt(b_output) + + def check_incorrect_password(self, b_output): + b_incorrect_password = to_bytes(gettext.dgettext(self._play_context.become_method, C.BECOME_ERROR_STRINGS[self._play_context.become_method])) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 6920a2348f..ef8361cb1f 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,7 +1,7 @@ # Template file for 'ansible' pkgname=ansible version=2.3.0.0 -revision=1 +revision=2 noarch=yes build_style=python2-module hostmakedepends="python-setuptools" From 911cf4828d838a4ccefef54e29d57821b665d385 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 16:54:54 +0200 Subject: [PATCH 0246/1145] gst1-python3: update to 1.12.0 --- srcpkgs/gst1-python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index fd7780c42e..92d1dd11f1 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,6 +1,6 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 -version=1.10.4 +version=1.12.0 revision=1 wrksrc="gst-python-${version}" build_style=gnu-configure @@ -14,4 +14,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz" -checksum=59508174b8bc86c05290aa9a7c5d480ac556a6f36306ddbc1d0eacf4f7868212 +checksum=be33de6b9f21e95f677ef91b142e5249e71c8d7e894a5a4a53e19cf18d5d9c07 From e8c988ca9dd0fe0c885c210808114379b62ecb1e Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 16:57:30 +0200 Subject: [PATCH 0247/1145] python-protobuf: fix template --- srcpkgs/python-protobuf/template | 37 +++++++++++++++++++------------- srcpkgs/python3-protobuf | 1 + 2 files changed, 23 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/python3-protobuf diff --git a/srcpkgs/python-protobuf/template b/srcpkgs/python-protobuf/template index 0e888cf230..683f0961ca 100644 --- a/srcpkgs/python-protobuf/template +++ b/srcpkgs/python-protobuf/template @@ -1,25 +1,32 @@ # Template file for 'python-protobuf' pkgname=python-protobuf version=3.3.0 -revision=1 +revision=2 noarch=yes wrksrc="protobuf-${version}" -build_style=python2-module -pycompile_module="protobuf" -hostmakedepends="python-setuptools" -depends="python" -short_desc="Python bindings for Google Protocol Buffers" +build_style=python-module +pycompile_module="google/protobuf" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-setuptools python-six" +short_desc="Python2 bindings for Google Protocol Buffers" maintainer="Charles E. Lehner " homepage="https://developers.google.com/protocol-buffers/" -license="BSD" -distfiles=" -${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz -https://raw.githubusercontent.com/google/protobuf/master/LICENSE" -checksum="1cbcee2c45773f57cb6de7ee0eceb97f92b9b69c0178305509b162c0160c1f04 - af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262" -skip_extraction=LICENSE +license="3-clause-BSD" +distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz" +checksum=1cbcee2c45773f57cb6de7ee0eceb97f92b9b69c0178305509b162c0160c1f04 post_install() { - vlicense $XBPS_SRCDISTDIR/$pkgname-$version/LICENSE - chmod -R o+r $DESTDIR/usr/lib + sed -n 1,29p google/protobuf/__init__.py >LICENSE + vlicense LICENSE +} + +python3-protobuf_package() { + noarch=yes + pycompile_module="google/protobuf" + depends="python3-setuptools python3-six" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE + } } diff --git a/srcpkgs/python3-protobuf b/srcpkgs/python3-protobuf new file mode 120000 index 0000000000..bff725921c --- /dev/null +++ b/srcpkgs/python3-protobuf @@ -0,0 +1 @@ +python-protobuf \ No newline at end of file From 26900a414cf319a345a327557d33754e27c45d25 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 16:59:10 +0200 Subject: [PATCH 0248/1145] zbar: forgot revbump --- srcpkgs/zbar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index a58ee5072f..f798888a1d 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -1,7 +1,7 @@ # Template file for 'zbar' pkgname=zbar version=0.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-qt --with-gtk" hostmakedepends="automake pkg-config libtool gettext-devel python qt-qmake qt-host-tools glib-devel" From ee36da1cdc5ad1fcbc23786591011acda2434971 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 17:09:33 +0200 Subject: [PATCH 0249/1145] gst1-python3: update-check fix --- srcpkgs/gst1-python3/update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 srcpkgs/gst1-python3/update diff --git a/srcpkgs/gst1-python3/update b/srcpkgs/gst1-python3/update deleted file mode 120000 index 5434dc3b6a..0000000000 --- a/srcpkgs/gst1-python3/update +++ /dev/null @@ -1 +0,0 @@ -../gst1-python/update \ No newline at end of file diff --git a/srcpkgs/gst1-python3/update b/srcpkgs/gst1-python3/update new file mode 100644 index 0000000000..7ba390e954 --- /dev/null +++ b/srcpkgs/gst1-python3/update @@ -0,0 +1,2 @@ +pkgname=gst-python +ignore="1.*[13579].*" From 75b3299b9e2408346a6a95626fb94f65d74edc70 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 17:33:37 +0200 Subject: [PATCH 0250/1145] mathjax: update to 2.7.1 --- srcpkgs/mathjax/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mathjax/template b/srcpkgs/mathjax/template index 0702636c3d..a02a829111 100644 --- a/srcpkgs/mathjax/template +++ b/srcpkgs/mathjax/template @@ -1,6 +1,6 @@ # Template file for 'mathjax' pkgname=mathjax -version=2.7.0 +version=2.7.1 revision=1 noarch=yes wrksrc="MathJax-${version}" @@ -11,7 +11,7 @@ maintainer="Alessio Sergi " homepage="http://www.mathjax.org/" license="Apache-2.0" distfiles="https://github.com/mathjax/MathJax/archive/${version}.tar.gz" -checksum=4944dd3995417c7692b64462698054760d38ff72175f66e2f2a007c5031d5927 +checksum=2bb4c0c6f326dd1964ecad1d302d2f9f4a3eb4364f89a30d5e3b4b3069597169 do_install() { vmkdir usr/share/mathjax From ce1acf5291ba7c90cdc905eaa75c574d1dc0878c Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 17:45:10 +0200 Subject: [PATCH 0251/1145] python-Pillow: update to 4.1.1 --- srcpkgs/python-Pillow/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template index dc9d3bc74a..f9f2b5d87c 100644 --- a/srcpkgs/python-Pillow/template +++ b/srcpkgs/python-Pillow/template @@ -1,6 +1,6 @@ # Template file for 'python-Pillow' pkgname=python-Pillow -version=4.1.0 +version=4.1.1 revision=1 wrksrc="Pillow-${version}" build_style=python-module @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="https://python-pillow.org/" license="PIL" distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz" -checksum=a0fd487fed4a35717401b7566e51a1520b34e7c0f7f2a315a6509f82bc86299f +checksum=00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 pre_build() { # don't install example scripts in /usr/bin From 0a39021ad130f67d29d8f276a06c4b8f11770d10 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 17:45:54 +0200 Subject: [PATCH 0252/1145] python-lazy-object-proxy: update to 1.3.1 --- srcpkgs/python-lazy-object-proxy/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-lazy-object-proxy/template b/srcpkgs/python-lazy-object-proxy/template index 8da05cf634..7d7c21ef31 100644 --- a/srcpkgs/python-lazy-object-proxy/template +++ b/srcpkgs/python-lazy-object-proxy/template @@ -1,7 +1,7 @@ # Template file for 'python-lazy-object-proxy' pkgname=python-lazy-object-proxy -version=1.2.2 -revision=2 +version=1.3.1 +revision=1 wrksrc="lazy-object-proxy-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/ionelmc/python-lazy-object-proxy" license="2-clause-BSD" distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz" -checksum=ddd4cf1c74279c349cb7b9c54a2efa5105854f57de5f2d35829ee93631564268 +checksum=eb91be369f945f10d3a49f5f9be8b3d0b93a4c2be8f8a5b83b0571b8123e0a7a post_install() { vlicense LICENSE From 19f3eb445fa8cb585c70515cc314a858f302a250 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 17:47:45 +0200 Subject: [PATCH 0253/1145] python-urllib3: update to 1.21.1 --- srcpkgs/python-urllib3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template index 49c2a07add..eba24d9569 100644 --- a/srcpkgs/python-urllib3/template +++ b/srcpkgs/python-urllib3/template @@ -1,6 +1,6 @@ # Template file for 'python-urllib3' pkgname=python-urllib3 -version=1.20 +version=1.21.1 revision=1 noarch=yes wrksrc="urllib3-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://urllib3.readthedocs.io/" license="MIT" distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz" -checksum=97ef2b6e2878d84c0126b9f4e608e37a951ca7848e4855a7f7f4437d5c34a72f +checksum=b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5 post_install() { # replace bundled copy of six From 51b21b8db79c66d9dd30b2c9467970fa00c49979 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 17:48:12 +0200 Subject: [PATCH 0254/1145] python-matplotlib: update to 2.0.1 --- srcpkgs/python-matplotlib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-matplotlib/template b/srcpkgs/python-matplotlib/template index 5de79f6a37..e21139eb04 100644 --- a/srcpkgs/python-matplotlib/template +++ b/srcpkgs/python-matplotlib/template @@ -1,6 +1,6 @@ # Template file for 'python-matplotlib' pkgname=python-matplotlib -version=2.0.0 +version=2.0.1 revision=1 wrksrc="matplotlib-${version}" build_style=python-module @@ -24,7 +24,7 @@ maintainer="Alessio Sergi " homepage="http://matplotlib.org/" license="matplotlib, BSD, MIT" distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz" -checksum=36cf0985829c1ab2b8b1dae5e2272e53ae681bf33ab8bedceed4f0565af5f813 +checksum=1422aa2bb4ce4da310f5d24097a48b171139a1007f1a6af3e9fd2c34d22e2bf8 export XDG_RUNTIME_DIR=/tmp From 595821f9c353e41e07a58262d01600bf6e5fb1fc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 7 May 2017 18:04:21 +0200 Subject: [PATCH 0255/1145] mongo-tools: update to 3.4.4. --- srcpkgs/mongo-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mongo-tools/template b/srcpkgs/mongo-tools/template index 30e0ad802e..6fd617e361 100644 --- a/srcpkgs/mongo-tools/template +++ b/srcpkgs/mongo-tools/template @@ -1,7 +1,7 @@ # Template file for 'mongo-tools' pkgname=mongo-tools -version=3.4.1 -revision=5 +version=3.4.4 +revision=1 wrksrc="${pkgname}-r${version}" build_style=go go_import_path="github.com/mongodb/mongo-tools" @@ -13,7 +13,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="https://github.com/mongodb/mongo-tools" distfiles="https://github.com/mongodb/${pkgname}/archive/r${version}.tar.gz" -checksum=283d729442fca7a331ca475e234b0880ec7c4339597e0a8e271ca7e153b45439 +checksum=d14f4ce153aec373459c802e5a159661ccfde4e5df39d8d750586bae54896cdd do_build() { local bins="bsondump mongodump mongoexport mongofiles mongoimport mongooplog From 2b268fbaa51b3c6ec41648d0814ef033d57adad2 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:50:44 +0200 Subject: [PATCH 0256/1145] python-BeautifulSoup4: update to 4.6.0 --- srcpkgs/python-BeautifulSoup4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template index 7d50d6c654..51ff8fa647 100644 --- a/srcpkgs/python-BeautifulSoup4/template +++ b/srcpkgs/python-BeautifulSoup4/template @@ -1,6 +1,6 @@ # Template file for 'python-BeautifulSoup4' pkgname=python-BeautifulSoup4 -version=4.5.3 +version=4.6.0 revision=1 noarch=yes wrksrc="beautifulsoup4-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://www.crummy.com/software/BeautifulSoup/" license="MIT" distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz" -checksum=b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e +checksum=808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89 post_install() { vlicense COPYING.txt LICENSE From da554934a6cecbaa84bf26a4b562fda59408d6f9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:54:01 +0200 Subject: [PATCH 0257/1145] python-zope.interface: update to 4.4.0 --- srcpkgs/python-zope.interface/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template index 694292766f..445d6e4156 100644 --- a/srcpkgs/python-zope.interface/template +++ b/srcpkgs/python-zope.interface/template @@ -1,6 +1,6 @@ # Template file for 'python-zope.interface' pkgname=python-zope.interface -version=4.3.3 +version=4.4.0 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -13,11 +13,9 @@ maintainer="Juan RP " homepage="https://github.com/zopefoundation/zope.interface" license="ZPL-2.1" distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz" -checksum=8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88 +checksum=e50e5e87cde9bf0ed59229fd372390c2d68b3674ae313858ef544d32051e2cd3 post_install() { - # delete C source - find ${DESTDIR} -type f -name '*.c' -delete # zope.interface provides the zope namespace for py_sitelib in $py2_sitelib $py3_sitelib; do vinstall src/zope/__init__.py 644 ${py_sitelib}/zope From e723f02dc795dcdf282373465a452ace8908e2c9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:56:16 +0200 Subject: [PATCH 0258/1145] speedtest-cli: update to 1.0.6 --- srcpkgs/speedtest-cli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template index f555f6d28b..7c98f20ebb 100644 --- a/srcpkgs/speedtest-cli/template +++ b/srcpkgs/speedtest-cli/template @@ -1,6 +1,6 @@ # Template file for 'speedtest-cli' pkgname=speedtest-cli -version=1.0.4 +version=1.0.6 revision=1 noarch=yes build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Aaron Marcher " license="Apache-2.0" homepage="https://github.com/sivel/speedtest-cli" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=8548af6284763030f346d5c0aab9bd19dfdebdcb36b20f068c7c8227edfefae0 +checksum=9ed312e552929241ed090e0c9370801c348e252af89e498034cf4a1ae2aa8aaa From 63678052cc8c5d34719369c6a1f61f72abb08a55 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:57:45 +0200 Subject: [PATCH 0259/1145] python-Django: update to 1.11.1 --- srcpkgs/python-Django/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template index 17c7f1ad51..0ca5283a63 100644 --- a/srcpkgs/python-Django/template +++ b/srcpkgs/python-Django/template @@ -1,6 +1,6 @@ # Template file for 'python-Django' pkgname=python-Django -version=1.11 +version=1.11.1 revision=1 noarch=yes wrksrc="Django-${version}" @@ -13,7 +13,7 @@ maintainer="Eivind Uggedal " license="3-clause-BSD" homepage="http://www.djangoproject.com/" distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz" -checksum=b6f3b864944276b4fd1d099952112696558f78b77b39188ac92b6c5e80152c30 +checksum=bbcefdf822eeef2cd04718ebcc24dd2ecf47407258cfcde2b4f95df57ce33a8c alternatives="django:django-admin:/usr/bin/django-admin2" post_install() { From 67d733950993ed443244c77432ecabd0e1792b89 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:58:12 +0200 Subject: [PATCH 0260/1145] python-chess: update to 0.18.1 --- 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 53f184498f..c56f359835 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.18.0 +version=0.18.1 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="cipr3s " license="GPL-3" homepage="https://github.com/niklasf/python-chess" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=90d16d282f5dc185d50d3a371b2cf50db1fe61dfd2467b610f6070a20fc7b295 +checksum=b126ff9cacdb7afca1e66bf9e074105c79e43e9abaeb416badeef7b921908951 python3-chess_package() { noarch=yes From 44be8c4d50cb78cf4405349109eade45bfd611bc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:58:18 +0200 Subject: [PATCH 0261/1145] chessx: update to 1.4.6 --- srcpkgs/chessx/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/chessx/template b/srcpkgs/chessx/template index f6edcece84..3e9a24ec74 100644 --- a/srcpkgs/chessx/template +++ b/srcpkgs/chessx/template @@ -1,19 +1,19 @@ # Template file for 'chessx' pkgname=chessx -version=1.4.4 +version=1.4.6 revision=1 build_style=qmake -hostmakedepends="qt5-qmake qt5-tools qt5-host-tools" -makedepends="qt5-devel qt5-multimedia-devel qt5-svg-devel pulseaudio-devel" +hostmakedepends="qt5-tools" +makedepends="qt5-multimedia-devel qt5-svg-devel pulseaudio-devel" short_desc="An Open Source chess database" maintainer="cipr3s " license="GPL-2" homepage="http://chessx.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" -checksum=66f6cd9711d21b636caa213d8aeca06e13a13d225f2b163411535ae7956e3396 +checksum=ad951910a3bd53f5655f9e85101e7969b536078473e09a2a7dded6ef171a68ed if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-tools-devel qt5-multimedia-devel qt5-svg-devel" + hostmakedepends+=" qt5-host-tools qt5-multimedia-devel qt5-svg-devel" fi do_install() { From 9e6adae859a42d679b56cc5ae3ea02a83d3fa404 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 18:59:39 +0200 Subject: [PATCH 0262/1145] python-colorama: update to 0.3.9 --- srcpkgs/python-colorama/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python-colorama/template b/srcpkgs/python-colorama/template index 1e6c8884d8..9597957c2f 100644 --- a/srcpkgs/python-colorama/template +++ b/srcpkgs/python-colorama/template @@ -1,19 +1,19 @@ # Template file for 'python-colorama' pkgname=python-colorama -version=0.3.7 -revision=2 +version=0.3.9 +revision=1 noarch=yes wrksrc=colorama-${version} build_style="python-module" hostmakedepends="python-setuptools python3-setuptools" depends="python" pycompile_module="colorama" -short_desc="Cross-platform colored terminal text in Python2" +short_desc="Cross-platform colored terminal text (Python2)" maintainer="Oliver Kiddle " license="3-clause-BSD" -homepage="https://pypi.python.org/pypi/colorama/" +homepage="https://github.com/tartley/colorama" distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz" -checksum=e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b +checksum=48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1 post_install() { vlicense LICENSE.txt LICENSE From 61c3a47cabffa45b36017df8bcd37ed2dd587e71 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 19:07:49 +0200 Subject: [PATCH 0263/1145] python-ansible-lint: update to 3.4.13 --- srcpkgs/python-ansible-lint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-ansible-lint/template b/srcpkgs/python-ansible-lint/template index b78bf5ca86..bfa0af6213 100644 --- a/srcpkgs/python-ansible-lint/template +++ b/srcpkgs/python-ansible-lint/template @@ -1,6 +1,6 @@ # Template file for 'python-ansible-lint' pkgname=python-ansible-lint -version=3.4.12 +version=3.4.13 revision=1 noarch=yes wrksrc="ansible-lint-${version}" @@ -13,7 +13,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/willthames/ansible-lint" license="MIT" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=cf97675d2908f865e7657d7082ba84c8adf4f3775e3920a6d4b9f171a5fdda2a +checksum=16bf69598843a77c3af97481ece55df8eeaea219c2f9d096772ea7a8bdb79ea4 post_install() { vlicense LICENSE From a1952264cfc7679f3ffda65bdd492de1bd08f347 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 19:07:55 +0200 Subject: [PATCH 0264/1145] python-yamllint: update to 1.7.0 --- srcpkgs/python-yamllint/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-yamllint/template b/srcpkgs/python-yamllint/template index fde0bcab1a..75293dfc8b 100644 --- a/srcpkgs/python-yamllint/template +++ b/srcpkgs/python-yamllint/template @@ -1,6 +1,6 @@ # Template file for 'python-yamllint' pkgname=python-yamllint -version=1.6.1 +version=1.7.0 revision=1 noarch=yes wrksrc="yamllint-${version}" @@ -13,7 +13,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/adrienverge/yamllint" license="GPL-3" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=a100c738df43e9bf82abfb5f496c503c48ee1112c56c8906078bb11733bb6aa0 +checksum=72be218707d9cbb6ff5f6fe9d748938ee6a2b378dade08db65943736f301a77a alternatives="yamllint:yamllint:/usr/bin/yamllint2" python3-yamllint_package() { From cd7f321b8b7d7aceed8597cfd23295db67a6bf59 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 7 May 2017 19:17:04 +0200 Subject: [PATCH 0265/1145] hplip: update to 3.17.4 --- srcpkgs/hplip/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 208392b21f..75e8308c34 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,7 +1,7 @@ # Template file for 'hplip' pkgname=hplip -version=3.16.11 -revision=2 +version=3.17.4 +revision=1 #XXX: pyqt pkgs for python gui hostmakedepends="pkg-config automake libtool python" makedepends="libressl-devel python-devel libxml2-python cups-devel sane-devel @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://hplipopensource.com/" license="GPL-2" distfiles="$SOURCEFORGE_SITE/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=f6e20cacb4891e4e60fc5de2213a10f8d0c68840f9b511aa38cfca0cb29f9b24 +checksum=e6f6ef71f7da80a620983c940b636054153a287994a13dfec1d5c86b15afe6ef CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/usr/include/python2.7" From 984129ce4875d2376ceff40098818aaef1a48814 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 7 May 2017 19:50:45 +0200 Subject: [PATCH 0266/1145] connman-ui: bump to build for musl Closes #6274 --- srcpkgs/connman-ui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/connman-ui/template b/srcpkgs/connman-ui/template index 013dfc9ab5..7984415157 100644 --- a/srcpkgs/connman-ui/template +++ b/srcpkgs/connman-ui/template @@ -1,7 +1,7 @@ # Template file for 'connman-ui' pkgname=connman-ui version=0.0.20150622 -revision=1 +revision=2 _gitrev=fce0af94e121bde77c7fa2ebd6a319f0180c5516 wrksrc=${pkgname}-${_gitrev} build_style=gnu-configure From c965fa1f550d767bcb0f8db03d325e08b2bc7dcd Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Sun, 7 May 2017 18:13:46 +0100 Subject: [PATCH 0267/1145] youtube-viewer: Fix typo in homepage --- srcpkgs/youtube-viewer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template index 76dc5c7443..5d8002ba9a 100644 --- a/srcpkgs/youtube-viewer/template +++ b/srcpkgs/youtube-viewer/template @@ -1,13 +1,13 @@ # Template file for 'youtube-viewer' pkgname=youtube-viewer version=3.2.7 -revision=1 +revision=2 build_style=perl-module hostmakedepends="perl" depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https" short_desc="Command-line client to search and stream from YouTube" maintainer="Duncaen " license="Artistic-2.0" -homepage="https://github.com/trizen/youtube-viewe" +homepage="https://github.com/trizen/youtube-viewer" distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz" checksum=cea80063a472c0b08aa907d936018eba1d1243f148d8437bd98a636adee72eb9 From 6a56d7bb341571b31593aba64fb04604dd144e1b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 7 May 2017 20:10:39 +0000 Subject: [PATCH 0268/1145] New package: kurly-1.0.0 --- srcpkgs/kurly/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/kurly/template diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template new file mode 100644 index 0000000000..c2b55489fa --- /dev/null +++ b/srcpkgs/kurly/template @@ -0,0 +1,17 @@ +# Template file for 'kurly' +pkgname=kurly +version=1.0.0 +revision=1 +build_style=go +go_import_path="github.com/davidjpeacock/kurly" +hostmakedepends="git" +short_desc="Alternative to the widely popular curl program" +maintainer="Michael Gehring " +license="Apache-2.0" +homepage="https://github.com/davidjpeacock/kurly" +distfiles="https://github.com/davidjpeacock/kurly/archive/v${version}.tar.gz" +checksum=5f75b48af69aa30651485d31949b13afa7ceb3a28617e7e02b28b89322277015 + +post_install() { + vlicense LICENSE +} From 97c5c90d71d17bae2793c4b2ba4dcf0053a7d5b3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 8 May 2017 01:34:02 +0200 Subject: [PATCH 0269/1145] qutebrowser: bump for musl --- srcpkgs/qutebrowser/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index d389b05875..d1f0e33885 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,7 +1,7 @@ # Template file for 'qutebrowser' pkgname=qutebrowser version=0.10.1 -revision=3 +revision=4 noarch=yes build_style=python3-module pycompile_module="${pkgname}" From c06913f737fde5b49757fa585f03d8376f1635e2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 May 2017 09:21:12 +0200 Subject: [PATCH 0270/1145] firefox: update to 53.0.2. --- srcpkgs/firefox/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index cdf910e8b4..5f25af98a4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,13 +1,13 @@ # Template build file for 'firefox'. pkgname=firefox -version=53.0 -revision=2 +version=53.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=4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0 +checksum=c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes @@ -23,7 +23,7 @@ makedepends=" $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel)" -depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" +depends="nss>=3.29 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver" From 5d9bd4173334438476f6825906d6c4d26c86ce01 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 May 2017 09:29:15 +0200 Subject: [PATCH 0271/1145] Revert "firefox: update to 53.0.2." This reverts commit c06913f737fde5b49757fa585f03d8376f1635e2. Fails to build, see: https://build.voidlinux.eu/builders/x86_64_builder/builds/2520/steps/shell_3/logs/stdio --- srcpkgs/firefox/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 5f25af98a4..cdf910e8b4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,13 +1,13 @@ # Template build file for 'firefox'. pkgname=firefox -version=53.0.2 -revision=1 +version=53.0 +revision=2 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=c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54 +checksum=4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes @@ -23,7 +23,7 @@ makedepends=" $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel)" -depends="nss>=3.29 desktop-file-utils hicolor-icon-theme" +depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver" From 4fe8ff7edfca308768b0f271d26ff29a29fd2135 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 May 2017 09:47:30 +0200 Subject: [PATCH 0272/1145] dnscrypt-proxy: update to 1.9.5. --- srcpkgs/dnscrypt-proxy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template index 1b46bf8ceb..33ffbf939f 100644 --- a/srcpkgs/dnscrypt-proxy/template +++ b/srcpkgs/dnscrypt-proxy/template @@ -1,6 +1,6 @@ # Template file for 'dnscrypt-proxy' pkgname=dnscrypt-proxy -version=1.9.4 +version=1.9.5 revision=1 build_style=gnu-configure makedepends="libsodium-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="ISC" homepage="https://dnscrypt.org/" distfiles="https://download.dnscrypt.org/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=40543efbcd56033ac03a1edf4581305e8c9bed4579ac55e6279644f07c315307 +checksum=64021fabb7d5bab0baf681796d90ecd2095fb81381e6fb317a532039025a9399 conf_files="/etc/dnscrypt-proxy.conf" system_accounts="dnscrypt_proxy" From ecece74024209f95e6776cb8747b37a60f97a5da Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 May 2017 09:48:18 +0200 Subject: [PATCH 0273/1145] eom: update to 1.18.2. --- srcpkgs/eom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template index 84add01841..48ec6bde79 100644 --- a/srcpkgs/eom/template +++ b/srcpkgs/eom/template @@ -1,6 +1,6 @@ # Template file for 'eom' pkgname=eom -version=1.18.1 +version=1.18.2 revision=1 build_options="gir" build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3bc3ece3f1114faf39bd9896f73a4eb48a40a40ddcdd48503838f13d007c744a +checksum=0755a43f48fe1a09b826cdd6ed239631f5e4f9163ccb481362534d8fcf3bda02 eom-devel_package() { short_desc+=" - development files" From cd3dcb800a66981f64f2fb5b40970c3807d56ee5 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 8 May 2017 09:51:52 +0200 Subject: [PATCH 0274/1145] firefox: update to 53.0.2. --- srcpkgs/firefox/patches/fix-cheddar-dep.patch | 30 +++++++++++++++++++ srcpkgs/firefox/template | 8 ++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/firefox/patches/fix-cheddar-dep.patch diff --git a/srcpkgs/firefox/patches/fix-cheddar-dep.patch b/srcpkgs/firefox/patches/fix-cheddar-dep.patch new file mode 100644 index 0000000000..d9c2ac660f --- /dev/null +++ b/srcpkgs/firefox/patches/fix-cheddar-dep.patch @@ -0,0 +1,30 @@ +See Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1338655 +--- media/libstagefright/binding/mp4parse-cargo.patch.orig 2017-05-08 09:40:56.297587573 +0200 ++++ media/libstagefright/binding/mp4parse-cargo.patch 2017-05-08 09:40:00.685697759 +0200 +@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/bindin + index aeeebc65..5c0836a 100644 + --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml + +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +-@@ -18,18 +18,10 @@ exclude = [ ++@@ -18,18 +18,11 @@ exclude = [ + "*.mp4", + ] + + -build = "build.rs" +-- +++build = false ++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} +--- media/libstagefright/binding/mp4parse_capi/Cargo.toml.orig 2017-05-08 09:37:52.694951351 +0200 ++++ media/libstagefright/binding/mp4parse_capi/Cargo.toml 2017-05-08 09:37:59.369938126 +0200 +@@ -18,6 +18,8 @@ exclude = [ + "*.mp4", + ] + ++build = false ++ + [dependencies] + byteorder = "1.0.0" + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index cdf910e8b4..5f25af98a4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,13 +1,13 @@ # Template build file for 'firefox'. pkgname=firefox -version=53.0 -revision=2 +version=53.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=4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0 +checksum=c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes @@ -23,7 +23,7 @@ makedepends=" $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel)" -depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" +depends="nss>=3.29 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver" From 6c6773b3e08dba8906e8111839dc4a87b6c852de Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 8 May 2017 10:28:58 +0200 Subject: [PATCH 0275/1145] linux3.18: update to 3.18.52 --- srcpkgs/linux3.18/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux3.18/template b/srcpkgs/linux3.18/template index 4c84678c58..1ed8801e03 100644 --- a/srcpkgs/linux3.18/template +++ b/srcpkgs/linux3.18/template @@ -1,6 +1,6 @@ # Template file for 'linux3.18' pkgname=linux3.18 -version=3.18.50 +version=3.18.52 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz" -checksum=8e8a6a80cc25aab6224e75876dbf2797eb0f4eaae409e8230409dbf04fb4db5d +checksum=52fbf115882130b6db70b3963cc4c520e076950c7eba947a0a0b334f619ffc1a _kernver="${version}_${revision}" From 9acd2e08f1f35ffd6c7cc133b9934662365936d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 8 May 2017 12:22:19 +0200 Subject: [PATCH 0276/1145] diffutils: fix gcc7.1.0 build --- .../diffutils/patches/gcc7-builtin_add_overflow.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch diff --git a/srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch b/srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch new file mode 100644 index 0000000000..dbb7204001 --- /dev/null +++ b/srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch @@ -0,0 +1,11 @@ +--- lib/intprops.h 2016-08-05 01:38:16.000000000 +0200 ++++ lib/intprops.h 2017-05-08 12:19:47.703724356 +0200 +@@ -223,7 +223,7 @@ + : (max) >> (b) < (a)) + + /* True if __builtin_add_overflow (A, B, P) works when P is null. */ +-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) ++#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 < __GNUC__) + + /* The _GL*_OVERFLOW macros have the same restrictions as the + *_RANGE_OVERFLOW macros, except that they do not assume that operands From 337a6ec434d37eedb9b4e5f7c66add3ef600adb4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 13:07:15 +0200 Subject: [PATCH 0277/1145] trace-cmd: fix update-check. --- srcpkgs/trace-cmd/update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/trace-cmd/update b/srcpkgs/trace-cmd/update index c4ecedf82c..d482c0a68e 100644 --- a/srcpkgs/trace-cmd/update +++ b/srcpkgs/trace-cmd/update @@ -1 +1,2 @@ -pattern='trace-cmd-v\K[\d.]+' +pattern='trace-cmd-v\K[\d.dev]+' +ignore='*.dev' From 19847ed06ea393df0b09346200262e47ef91b35d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 14:11:20 +0200 Subject: [PATCH 0278/1145] sam2p: force rebuild. --- srcpkgs/sam2p/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sam2p/template b/srcpkgs/sam2p/template index 69605120c5..ef0e7c8e72 100644 --- a/srcpkgs/sam2p/template +++ b/srcpkgs/sam2p/template @@ -1,7 +1,7 @@ # Template file for 'sam2p' pkgname=sam2p version=0.49.3 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="perl" depends="perl" From 93a3c4915897c634e4a45a727cdac39a814f289f Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Mon, 8 May 2017 09:12:43 -0300 Subject: [PATCH 0279/1145] rover: update to 1.0.0 --- srcpkgs/rover/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rover/template b/srcpkgs/rover/template index 644ef983d2..e44bc4dcf0 100644 --- a/srcpkgs/rover/template +++ b/srcpkgs/rover/template @@ -1,6 +1,6 @@ # Template file for 'rover' pkgname=rover -version=0.4.2 +version=1.0.0 revision=1 makedepends="ncurses-devel" short_desc="Simple file browser for the terminal" @@ -8,7 +8,7 @@ maintainer="Diogo Leal " license="Public Domain" homepage="https://github.com/lecram/rover" distfiles="https://github.com/lecram/rover/archive/v${version}.tar.gz" -checksum=2e3521487ccae06e38be40e182a0f1ddcbbe395474e47753fbdcae02d25f03a7 +checksum=f2e6629107f80cc71e64cf1f2c79afe8c76d3aa0d53074bd221e5ddcda895a4e do_build() { make ${makejobs} LDLIBS="-lncursesw" From a785d317884a09671ff4e27980001644577ab612 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 14:54:00 +0200 Subject: [PATCH 0280/1145] mupdf: remove third-party libjpeg. --- srcpkgs/mupdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index 688e86ccd8..763ad25815 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,7 +1,7 @@ # Template file for 'mupdf' pkgname=mupdf version=1.11 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel @@ -17,7 +17,7 @@ distfiles="http://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.g checksum=209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a pre_configure() { - rm -rf thirdparty/{curl,freetype,harfbuzz,jpeg,zlib,jbig2dec,openjpeg} + rm -rf thirdparty/{curl,freetype,harfbuzz,libjpeg,zlib,jbig2dec,openjpeg} } do_configure() { if [ "$CROSS_BUILD" ]; then From ecbb28d1ebfb5652ed49bf4c65ea2ebc19ceb146 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 14:54:56 +0200 Subject: [PATCH 0281/1145] zathura-pdf-mupdf: rebuild for mupdf w/o libjpeg. --- srcpkgs/zathura-pdf-mupdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index b9b4e778a0..e27bc7ca06 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -1,7 +1,7 @@ # Template file for 'zathura-pdf-mupdf' pkgname=zathura-pdf-mupdf version=0.3.1 -revision=3 +revision=4 build_style=gnu-makefile make_build_args="MUPDF_LIB=-lmupdf MUPDF_LIB+=-lmujs" maintainer="lemmi " From 25b0fabfa14cebb160e27995af1fac438bcecb6b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 14:55:30 +0200 Subject: [PATCH 0282/1145] lldb: force LLDB_EDITLINE_USE_WCHAR. Explicitly not revbumped to avoid rebuild. Fixes #6073. --- srcpkgs/llvm/files/patches/lldb/editline_wchar.patch | 11 +++++++++++ srcpkgs/llvm/template | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/llvm/files/patches/lldb/editline_wchar.patch diff --git a/srcpkgs/llvm/files/patches/lldb/editline_wchar.patch b/srcpkgs/llvm/files/patches/lldb/editline_wchar.patch new file mode 100644 index 0000000000..497e8b35e2 --- /dev/null +++ b/srcpkgs/llvm/files/patches/lldb/editline_wchar.patch @@ -0,0 +1,11 @@ +--- lldb/include/lldb/Host/Editline.h.orig ++++ lldb/include/lldb/Host/Editline.h +@@ -43,7 +43,7 @@ + // will only be + // used in cases where this is true. This is a compile time dependecy, for now + // selected per target Platform +-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) + #define LLDB_EDITLINE_USE_WCHAR 1 + #include + #else diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index 9280d93d73..06f92aa7ac 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -124,10 +124,6 @@ pre_configure() { esac configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" - - case "$XBPS_TARGET_MACHINE" in - *-musl) configure_args+=" -DLLDB_DISABLE_LIBEDIT=ON";; - esac } post_configure() { # Don't leak CFLAGS into llvm-config. From e9cfd8a96a6da7530062593a0d9c60cd1135f77b Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Mon, 8 May 2017 15:11:00 +0200 Subject: [PATCH 0283/1145] flint: update to 0.1.0. --- srcpkgs/flint/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 0f835c03da..14806a47b9 100644 --- a/srcpkgs/flint/template +++ b/srcpkgs/flint/template @@ -1,9 +1,7 @@ # Template file for 'flint' pkgname=flint -version=0.0.4.20160114 -revision=5 -_commit=0a4fec3268ca19c5f8ed2f4904b878934a92a060 -wrksrc="$pkgname-$_commit" +version=0.1.0 +revision=1 build_style=go hostmakedepends="git-perl" short_desc="Check your project for common sources of contributor friction" @@ -11,8 +9,8 @@ maintainer="Andrea Brancaleoni " license="MIT" go_import_path="github.com/pengwynn/flint" homepage="https://${go_import_path}" -distfiles="${homepage}/archive/${_commit}.tar.gz" -checksum=c91258674bbc32a20e9abc92a9125e25bafb13d26255cffc865ecdbbe2d60993 +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=ec865ec5cad191c7fc9c7c6d5007754372696a708825627383913367f3ef8b7f post_install() { vlicense LICENSE.md From a4acdac8fd3ae6e9049d78006025fee095ed1d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 8 May 2017 15:21:18 +0200 Subject: [PATCH 0284/1145] xbps: fix for gcc-7.1.0 --- srcpkgs/xbps/template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 6c25e6dfeb..64af001b50 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -13,6 +13,9 @@ checksum=fb97f78a2d1e78ca7fb74426bbc7edac7af36366491dbcf3b97db3aa1b20a8b7 # readdir_r is deprecated CFLAGS="-Wno-error=deprecated-declarations" +if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then + CFLAGS+=" -Wno-format-truncation -Wno-implicit-fallthrough -Wno-unsafe-loop-optimizations" +fi hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel libarchive-devel" From 80e2760e08deb914dd3f3bcc54f8ee3dd2219fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 8 May 2017 15:36:04 +0200 Subject: [PATCH 0285/1145] openssh: fix for gcc-7.1.0 --- srcpkgs/openssh/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 754ae2e396..e3b8a6de56 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -38,6 +38,10 @@ case $XBPS_TARGET_MACHINE in ;; esac +if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then + CFLAGS+=" -Wno-format-truncation" +fi + pre_configure() { autoreconf -fi } From a13ff8c1fb840fec5eb390ca9f33237214184d5a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 8 May 2017 16:16:05 +0200 Subject: [PATCH 0286/1145] strip-nondeterminism: update to 0.033. --- srcpkgs/strip-nondeterminism/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template index d2c47222d3..a48be77252 100644 --- a/srcpkgs/strip-nondeterminism/template +++ b/srcpkgs/strip-nondeterminism/template @@ -1,6 +1,6 @@ # Template file for 'strip-nondeterminism' pkgname=strip-nondeterminism -version=0.032 +version=0.033 revision=1 create_wrksrc=yes build_style=perl-module @@ -10,6 +10,6 @@ depends="${makedepends}" short_desc="Non-deterministic information stripper" maintainer="Enno Boland " license="GPL-3" -homepage="https://tracker.debian.org/pkg/strip-nondeterminism" +homepage="https://reproducible-builds.org/tools/" distfiles="http://http.debian.net/debian/pool/main/s/${pkgname}/${pkgname}_${version}.orig.tar.gz" -checksum=43912c367deaf3d2bf545180e07545415c5e0ee7461481e9d89e66328a591b89 +checksum=63570c62ad6cb9e74a4ba2c0052a3c41f3e25936267379344d980a474ba24720 From a2fa4f8851df79285cbde1f3ae8311879ed8a56b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 8 May 2017 16:29:41 +0200 Subject: [PATCH 0287/1145] New package: disorderfs-0.5.1 --- common/shlibs | 1 + srcpkgs/disorderfs/template | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 srcpkgs/disorderfs/template diff --git a/common/shlibs b/common/shlibs index c23777289f..28a24a2703 100644 --- a/common/shlibs +++ b/common/shlibs @@ -151,6 +151,7 @@ libdbus-glib-1.so.2 dbus-glib-0.80_1 libxml2.so.2 libxml2-2.7.0_1 libfuse.so.2 fuse-2.8.1_1 libXext.so.6 libXext-1.0.5_1 +libulockmgr.so.1 fuse-2.9.7_1 libXcomposite.so.1 libXcomposite-0.4.0_1 libXdamage.so.1 libXdamage-1.1.1_1 libXfixes.so.3 libXfixes-4.0.3_1 diff --git a/srcpkgs/disorderfs/template b/srcpkgs/disorderfs/template new file mode 100644 index 0000000000..26f4e05ddd --- /dev/null +++ b/srcpkgs/disorderfs/template @@ -0,0 +1,15 @@ +# Template file for 'disorderfs' +pkgname=disorderfs +version=0.5.1 +revision=1 +create_wrksrc=yes +build_style=gnu-makefile +hostmakedepends="pkg-config" +makedepends="fuse-devel attr-devel" +depends="${makedepends}" +short_desc="FUSE filesystem that introduces non-determinism filesystem metadata" +maintainer="Enno Boland " +license="GPL-3" +homepage="https://reproducible-builds.org/tools/" +distfiles="http://http.debian.net/debian/pool/main/d/${pkgname}/${pkgname}_${version}.orig.tar.gz" +checksum=334e15cadeecedce5a79715a61acda5adf0f0a8fafc42a8aca26708e3198dd5a From 7f8e737b595beabaa3836ad472b6cb2cc185e5fc Mon Sep 17 00:00:00 2001 From: Denis Revin Date: Mon, 29 Aug 2016 14:03:39 +0400 Subject: [PATCH 0288/1145] New package: lua-cjson-2.1.0 Closes: #4684 [via git-merge-pr] --- srcpkgs/lua-cjson/template | 64 ++++++++++++++++++++++++++++++++++++++ srcpkgs/lua51-cjson | 1 + srcpkgs/lua52-cjson | 1 + 3 files changed, 66 insertions(+) create mode 100644 srcpkgs/lua-cjson/template create mode 120000 srcpkgs/lua51-cjson create mode 120000 srcpkgs/lua52-cjson diff --git a/srcpkgs/lua-cjson/template b/srcpkgs/lua-cjson/template new file mode 100644 index 0000000000..b9617715c4 --- /dev/null +++ b/srcpkgs/lua-cjson/template @@ -0,0 +1,64 @@ +# Template file for 'lua-cjson' +pkgname=lua-cjson +version=2.1.0 +revision=1 +build_style=gnu-makefile +hostmakedepends="lua lua51 lua52" +makedepends="lua-devel lua51-devel lua52-devel" +depends="lua>=5.3" +_desc="JSON support for Lua" +short_desc="${_desc} (5.3)" +maintainer="Denis Revin " +license="MIT" +homepage="http://www.kyne.com.au/~mark/software/lua-cjson.php" +distfiles="http://www.kyne.com.au/~mark/software/download/${pkgname}-${version}.tar.gz" +checksum=51bc69cd55931e0cba2ceae39e9efa2483f4292da3a88a1ed470eda829f6c778 + +post_extract() { + mkdir -p lua51 + mv * lua51 || true + cp -a lua51 lua52 + cp -a lua51 lua53 +} + +do_build() { + cd ${wrksrc}/lua51 + make + + cd ${wrksrc}/lua52 + make + + cd ${wrksrc}/lua53 + make +} + +do_install() { + cd ${wrksrc}/lua51 + vinstall cjson.so 755 usr/lib/lua/5.1 + + cd ${wrksrc}/lua52 + vinstall cjson.so 755 usr/lib/lua/5.2 + + cd ${wrksrc}/lua53 + vinstall cjson.so 755 usr/lib/lua/5.3 + vlicense LICENSE +} + +lua51-cjson_package() { + depends="lua51" + short_desc="${_desc} (5.1)" + pkg_install() { + vmove usr/lib/lua/5.1 + vlicense ${wrksrc}/lua51/LICENSE + } +} + +lua52-cjson_package() { + depends="lua52" + short_desc="${_desc} (5.2)" + pkg_install() { + vmove usr/lib/lua/5.2 + vlicense ${wrksrc}/lua52/LICENSE + } +} + diff --git a/srcpkgs/lua51-cjson b/srcpkgs/lua51-cjson new file mode 120000 index 0000000000..b379c08745 --- /dev/null +++ b/srcpkgs/lua51-cjson @@ -0,0 +1 @@ +lua-cjson \ No newline at end of file diff --git a/srcpkgs/lua52-cjson b/srcpkgs/lua52-cjson new file mode 120000 index 0000000000..b379c08745 --- /dev/null +++ b/srcpkgs/lua52-cjson @@ -0,0 +1 @@ +lua-cjson \ No newline at end of file From 5c5d1020a75e15742c56b76624cc134bf0d7fe32 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 8 May 2017 19:04:55 +0200 Subject: [PATCH 0289/1145] lua-cjson: cleanup --- srcpkgs/lua-cjson/template | 43 +++++++++++++------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/srcpkgs/lua-cjson/template b/srcpkgs/lua-cjson/template index b9617715c4..b270327032 100644 --- a/srcpkgs/lua-cjson/template +++ b/srcpkgs/lua-cjson/template @@ -2,12 +2,11 @@ pkgname=lua-cjson version=2.1.0 revision=1 -build_style=gnu-makefile +create_wrksrc=yes hostmakedepends="lua lua51 lua52" makedepends="lua-devel lua51-devel lua52-devel" depends="lua>=5.3" -_desc="JSON support for Lua" -short_desc="${_desc} (5.3)" +short_desc="JSON support for Lua" maintainer="Denis Revin " license="MIT" homepage="http://www.kyne.com.au/~mark/software/lua-cjson.php" @@ -15,50 +14,38 @@ distfiles="http://www.kyne.com.au/~mark/software/download/${pkgname}-${version}. checksum=51bc69cd55931e0cba2ceae39e9efa2483f4292da3a88a1ed470eda829f6c778 post_extract() { - mkdir -p lua51 - mv * lua51 || true + mv "lua-cjson-${version}" lua51 cp -a lua51 lua52 cp -a lua51 lua53 } - do_build() { - cd ${wrksrc}/lua51 - make - - cd ${wrksrc}/lua52 - make - - cd ${wrksrc}/lua53 - make + for x in lua51 lua52 lua53; do + make -C "$x" \ + CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + LUA_VERSION="5.${x#lua5}" USE_INTERNAL_FPCONV=1 \ + LUA_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include/lua5.${x#lua5}" + done } - do_install() { - cd ${wrksrc}/lua51 - vinstall cjson.so 755 usr/lib/lua/5.1 - - cd ${wrksrc}/lua52 - vinstall cjson.so 755 usr/lib/lua/5.2 - - cd ${wrksrc}/lua53 - vinstall cjson.so 755 usr/lib/lua/5.3 - vlicense LICENSE + for x in lua51 lua52 lua53; do + vinstall "$x/cjson.so" 755 "usr/lib/lua/5.${x#lua5}" + done + vlicense lua53/LICENSE } lua51-cjson_package() { depends="lua51" - short_desc="${_desc} (5.1)" + short_desc+=" (5.1)" pkg_install() { vmove usr/lib/lua/5.1 vlicense ${wrksrc}/lua51/LICENSE } } - lua52-cjson_package() { depends="lua52" - short_desc="${_desc} (5.2)" + short_desc+=" (5.2)" pkg_install() { vmove usr/lib/lua/5.2 vlicense ${wrksrc}/lua52/LICENSE } } - From 0d66d14a1255b257d9749c17df86dfa961a133cd Mon Sep 17 00:00:00 2001 From: Denis Revin Date: Fri, 7 Oct 2016 20:30:52 +0400 Subject: [PATCH 0290/1145] New package: xca-1.3.2 Closes: #4914 [via git-merge-pr] --- srcpkgs/xca/patches/libressl.patch | 13 +++++++++++++ srcpkgs/xca/template | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 srcpkgs/xca/patches/libressl.patch create mode 100644 srcpkgs/xca/template diff --git a/srcpkgs/xca/patches/libressl.patch b/srcpkgs/xca/patches/libressl.patch new file mode 100644 index 0000000000..77235ecfb1 --- /dev/null +++ b/srcpkgs/xca/patches/libressl.patch @@ -0,0 +1,13 @@ +--- lib/pki_temp.cpp.orig 2016-10-07 18:41:22.920435711 +0400 ++++ lib/pki_temp.cpp 2016-10-07 18:48:19.459988316 +0400 +@@ -367,8 +367,8 @@ + PEM_write_bio(b, PEM_STRING_XCA_TEMPLATE, (char*)"", + (unsigned char*)(ba.data()), ba.size()); + #else +- PEM_write_bio(b, PEM_STRING_XCA_TEMPLATE, "", +- (const unsigned char*)(ba.constData()), ba.size()); ++ PEM_write_bio(b, PEM_STRING_XCA_TEMPLATE, (char*)"", ++ (unsigned char*)(ba.constData()), ba.size()); + #endif + pki_openssl_error(); + return b; diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template new file mode 100644 index 0000000000..ab210c7438 --- /dev/null +++ b/srcpkgs/xca/template @@ -0,0 +1,25 @@ +# Template file for 'xca' +pkgname=xca +version=1.3.2 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config qt5-tools qt5-host-tools" +makedepends="qt5-devel libressl-devel libltdl-devel" +short_desc="X Certificate and Key Management" +maintainer="Denis Revin " +license="BSD" +homepage="http://xca.sourceforge.net/" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4 + +do_build() { + make all +} + +do_install() { + make destdir=${DESTDIR} install +} + +post_install() { + vlicense COPYRIGHT +} From 65b266fd801c9a15f79f96e5fe1a84ba3f06389a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 8 May 2017 19:22:42 +0200 Subject: [PATCH 0291/1145] xca: cleanup --- srcpkgs/xca/template | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template index ab210c7438..1c4250e14c 100644 --- a/srcpkgs/xca/template +++ b/srcpkgs/xca/template @@ -3,6 +3,8 @@ pkgname=xca version=1.3.2 revision=1 build_style=gnu-configure +make_build_target="all" +make_install_args="destdir=${DESTDIR}" hostmakedepends="pkg-config qt5-tools qt5-host-tools" makedepends="qt5-devel libressl-devel libltdl-devel" short_desc="X Certificate and Key Management" @@ -12,14 +14,6 @@ homepage="http://xca.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz" checksum=04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4 -do_build() { - make all -} - -do_install() { - make destdir=${DESTDIR} install -} - post_install() { vlicense COPYRIGHT } From 2826534a0feb079d374bdfb7760d1827031c0cf0 Mon Sep 17 00:00:00 2001 From: Paul Merrill Date: Sun, 23 Apr 2017 22:50:33 -0700 Subject: [PATCH 0292/1145] New package: gosu-0.12.0 Closes: #6256 [via git-merge-pr] --- srcpkgs/gosu-devel | 1 + srcpkgs/gosu/template | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 120000 srcpkgs/gosu-devel create mode 100644 srcpkgs/gosu/template diff --git a/srcpkgs/gosu-devel b/srcpkgs/gosu-devel new file mode 120000 index 0000000000..c6edf108b4 --- /dev/null +++ b/srcpkgs/gosu-devel @@ -0,0 +1 @@ +gosu \ No newline at end of file diff --git a/srcpkgs/gosu/template b/srcpkgs/gosu/template new file mode 100644 index 0000000000..ee6b001abf --- /dev/null +++ b/srcpkgs/gosu/template @@ -0,0 +1,30 @@ +pkgname=gosu +version=0.12.0 +revision=1 +build_style=cmake +build_wrksrc=cmake +hostmakedepends="cmake pkg-config" +makedepends="libopenal-devel libsndfile-devel mpg123-devel pango-devel + SDL2_ttf-devel" +depends="libopenal libmpg123 libsndfile pango SDL2_ttf" +short_desc="2D game development library" +maintainer="Paul Merrill " +license="MIT" +homepage="https://www.libgosu.org" +distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" +checksum=aa726e7da57eb4671ff19a198e7015c1899e0536b0152e7375a949c7216ef90c + +post_install() { + vlicense ../COPYING LICENSE +} + +gosu-devel_package() { + depends="gosu>=${version}_${revision} pkg-config" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/share/pkgconfig + vmove usr/share/Gosu + vmove "usr/lib/*.so" + } +} From 977ab46b93a339361f10c3f253c03db7c9fdd372 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 8 May 2017 19:43:54 +0200 Subject: [PATCH 0293/1145] gosu: fixup --- common/shlibs | 1 + srcpkgs/gosu/template | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 28a24a2703..dc87931092 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2847,3 +2847,4 @@ libbacfind-7.4.7.so bacula-common-7.4.7_1 libbacsql-7.4.7.so bacula-common-7.4.7_1 libbaccats-7.4.7.so bacula-common-7.4.7_1 libsuperlu.so.5 superlu-5.2.1_1 +libgosu.so.0 gosu-0.12.0_1 diff --git a/srcpkgs/gosu/template b/srcpkgs/gosu/template index ee6b001abf..9f676c71a4 100644 --- a/srcpkgs/gosu/template +++ b/srcpkgs/gosu/template @@ -1,12 +1,12 @@ +# Template file for 'gosu' pkgname=gosu version=0.12.0 revision=1 build_style=cmake build_wrksrc=cmake -hostmakedepends="cmake pkg-config" +hostmakedepends="pkg-config" makedepends="libopenal-devel libsndfile-devel mpg123-devel pango-devel SDL2_ttf-devel" -depends="libopenal libmpg123 libsndfile pango SDL2_ttf" short_desc="2D game development library" maintainer="Paul Merrill " license="MIT" @@ -15,11 +15,11 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" checksum=aa726e7da57eb4671ff19a198e7015c1899e0536b0152e7375a949c7216ef90c post_install() { - vlicense ../COPYING LICENSE + vlicense ../COPYING } gosu-devel_package() { - depends="gosu>=${version}_${revision} pkg-config" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 4533b8fa78ad8c132143000c05b3a2e467963467 Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Sat, 11 Mar 2017 09:29:06 -0300 Subject: [PATCH 0294/1145] New package: rix-0.3.0 Closes: #5961 [via git-merge-pr] --- srcpkgs/rix/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/rix/template diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template new file mode 100644 index 0000000000..228265120f --- /dev/null +++ b/srcpkgs/rix/template @@ -0,0 +1,19 @@ +# Template file for 'rix' +pkgname=rix +version=0.3.0 +revision=1 +build_style=gnu-makefile +hostmakedepends="bison flex" +short_desc="An expressive and efficient language for the C ecosystem" +maintainer="Diogo Leal " +license="GPL-3" +homepage="https://github.com/riolet/rix" +distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz" +checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c +nostrip=yes + +do_install() { + vbin rixc + vbin clr.sh + vbin comp.sh +} From 2243b118b4cafad8e9edeb6074e158d5d84a2b86 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 8 May 2017 20:06:54 +0200 Subject: [PATCH 0295/1145] rix: fixup --- srcpkgs/rix/patches/fixes.patch | 21 +++++++++++++++++++++ srcpkgs/rix/patches/makefile.patch | 11 +++++++++++ srcpkgs/rix/patches/overflow.patch | 11 +++++++++++ srcpkgs/rix/template | 1 - 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/rix/patches/fixes.patch create mode 100644 srcpkgs/rix/patches/makefile.patch create mode 100644 srcpkgs/rix/patches/overflow.patch diff --git a/srcpkgs/rix/patches/fixes.patch b/srcpkgs/rix/patches/fixes.patch new file mode 100644 index 0000000000..f9622fb7de --- /dev/null +++ b/srcpkgs/rix/patches/fixes.patch @@ -0,0 +1,21 @@ +--- rixc.h.orig ++++ rixc.h +@@ -15,6 +15,7 @@ + + void defineRSLSymbols(Object *); + ++Object *directive(char *key, char *value); + Object *findByName(char *name); + Object *findFunctionByFullName(char *name); + +--- rix.l.orig ++++ rix.l +@@ -5,7 +5,7 @@ + #include "ObjectTree.h" + #include "rix.tab.h" /* Generated by bison. */ + #include "rixc.h" +-#include "error.h" ++#include "errors.h" + + #define INSERT_BUFF_LEN 1024 + #define INDENT_STACK_MAX 512 diff --git a/srcpkgs/rix/patches/makefile.patch b/srcpkgs/rix/patches/makefile.patch new file mode 100644 index 0000000000..7dbb200643 --- /dev/null +++ b/srcpkgs/rix/patches/makefile.patch @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -7,7 +7,7 @@ + flex rix.l + + rixc: lex.yy.c rix.tab.c rix.tab.h +- gcc -ggdb preproc.c ObjectTree.c rix.tab.c lex.yy.c rixc.c errors.c crsl.c -lfl -o rixc ++ ${CC} ${CFLAGS} -ggdb preproc.c ObjectTree.c rix.tab.c lex.yy.c rixc.c errors.c crsl.c -o rixc ${LDFLAGS} + + clean: + rm rixc rix.tab.c lex.yy.c rix.tab.h diff --git a/srcpkgs/rix/patches/overflow.patch b/srcpkgs/rix/patches/overflow.patch new file mode 100644 index 0000000000..d57b727150 --- /dev/null +++ b/srcpkgs/rix/patches/overflow.patch @@ -0,0 +1,11 @@ +--- rixc.c.orig ++++ rixc.c +@@ -1563,7 +1563,7 @@ + Object *objectfloat(float f) + { + compilerDebugPrintf("objectfloat(%f)\n", f); +- char buffer[128]; ++ char buffer[BUFFLEN]; + snprintf(buffer, BUFFLEN, "%f", f); + Object *result = CreateObject(0, 0, 0, Expression, "float"); + addCode(result, buffer); diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template index 228265120f..397198dd20 100644 --- a/srcpkgs/rix/template +++ b/srcpkgs/rix/template @@ -10,7 +10,6 @@ license="GPL-3" homepage="https://github.com/riolet/rix" distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz" checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c -nostrip=yes do_install() { vbin rixc From 9ee94776ac20546e2116ff765ee63bd0302978be Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 8 May 2017 20:48:32 +0000 Subject: [PATCH 0296/1145] ponyc: update to 0.14.0. --- srcpkgs/ponyc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ponyc/template b/srcpkgs/ponyc/template index 6f50b3488f..f01447497c 100644 --- a/srcpkgs/ponyc/template +++ b/srcpkgs/ponyc/template @@ -1,17 +1,17 @@ # Template file for 'ponyc' pkgname=ponyc -version=0.13.2 +version=0.14.0 revision=1 only_for_archs="x86_64" build_style=gnu-makefile -hostmakedepends="llvm" +hostmakedepends="llvm3.9" makedepends="zlib-devel ncurses-devel" short_desc="OO, actor-model, capabilities-secure, high-performance language" maintainer="bougyman " license="2-clause-BSD" homepage="http://ponylang.org/" distfiles="https://github.com/CausalityLtd/ponyc/archive/${version}.tar.gz" -checksum=2e01a64e93c29adad3553a12188a20bfcfbb3f3a35f4a15f867d730cff13a34f +checksum=4a7d05c1b8e6c681c6ee89653b75e0de382176408dc192e3bab2853f812f9dad do_build() { make config=release destdir=/usr/lib/pony/${version} prefix=/usr From 761eb43f891fa44c69e452ba768afc3e16f47375 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 15:12:55 +0200 Subject: [PATCH 0297/1145] llvm: add AMDGPU patch. --- .../llvm/0001-AMDGPU-Fix-bug-31610.patch | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 srcpkgs/llvm/files/patches/llvm/0001-AMDGPU-Fix-bug-31610.patch diff --git a/srcpkgs/llvm/files/patches/llvm/0001-AMDGPU-Fix-bug-31610.patch b/srcpkgs/llvm/files/patches/llvm/0001-AMDGPU-Fix-bug-31610.patch new file mode 100644 index 0000000000..d19885883f --- /dev/null +++ b/srcpkgs/llvm/files/patches/llvm/0001-AMDGPU-Fix-bug-31610.patch @@ -0,0 +1,74 @@ +From bc72a21666a9efc78e71b0296313f6e1449649fa Mon Sep 17 00:00:00 2001 +From: Konstantin Zhuravlyov +Date: Wed, 22 Mar 2017 21:48:18 +0000 +Subject: [PATCH] [AMDGPU] Fix bug 31610 + +Differential Revision: https://reviews.llvm.org/D31258 + + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298551 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Target/AMDGPU/AMDGPURuntimeMetadata.h | 8 ++++---- + lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp | 5 ++--- + 2 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h b/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h +index ed147ff4c43..36e7a0c42a9 100644 +--- a/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h ++++ b/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h +@@ -40,8 +40,8 @@ namespace AMDGPU { + namespace RuntimeMD { + + // Version and revision of runtime metadata +- const unsigned char MDVersion = 2; +- const unsigned char MDRevision = 0; ++ const uint32_t MDVersion = 2; ++ const uint32_t MDRevision = 0; + + // Name of keys for runtime metadata. + namespace KeyName { +@@ -215,7 +215,7 @@ namespace RuntimeMD { + struct Metadata { + std::string Name; + std::string Language; +- std::vector LanguageVersion; ++ std::vector LanguageVersion; + std::vector ReqdWorkGroupSize; + std::vector WorkGroupSizeHint; + std::string VecTypeHint; +@@ -265,7 +265,7 @@ namespace RuntimeMD { + namespace Program { + // In-memory representation of program information. + struct Metadata { +- std::vector MDVersionSeq; ++ std::vector MDVersionSeq; + std::vector PrintfInfo; + std::vector Kernels; + +diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp +index 0e87d750f5d..7c96898297c 100644 +--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp ++++ b/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp +@@ -49,7 +49,6 @@ static cl::opt + CheckRuntimeMDParser("amdgpu-check-rtmd-parser", cl::Hidden, + cl::desc("Check AMDGPU runtime metadata YAML parser")); + +-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint8_t) + LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t) + LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(std::string) + LLVM_YAML_IS_SEQUENCE_VECTOR(Kernel::Metadata) +@@ -297,9 +296,9 @@ static Kernel::Metadata getRuntimeMDForKernel(const Function &F) { + auto Node = MD->getOperand(0); + if (Node->getNumOperands() > 1) { + Kernel.Language = "OpenCL C"; +- uint16_t Major = mdconst::extract(Node->getOperand(0)) ++ uint32_t Major = mdconst::extract(Node->getOperand(0)) + ->getZExtValue(); +- uint16_t Minor = mdconst::extract(Node->getOperand(1)) ++ uint32_t Minor = mdconst::extract(Node->getOperand(1)) + ->getZExtValue(); + Kernel.LanguageVersion.push_back(Major); + Kernel.LanguageVersion.push_back(Minor); +-- +2.12.2 + From 8186217922abe425ba5732a0f8bbc43b24451134 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 15:13:09 +0200 Subject: [PATCH 0298/1145] llvm: install utils. These are needed to run tests for other LLVM-related projects. --- srcpkgs/llvm/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index 06f92aa7ac..fab6d25699 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -7,6 +7,7 @@ lib32disabled=yes build_style=cmake configure_args=" -DCMAKE_BUILD_TYPE=Release + -DLLVM_INSTALL_UTILS=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_RTTI=ON From dfe17038d68dae66923c4ad13f92468da03a2da0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 8 May 2017 23:02:32 +0200 Subject: [PATCH 0299/1145] qemu: enable smartcard support by default fixes #6336. --- srcpkgs/qemu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 438fe3350c..99b40086dd 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,7 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=2.9.0 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" @@ -23,7 +23,7 @@ makedepends="libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel $(vopt_if smartcard libcacard-devel)" build_options="gtk opengl sdl sdl2 spice virgl smartcard" -build_options_default="opengl sdl2 virgl" +build_options_default="opengl sdl2 virgl smartcard" desc_option_gtk="Enable GTK display and use it by default" desc_option_sdl="Use SDL (1.x) video output" desc_option_sdl2="Use SDL (2.x) video output" From 349af816c44c687f54c0cafed0b7ee7564cd4bb6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 8 May 2017 23:21:54 +0200 Subject: [PATCH 0300/1145] llvm: rebuild. --- srcpkgs/llvm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index fab6d25699..dfb740d7fb 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,7 +1,7 @@ # Template file for 'llvm' pkgname=llvm version=4.0.0 -revision=1 +revision=2 wrksrc="llvm-${version}.src" lib32disabled=yes build_style=cmake From 1e2cec54a6a11bed8f87e0b2310cbb9d86936bd0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 9 May 2017 00:29:39 +0200 Subject: [PATCH 0301/1145] pgadmin3: mention actual bug in the patch --- srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch index 200aa84abf..434ea3d22d 100644 --- a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch +++ b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch @@ -1,3 +1,5 @@ +https://bugs.archlinux.org/task/52683 + --- pgadmin/frm/plugins.cpp +++ pgadmin/frm/plugins.cpp @@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p From 595f12dbcab4f2e381d6b70eee776286f34a2cec Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 9 May 2017 00:39:07 +0200 Subject: [PATCH 0302/1145] gnome: remove unused file --- srcpkgs/gnome/deps | 62 ---------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 srcpkgs/gnome/deps diff --git a/srcpkgs/gnome/deps b/srcpkgs/gnome/deps deleted file mode 100644 index 86d836c6b9..0000000000 --- a/srcpkgs/gnome/deps +++ /dev/null @@ -1,62 +0,0 @@ - -baobab>=3.16.1 -bijiben>=3.18.0 -brasero>=3.12.1 -cantarell-fonts>=0.0.16 -cheese>=3.18.0 -empathy>=3.12.10 -eog>=3.16.3 -eog-plugins>=3.16.1 -epiphany>=3.18.0 -evince>=3.18.0 -evolution>=3.18.0 -file-roller>=3.16.4 -gdm>=3.16.4 -gedit>=3.18.0 -glib>=2.46.0 -gnome-backgrounds>=3.18.0 -gnome-bluetooth>=3.18.0 -gnome-calculator>=3.18.0 -gnome-clocks>=3.18.0 -gnome-color-manager>=3.18.0 -gnome-contacts>=3.18.0 -gnome-desktop>=3.18.0 -gnome-dictionary>=3.18.0 -gnome-disk-utility>=3.18.0 -gnome-documents>=3.18.0.1 -gnome-font-viewer>=3.16.2 -gnome-initial-setup>=3.18.0 -gnome-keyring>=3.17.91 -gnome-maps>=3.18.0.1 -gnome-menus>=3.13.3 -gnome-music>=3.18.0 -gnome-online-miners>=3.14.3 -gnome-photos>=3.18.0 -gnome-screenshot>=3.16.2 -gnome-session>=3.18.0 -gnome-settings-daemon>=3.18.0 -gnome-shell>=3.18.0 -gnome-shell-extensions>=3.18.0 -gnome-sound-recorder>=3.16.0 -gnome-system-monitor>=3.18.0.1 -gnome-terminal>=3.18.0 -gnome-themes-standard>=3.16.2 -gnome-user-docs>=3.16.1 -gnome-weather>=3.18.0 -gtk+3>=3.18.0 -gucharmap>=3.18.0 -mousetweaks>=3.12.0 -nautilus>=3.18.0 -nautilus-sendto>=3.8.2 -network-manager-applet>=1.0.4 -rygel>=0.28.0 -seahorse>=3.17.4 -seahorse-nautilus>=3.11.92 -seahorse-sharing>=3.8.0 -sushi>=3.18.0 -totem>=3.18.0 -tracker>=1.6.0 -vinagre>=3.18.0 -vino>=3.16.0 -xdg-user-dirs-gtk>=0.10 -yelp>=3.18.0 \ No newline at end of file From 754c00fc28aba5203e08875129169943faf4bd28 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 9 May 2017 07:22:51 +0200 Subject: [PATCH 0303/1145] libguestfs: update to 1.37.13. --- srcpkgs/libguestfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 86d0ae7c87..e1836d6297 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.37.12 +version=1.37.13 revision=1 _version_short=${version%.*} build_style=gnu-configure @@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/$_version_short-development/$pkgname-$version.tar.gz" -checksum=6e250f537be27dfb35661bebf709b2a81b4f3bde9b4cd207871ae3627ce1eef0 +checksum=92e252683c555ec77acf12d340f4e24878bdd73858e9475419ef6c86446e63a3 conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf From 7827a8d3ec8a13eec513b7b2b74ccfe3c0d8d9c9 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 9 May 2017 07:29:04 +0200 Subject: [PATCH 0304/1145] libvirt-python: update to 3.3.0. --- srcpkgs/libvirt-python/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libvirt-python/template b/srcpkgs/libvirt-python/template index 38108e8204..cfc92182ea 100644 --- a/srcpkgs/libvirt-python/template +++ b/srcpkgs/libvirt-python/template @@ -1,7 +1,7 @@ # Template file for 'libvirt-python' pkgname=libvirt-python -version=3.2.0 -revision=2 +version=3.3.0 +revision=1 build_style=python-module hostmakedepends="pkg-config python-devel python3-devel libvirt-devel" makedepends="libvirt-devel python-devel python3-devel" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="https://pypi.python.org/pypi/libvirt-python" distfiles="${PYPI_SITE}/l/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=ac85dd8dec332f308e5e0e40889be0d2f10b5d6917f00f0c474405ad25dc003d +checksum=e0bb7dcb98bef4933bb9d5e6e944388cdb002515eb9053a42447e89e4642fe57 libvirt-python3_package() { short_desc="${short_desc/Python2/Python3}" From 13445d4409b3f1be435f0663b0bdf8d3471815e8 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 9 May 2017 08:15:26 +0200 Subject: [PATCH 0305/1145] vagrant: update to 1.9.4. --- srcpkgs/vagrant/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index cf73b40bc9..046db9871c 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,6 +1,6 @@ # Template file for 'vagrant' pkgname=vagrant -version=1.9.3 +version=1.9.4 revision=1 hostmakedepends="ruby" makedepends="ruby-devel zlib-devel" @@ -10,12 +10,16 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://www.vagrantup.com/" distfiles="https://github.com/mitchellh/$pkgname/archive/v$version.tar.gz" -checksum=4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 +checksum=23358ad5d1a37d3d856709da55d8696c6eef30fcf88abd27ffe4b8441cfada7f nocross=yes patch_args="-p1" only_for_archs="i686 x86_64" +pre_build() { + sed -i 's|\,\ "<\ 2\.4"||g' $pkgname.gemspec +} + do_build() { gem build $pkgname.gemspec } From 74148b8e0164bb2c38406c4e5623ab2bceae79d5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 May 2017 09:23:39 +0200 Subject: [PATCH 0306/1145] linux4.10: update to 4.10.15. --- srcpkgs/linux4.10/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.10/template b/srcpkgs/linux4.10/template index 3851b6e370..ffcd8a77cd 100644 --- a/srcpkgs/linux4.10/template +++ b/srcpkgs/linux4.10/template @@ -1,6 +1,6 @@ # Template file for 'linux4.10' pkgname=linux4.10 -version=4.10.14 +version=4.10.15 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=d3b3b8c9f25b73f623b55ae9a18bb7b0e6d8b55a4e62d03ec6e0761cd23f33dd +checksum=d8412210f02703366290348f2ab682b7de4723e2a9ae36582cd3a5fb4e1c2445 nodebug=yes # -dbg package is generated below manually nostrip=yes From 5eec342c1b6efbe18af6d8f53808da8b1c2ec5ed Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 May 2017 09:31:32 +0200 Subject: [PATCH 0307/1145] xdg-utils: update to 1.1.2. --- srcpkgs/xdg-utils/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template index 05560cb08b..50abde86ab 100644 --- a/srcpkgs/xdg-utils/template +++ b/srcpkgs/xdg-utils/template @@ -1,6 +1,6 @@ # Template file for 'xdg-utils' pkgname=xdg-utils -version=1.1.1 +version=1.1.2 revision=1 noarch="yes" build_style=gnu-configure @@ -10,9 +10,8 @@ homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/" license="MIT" maintainer="Juan RP " distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz" -checksum=b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125 +checksum=951952e2c6bb21214e0bb54e0dffa057d30f5563300225c24c16fba846258bcc post_install() { - vlicense LICENSE + vlicense LICENSE } - From cc9b34ff307adf562fd8be883429bd314c08af96 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 May 2017 09:37:32 +0200 Subject: [PATCH 0308/1145] sway: update to 0.13.0. --- srcpkgs/sway/patches/musl.patch | 10 ++++++++++ srcpkgs/sway/template | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/sway/patches/musl.patch diff --git a/srcpkgs/sway/patches/musl.patch b/srcpkgs/sway/patches/musl.patch new file mode 100644 index 0000000000..7a0e3aed62 --- /dev/null +++ b/srcpkgs/sway/patches/musl.patch @@ -0,0 +1,10 @@ +--- wayland/pango.c.orig 2017-05-09 09:36:05.383787596 +0200 ++++ wayland/pango.c 2017-05-09 09:36:18.479770962 +0200 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include "log.h" + + PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index b523b98c3c..e617370229 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,6 +1,6 @@ # Template file for 'sway' pkgname=sway -version=0.12.2 +version=0.13.0 revision=1 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="MIT" homepage="http://swaywm.org" distfiles="https://github.com/SirCmpwn/sway/archive/${version}.tar.gz" -checksum=134387d4da1b912f31c0b23f75722d3896cd2560ef5a37775f75e7057cd4a010 +checksum=56a20c9d28d92777bf99381edd09078f72bf39b8ac586242950d514456a77f7d post_install() { vlicense LICENSE From f0c7e837ba7a6d2391d735b3195c1788e03b3a9a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 May 2017 09:46:14 +0200 Subject: [PATCH 0309/1145] glib: update to 2.52.2. --- srcpkgs/glib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index a976791fa2..f2340516c2 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template build file for 'glib' pkgname=glib -version=2.52.1 +version=2.52.2 revision=1 build_style=gnu-configure configure_args="--enable-libelf --disable-fam --with-pcre=system --enable-static" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-$version.tar.xz" -checksum=948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f +checksum=f00e5d9e2a2948b1da25fcba734a6b7a40f556de8bc9f528a53f6569969ac5d0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel" From b2076eb54fd8ad8e59a02f8f36f281cb64512b26 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 May 2017 10:02:47 +0200 Subject: [PATCH 0310/1145] gimp: update to 2.8.22. --- srcpkgs/gimp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index a977f70850..06e41a6a35 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,6 +1,6 @@ # Template build file for 'gimp'. pkgname=gimp -version=2.8.20 +version=2.8.22 revision=1 lib32disabled=yes build_style=gnu-configure @@ -19,7 +19,7 @@ maintainer="Juan RP " homepage="https://www.gimp.org" license="GPL-3" distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2" -checksum=939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805 +checksum=9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/107/steps/shell_3/logs/stdio" libgimp_package() { From 793f6154f2525ea5744f46a7935d31886b8002b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 May 2017 10:29:54 +0200 Subject: [PATCH 0311/1145] smplayer: update to 17.5.0. --- srcpkgs/smplayer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index 44858d3756..a0981a8d73 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -1,6 +1,6 @@ # Template file for 'smplayer' pkgname=smplayer -version=17.4.2 +version=17.5.0 revision=1 build_style=gnu-makefile hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://smplayer.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=05577880df3620ab238a9a28055816c8e97d294ad4b2b39eb7de9be281bc85d1 +checksum=38bc19b2e946f8da35c1902b38a3375683e42a11591c89801885b3f16f8e0288 pre_build() { export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ From 5e7b58ce0a489e3d2e8076e6190b4ca08d935928 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 9 May 2017 10:30:41 +0200 Subject: [PATCH 0312/1145] gdm: remove gnome-session, cyclic dep: gdm -> gnome-session -> gdm --- srcpkgs/gdm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 9ad56b62f6..b5b1e3e08e 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.24.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-schemas-compile --disable-static --with-default-pam-config=arch @@ -26,7 +26,7 @@ conf_files=" system_accounts="gdm" gdm_homedir="/var/lib/gdm" depends="iso-codes xrdb xorg-server xorg-server-xwayland hicolor-icon-theme - dconf>=0.20 gnome-session>=3.22 gnome-settings-daemon>=3.14 gnome-shell>=3.14" + dconf>=0.20 gnome-settings-daemon>=3.14 gnome-shell>=3.14" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" From abd80a7ccf044b7d57326580007d0bc0a87f968e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 9 May 2017 10:32:24 +0200 Subject: [PATCH 0313/1145] gst-plugins-bad1: add gtk+3-devel as makedepends --- srcpkgs/gst-plugins-bad1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 4883382441..1eff869b73 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1'. pkgname=gst-plugins-bad1 version=1.12.0 -revision=1 +revision=2 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -14,7 +14,7 @@ makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel libvdpau-devel libgsm-devel librtmp-devel libass-devel mpg123-devel soundtouch-devel opus-devel libwebp-devel wayland-devel libwayland-egl - libsrtp-devel libopenal-devel" + libsrtp-devel libopenal-devel gtk+3-devel" depends="gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the bad set (v1.x)" maintainer="Juan RP " From 048d74c46cede82b0dd756e071f0d5d9cf7d4561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 9 May 2017 11:19:34 +0200 Subject: [PATCH 0314/1145] llvm: fix build with gcc-7.1.0 --- srcpkgs/llvm/patches/gcc7-functional.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 srcpkgs/llvm/patches/gcc7-functional.patch diff --git a/srcpkgs/llvm/patches/gcc7-functional.patch b/srcpkgs/llvm/patches/gcc7-functional.patch new file mode 100644 index 0000000000..23b1525918 --- /dev/null +++ b/srcpkgs/llvm/patches/gcc7-functional.patch @@ -0,0 +1,10 @@ +--- tools/lldb/include/lldb/Utility/TaskPool.h 2016-09-06 22:57:50.000000000 +0200 ++++ tools/lldb/include/lldb/Utility/TaskPool.h 2017-05-09 10:11:17.802838086 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + // Global TaskPool class for running tasks in parallel on a set of worker thread + // created the first From 5000e2de32031c4b0a8f608367e22c6261ea41fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 9 May 2017 12:35:27 +0200 Subject: [PATCH 0315/1145] efibootmgr: fix gcc-7.1.0 build (duplicate const) --- .../patches/gcc7-duplicate-const.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch diff --git a/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch b/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch new file mode 100644 index 0000000000..cb222a2cec --- /dev/null +++ b/srcpkgs/efibootmgr/patches/gcc7-duplicate-const.patch @@ -0,0 +1,31 @@ +--- src/efibootdump.c 2016-09-27 23:00:36.000000000 +0200 ++++ src/efibootdump.c 2017-05-09 12:33:41.756321719 +0200 +@@ -39,7 +39,7 @@ + uint8_t *optional_data = NULL; + size_t optional_data_len = 0; + uint16_t pathlen; +- const unsigned char const *desc; ++ const unsigned char *desc; + char *raw; + size_t raw_len; + +--- src/efibootmgr.c 2017-05-09 12:32:45.939316598 +0200 ++++ src/efibootmgr.c 2017-05-09 12:34:02.281323682 +0200 +@@ -221,7 +221,7 @@ + list_t *pos; + var_entry_t *entry; + efi_load_option *load_option; +- const unsigned char const *desc; ++ const unsigned char *desc; + + list_for_each(pos, var_list) { + entry = list_entry(pos, var_entry_t, list); +@@ -873,7 +873,7 @@ + { + list_t *pos; + var_entry_t *boot; +- const unsigned char const *description; ++ const unsigned char *description; + efi_load_option *load_option; + efidp dp = NULL; + unsigned char *optional_data = NULL; From 83eed7a384d7a9332a34effd19fe0831b3bc988c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 9 May 2017 12:38:45 +0200 Subject: [PATCH 0316/1145] mysql: fix gcc-7.1.0 build --- srcpkgs/mysql/patches/gcc7-compare-string.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/mysql/patches/gcc7-compare-string.patch diff --git a/srcpkgs/mysql/patches/gcc7-compare-string.patch b/srcpkgs/mysql/patches/gcc7-compare-string.patch new file mode 100644 index 0000000000..ac2687f94b --- /dev/null +++ b/srcpkgs/mysql/patches/gcc7-compare-string.patch @@ -0,0 +1,11 @@ +--- sql/sql_acl.cc 2016-03-03 16:35:33.000000000 +0100 ++++ sql/sql_acl.cc 2017-05-09 11:28:16.879062433 +0200 +@@ -3029,7 +3029,7 @@ + * An empty password is considered to be of mysql_native type. + */ + +- if (combo->plugin.str == NULL || combo->plugin.str == '\0') ++ if (combo->plugin.str == NULL) + { + if (combo->uses_identified_by_password_clause) + { From 194be00f53e11ec3dabbe0a5cecec675a6cb791e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 10:31:29 +0000 Subject: [PATCH 0317/1145] bmake: update to 20170501. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index fed8ccf362..7ac5e30f59 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20170421 +version=20170501 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="BSD" homepage="http://www.crufty.net/help/sjg/bmake.html" distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=763104954b566ae9f575ea682dc38ed5c73057336f5f6090fb7489a5399511c5 +checksum=63006429605e52c8a15a079a6c969675472ab25fe935955d5501265baeeb7297 do_configure() { cd bmake From 50aa43802e0d2dc0f73b1f39987a18db5e21789d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 10:31:32 +0000 Subject: [PATCH 0318/1145] iso-codes: update to 3.75. --- srcpkgs/iso-codes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template index 229485e1ee..6b7813ead1 100644 --- a/srcpkgs/iso-codes/template +++ b/srcpkgs/iso-codes/template @@ -1,6 +1,6 @@ # Template file for 'iso-codes' pkgname=iso-codes -version=3.74 +version=3.75 revision=1 noarch=yes build_style=gnu-configure @@ -10,4 +10,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://pkg-isocodes.alioth.debian.org/" distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.xz" -checksum=21f4f3cea8fe09f5b53784522303a0e1e7d083964ecaf1c75b1441d4d9ec6aee +checksum=7335e0301cd77cd4ee019bf5d3709aa79309d49dd66e85ba350caf67e00b00cd From bee0b10c793e7f2a04b88dbdcca19443b873062a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 10:31:34 +0000 Subject: [PATCH 0319/1145] qtox: update to 1.10.0. --- srcpkgs/qtox/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index 28d200e7a7..277413e6f2 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,6 +1,6 @@ # Template file for 'qtox' pkgname=qtox -version=1.9.0 +version=1.10.0 revision=1 build_style=qmake short_desc="QT-based TOX instant messenger client" @@ -14,7 +14,7 @@ makedepends="toxcore-devel filteraudio-devel-git ffmpeg-devel qt5-svg-devel sqlcipher-devel" depends="qt5-plugin-sqlite" distfiles="https://github.com/tux3/qTox/archive/v${version}.tar.gz" -checksum=aceaac0c9cf8c9c98e364c8380f992547f369db6f0ac62505531c0474c7e04d6 +checksum=a2873c475f56efae268903fd268006cea0771445d572b658ef2fb9e65c121a5d wrksrc="qTox-${version}" pre_configure() { @@ -27,7 +27,7 @@ pre_configure() { do_install() { vbin qtox - vinstall qTox.desktop 644 usr/share/applications + vinstall qtox.desktop 644 usr/share/applications vinstall img/icons/qtox.svg 644 usr/share/icons/hicolor/scalable/apps for _s in 14 16 22 24 32 36 48 64 72 96 128 192 256 512; do vinstall "img/icons/${_s}x${_s}/qtox.png" 644 "/usr/share/icons/hicolor/${_s}x${_s}/apps" From 77c75df2083c7d3617c84e251764ef8daed19ca3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 10:32:14 +0000 Subject: [PATCH 0320/1145] slit: update to 1.1.4. --- srcpkgs/slit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template index 0938f33d6c..95908bdb53 100644 --- a/srcpkgs/slit/template +++ b/srcpkgs/slit/template @@ -1,6 +1,6 @@ # Template file for 'slit' pkgname=slit -version=1.1.3 +version=1.1.4 revision=1 build_style=go go_import_path="github.com/tigrawap/slit" @@ -10,7 +10,7 @@ license="MIT" hostmakedepends="git" homepage="https://github.com/tigrawap/slit" distfiles="https://github.com/tigrawap/slit/archive/${version}.tar.gz" -checksum=771a1d0858cb75dd62e47eba64b8b82a3a58996416098356b3f8470d9d2afe23 +checksum=59f01c25b21ffc1659e9ce8008e6dbe1e4a9a605d1ab2f5cacd1395a13624abb post_install() { vlicense LICENSE From 7dd60ee152599fb5181b4241f7cb1e3ca30e6c68 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 9 May 2017 14:50:24 +0200 Subject: [PATCH 0321/1145] sysdig: update to 0.16.0. --- srcpkgs/sysdig/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 0a6373b172..3d0996238c 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig -version=0.15.1 -revision=2 +version=0.16.0 +revision=1 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF" @@ -17,7 +17,7 @@ license="GPL-2" homepage="http://www.sysdig.org/" _changelog="https://github.com/draios/sysdig/releases" distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz" -checksum=4b404e15da9050742e62f3d65e0013fb497f84132ead4da61ba658c4f3d33a74 +checksum=73a0190c973e4a591013d0c73ff2ea9f623ab50b78ff78f7a33fe31460ba24a1 nocross=yes disable_parallel_build=yes only_for_archs="i686 x86_64" From 761d9bcb2827e22e79c54fb947cfe626b39175dc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 9 May 2017 15:00:20 +0200 Subject: [PATCH 0322/1145] New package: python-bleach-2.0.0 --- srcpkgs/python-bleach/template | 26 ++++++++++++++++++++++++++ srcpkgs/python3-bleach | 1 + 2 files changed, 27 insertions(+) create mode 100644 srcpkgs/python-bleach/template create mode 120000 srcpkgs/python3-bleach diff --git a/srcpkgs/python-bleach/template b/srcpkgs/python-bleach/template new file mode 100644 index 0000000000..09db5a04e4 --- /dev/null +++ b/srcpkgs/python-bleach/template @@ -0,0 +1,26 @@ +# Template file for 'python-bleach' +pkgname=python-bleach +version=2.0.0 +revision=1 +noarch=yes +wrksrc="bleach-${version}" +build_style=python-module +pycompile_module="bleach" +hostmakedepends="python-setuptools python3-setuptools" +depends="python-six python-html5lib" +short_desc="Easy safelist-based HTML-sanitizing tool (Python2)" +maintainer="Alessio Sergi " +homepage="https://github.com/mozilla/bleach" +license="Apache-2.0" +distfiles="${PYPI_SITE}/b/bleach/bleach-${version}.tar.gz" +checksum=b9522130003e4caedf4f00a39c120a906dcd4242329c1c8f621f5370203cbc30 + +python3-bleach_package() { + noarch=yes + pycompile_module="bleach" + depends="python3-six python3-html5lib" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python3-bleach b/srcpkgs/python3-bleach new file mode 120000 index 0000000000..add2e98533 --- /dev/null +++ b/srcpkgs/python3-bleach @@ -0,0 +1 @@ +python-bleach \ No newline at end of file From c43b50437762ade8a7b2357a7a4caceee4bc0449 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 9 May 2017 15:02:50 +0200 Subject: [PATCH 0323/1145] New package: python-pandocfilters-1.4.1 --- srcpkgs/python-pandocfilters/template | 31 +++++++++++++++++++++++++++ srcpkgs/python3-pandocfilters | 1 + 2 files changed, 32 insertions(+) create mode 100644 srcpkgs/python-pandocfilters/template create mode 120000 srcpkgs/python3-pandocfilters diff --git a/srcpkgs/python-pandocfilters/template b/srcpkgs/python-pandocfilters/template new file mode 100644 index 0000000000..1c9a91218d --- /dev/null +++ b/srcpkgs/python-pandocfilters/template @@ -0,0 +1,31 @@ +# Template file for 'python-pandocfilters' +pkgname=python-pandocfilters +version=1.4.1 +revision=1 +noarch=yes +wrksrc="pandocfilters-${version}" +build_style=python-module +pycompile_module="pandocfilters.py" +hostmakedepends="python-setuptools python3-setuptools" +depends="python" +short_desc="Python2 module for writing pandoc filters" +maintainer="Alessio Sergi " +homepage="http://github.com/jgm/pandocfilters" +license="3-clause-BSD" +distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz" +checksum=ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd + +post_install() { + vlicense LICENSE +} + +python3-pandocfilters_package() { + noarch=yes + depends="python3" + pycompile_module="pandocfilters.py" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE + } +} diff --git a/srcpkgs/python3-pandocfilters b/srcpkgs/python3-pandocfilters new file mode 120000 index 0000000000..cf3038c5c9 --- /dev/null +++ b/srcpkgs/python3-pandocfilters @@ -0,0 +1 @@ +python-pandocfilters \ No newline at end of file From aad42409d17a2ec729f15e131e8a34fd14df5b52 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 9 May 2017 15:45:45 +0200 Subject: [PATCH 0324/1145] New package: python-testpath-0.3 --- .../patches/testpath-setup.py.patch | 34 +++++++++++++++++++ srcpkgs/python-testpath/template | 34 +++++++++++++++++++ srcpkgs/python3-testpath | 1 + 3 files changed, 69 insertions(+) create mode 100644 srcpkgs/python-testpath/patches/testpath-setup.py.patch create mode 100644 srcpkgs/python-testpath/template create mode 120000 srcpkgs/python3-testpath diff --git a/srcpkgs/python-testpath/patches/testpath-setup.py.patch b/srcpkgs/python-testpath/patches/testpath-setup.py.patch new file mode 100644 index 0000000000..6379243cf8 --- /dev/null +++ b/srcpkgs/python-testpath/patches/testpath-setup.py.patch @@ -0,0 +1,34 @@ +--- /dev/null ++++ setup.py +@@ -0,0 +1,31 @@ ++import os ++import re ++from io import open ++ ++from setuptools import setup ++ ++with open(os.path.join('testpath', '__init__.py'), encoding='utf-8') as f: ++ version = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", f.read(), re.M).group(1) ++ ++with open('README.rst', encoding='utf-8') as f: ++ long_description = f.read() ++ ++setup( ++ name='testpath', ++ version=version, ++ description='Test utilities for code working with files and commands', ++ long_description=long_description, ++ author='Jupyter Development Team', ++ author_email='jupyter@googlegroups.com', ++ url='https://github.com/jupyter/testpath', ++ license='MIT', ++ packages=['testpath'], ++ classifiers=[ ++ 'Intended Audience :: Developers', ++ 'License :: OSI Approved :: MIT License', ++ 'Programming Language :: Python', ++ 'Programming Language :: Python :: 2', ++ 'Programming Language :: Python :: 3', ++ 'Topic :: Software Development :: Testing', ++ ] ++) diff --git a/srcpkgs/python-testpath/template b/srcpkgs/python-testpath/template new file mode 100644 index 0000000000..b772c6a602 --- /dev/null +++ b/srcpkgs/python-testpath/template @@ -0,0 +1,34 @@ +# Template file for 'python-testpath' +pkgname=python-testpath +version=0.3 +revision=1 +noarch=yes +wrksrc="testpath-${version}" +build_style=python-module +pycompile_module="testpath" +hostmakedepends="python-setuptools python3-setuptools" +depends="python" +short_desc="Test utilities for code working with files and commands (Python2)" +maintainer="Alessio Sergi " +homepage="https://github.com/jupyter/testpath" +license="MIT" +distfiles="https://github.com/jupyter/testpath/archive/${version}.tar.gz" +checksum=01cc3cd59a59d42b238252774b9ebfc9d2af1d0d9bac81d7801409f570b1cda5 + +pre_build() { + rm -f testpath/cli-*.exe +} +post_install() { + vlicense LICENSE +} + +python3-testpath_package() { + noarch=yes + depends="python3" + pycompile_module="testpath" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vlicense LICENSE + } +} diff --git a/srcpkgs/python3-testpath b/srcpkgs/python3-testpath new file mode 120000 index 0000000000..51899d175b --- /dev/null +++ b/srcpkgs/python3-testpath @@ -0,0 +1 @@ +python-testpath \ No newline at end of file From b340c9325372cbc3c52a4e2db76a5bbac8c06b71 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 9 May 2017 15:51:51 +0200 Subject: [PATCH 0325/1145] python-jupyter_nbconvert: update to 5.1.1 --- srcpkgs/python-jupyter_nbconvert/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python-jupyter_nbconvert/template b/srcpkgs/python-jupyter_nbconvert/template index f854ac4aa1..ab26043d07 100644 --- a/srcpkgs/python-jupyter_nbconvert/template +++ b/srcpkgs/python-jupyter_nbconvert/template @@ -1,20 +1,21 @@ # Template file for 'python-jupyter_nbconvert' pkgname=python-jupyter_nbconvert -version=4.3.0 +version=5.1.1 revision=1 noarch=yes wrksrc="nbconvert-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" depends="python-mistune python-Jinja2 python-Pygments python-traitlets - python-jupyter_core python-jupyter_nbformat python-entrypoints" + python-jupyter_core python-jupyter_nbformat python-entrypoints + python-testpath python-bleach python-pandocfilters" pycompile_module="nbconvert" short_desc="Converting Jupyter notebooks (Python2)" maintainer="Alessio Sergi " homepage="https://github.com/jupyter/nbconvert" license="3-clause-BSD" distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz" -checksum=d967ec588ffd1ad7336163f1ac8957a348b5c4bce4465632db4cf684ffe4b718 +checksum=847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert2" post_install() { @@ -24,7 +25,8 @@ post_install() { python3-jupyter_nbconvert_package() { noarch=yes depends="python3-mistune python3-Jinja2 python3-Pygments python3-traitlets - python3-jupyter_core python3-jupyter_nbformat python3-entrypoints" + python3-jupyter_core python3-jupyter_nbformat python3-entrypoints + python3-testpath python3-bleach python3-pandocfilters" pycompile_module="nbconvert" replaces="python3.4-jupyter_nbconvert>=0" short_desc="${short_desc/Python2/Python3}" From a0ba65cf26e9ca8191492ae092be7095b42d87bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 9 May 2017 16:09:15 +0200 Subject: [PATCH 0326/1145] mozjs17: fix gcc7 build --- .../patches/gcc7-empty_string_comparison.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/mozjs17/patches/gcc7-empty_string_comparison.patch diff --git a/srcpkgs/mozjs17/patches/gcc7-empty_string_comparison.patch b/srcpkgs/mozjs17/patches/gcc7-empty_string_comparison.patch new file mode 100644 index 0000000000..9a5c9690c6 --- /dev/null +++ b/srcpkgs/mozjs17/patches/gcc7-empty_string_comparison.patch @@ -0,0 +1,11 @@ +--- js/src/shell/jsoptparse.cpp 2013-02-11 23:33:23.000000000 +0100 ++++ js/src/shell/jsoptparse.cpp 2017-05-09 16:05:19.657666914 +0200 +@@ -243,7 +243,7 @@ + char *eq = strchr(argv[*i], '='); + if (eq) { + *value = eq + 1; +- if (value[0] == '\0') ++ if (*value[0] == '\0') + return error("A value is required for option %.*s", eq - argv[*i], argv[*i]); + return Okay; + } From 3a2991068b2d37e870d004228b4bac7fa871f074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 9 May 2017 16:15:10 +0200 Subject: [PATCH 0327/1145] mysql: yet another fix for gcc7 --- srcpkgs/mysql/patches/gcc7-compare-pointer.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 srcpkgs/mysql/patches/gcc7-compare-pointer.patch diff --git a/srcpkgs/mysql/patches/gcc7-compare-pointer.patch b/srcpkgs/mysql/patches/gcc7-compare-pointer.patch new file mode 100644 index 0000000000..0b01a6ea71 --- /dev/null +++ b/srcpkgs/mysql/patches/gcc7-compare-pointer.patch @@ -0,0 +1,12 @@ +--- sql-common/client_authentication.cc 2016-03-03 16:35:33.000000000 +0100 ++++ sql-common/client_authentication.cc 2017-05-09 16:14:10.298254686 +0200 +@@ -83,8 +83,7 @@ + FILE *pub_key_file= NULL; + + if (mysql->options.extension != NULL && +- mysql->options.extension->server_public_key_path != NULL && +- mysql->options.extension->server_public_key_path != '\0') ++ mysql->options.extension->server_public_key_path != NULL) + { + pub_key_file= fopen(mysql->options.extension->server_public_key_path, + "r"); From e30e644df070a7159ea1297fe5f876b9a116f745 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:23:40 +0000 Subject: [PATCH 0328/1145] bmake: update to 20170505. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index 7ac5e30f59..c978ed3642 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20170501 +version=20170505 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="BSD" homepage="http://www.crufty.net/help/sjg/bmake.html" distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=63006429605e52c8a15a079a6c969675472ab25fe935955d5501265baeeb7297 +checksum=f903a449c1227092c3b943418a29589105db9a16f54696afacc3fde691de35fd do_configure() { cd bmake From a941b9ccbb2090ceda0842f0909ac78b226578b6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:29:04 +0000 Subject: [PATCH 0329/1145] vc: update to 1.3.2. --- srcpkgs/vc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vc/template b/srcpkgs/vc/template index ec55aec448..035ddfc2de 100644 --- a/srcpkgs/vc/template +++ b/srcpkgs/vc/template @@ -1,7 +1,7 @@ # Template file for 'vc' pkgname=vc -version=1.3.1 -revision=2 +version=1.3.2 +revision=1 wrksrc="Vc-${version}" build_style=cmake configure_args="-DTARGET_ARCHITECTURE=generic" @@ -10,5 +10,5 @@ maintainer="Juan RP " license="3-clause-BSD" homepage="https://github.com/VcDevel/Vc" distfiles="${homepage}/releases/download/${version}/Vc-${version}.tar.gz" -checksum=5acc9dcc0e857edad1df0bc3ef0f23712a86bd4f7c45bc9882ec07e57840024b +checksum=3eae2b05836a1a57545e624b38345ad33cfde23d527e12575edde784c4c330ee only_for_archs="i686 i686-musl x86_64 x86_64-musl" From 8267fb3152cf92d5008c5e1040f8757c91b8a8c7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:29:07 +0000 Subject: [PATCH 0330/1145] picard: update to 1.4.2. --- srcpkgs/picard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template index 4b89514bd6..2fb55e12e8 100644 --- a/srcpkgs/picard/template +++ b/srcpkgs/picard/template @@ -1,6 +1,6 @@ # Template file for 'picard' pkgname=picard -version=1.4.1 +version=1.4.2 revision=1 wrksrc="${pkgname}-release-${version}" build_style=python2-module @@ -13,4 +13,4 @@ license="GPL-2" homepage="http://picard.musicbrainz.org/" short_desc="MusicBrainz's audio tagger" distfiles="http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=994c7f835e1adbd7905e88af841ee6e7c249dc75b8be9963b1b3dc6cb8de6a4a +checksum=f0adee3877bbd66c827a43b57dd2233037b99f6ebfdc1700b26cb9d400992234 From 30961141ad4d38d018bdce6a7e285ffcc4c62870 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:37:38 +0000 Subject: [PATCH 0331/1145] perl-Clone: update to 0.39. --- srcpkgs/perl-Clone/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Clone/template b/srcpkgs/perl-Clone/template index e2f826bc9e..d3a188fbd1 100644 --- a/srcpkgs/perl-Clone/template +++ b/srcpkgs/perl-Clone/template @@ -1,7 +1,7 @@ # Template file for 'perl-Clone' pkgname=perl-Clone -version=0.38 -revision=3 +version=0.39 +revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -12,4 +12,4 @@ maintainer="Kevin Berry " homepage="http://search.cpan.org/dist/Clone" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Clone/Clone-${version}.tar.gz" -checksum=9fb0534bb7ef6ca1f6cc1dc3f29750d6d424394d14c40efdc77832fad3cebde8 +checksum=acb046683e49d650b113634ecf57df000816a49e611b0fff70bf3f93568bfa2d From 7d0733793cea23272a2bb03782bb05e27033d7ab Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:37:44 +0000 Subject: [PATCH 0332/1145] perl-Devel-Symdump: update to 2.18. --- srcpkgs/perl-Devel-Symdump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Devel-Symdump/template b/srcpkgs/perl-Devel-Symdump/template index 5039043dc5..e88d702a0b 100644 --- a/srcpkgs/perl-Devel-Symdump/template +++ b/srcpkgs/perl-Devel-Symdump/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Devel-Symdump'. pkgname=perl-Devel-Symdump -version=2.17 +version=2.18 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=perl-module @@ -11,5 +11,5 @@ maintainer="Enguerrand de Rochefort " homepage="https://metacpan.org/pod/Devel::Symdump" license="GPL-1, Artistic" distfiles="$CPAN_SITE/Devel/Devel-Symdump-${version}.tar.gz" -checksum=2c50fc7935e6e6200b74fbb9149c8078ee8f92788d2a9c5ab25c9ebace946e62 +checksum=826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0 noarch=yes From 24f45b9fc2cfca5e158d95ea59a1fb2772f736a7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:37:51 +0000 Subject: [PATCH 0333/1145] perl-ExtUtils-PkgConfig: update to 1.16. --- srcpkgs/perl-ExtUtils-PkgConfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-ExtUtils-PkgConfig/template b/srcpkgs/perl-ExtUtils-PkgConfig/template index ca0a84133f..6e21af276a 100644 --- a/srcpkgs/perl-ExtUtils-PkgConfig/template +++ b/srcpkgs/perl-ExtUtils-PkgConfig/template @@ -1,6 +1,6 @@ # Template file for 'perl-ExtUtils-PkgConfig' pkgname=perl-ExtUtils-PkgConfig -version=1.15 +version=1.16 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ homepage="http://search.cpan.org/~xaoc/" license="LGPL-2.1" maintainer="Juan RP " distfiles="${SOURCEFORGE_SITE}/gtk2-perl/ExtUtils-PkgConfig-$version.tar.gz" -checksum=69b3192e22b37e930238f332b5bfa9e14e69bec1427ba70c8515fbba1137b0b3 +checksum=bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e From 768263cab555c7f1a48191174f9e72eecf24826b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:37:54 +0000 Subject: [PATCH 0334/1145] perl-LWP: update to 6.26. --- srcpkgs/perl-LWP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template index 7165b08f6e..a47993d09f 100644 --- a/srcpkgs/perl-LWP/template +++ b/srcpkgs/perl-LWP/template @@ -1,6 +1,6 @@ # Template file for 'perl-LWP' pkgname=perl-LWP -version=6.25 +version=6.26 revision=1 wrksrc="libwww-perl-$version" build_style=perl-module @@ -16,4 +16,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/libwww-perl/lib/LWP.pm" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz" -checksum=49c0110ef38d27a8963a082cf61ce245447871676b85ec9f2b9b41d6c2f37f33 +checksum=d0c5435275f8638ff36fff8f655ad2ccad1156e66cc47bfacfb9e44fc585b24f From dae116b0724ceeadc9e6ecb37dd311bc125b587f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:37:58 +0000 Subject: [PATCH 0335/1145] perl-Net-DNS: update to 1.10. --- srcpkgs/perl-Net-DNS/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Net-DNS/template b/srcpkgs/perl-Net-DNS/template index 951032eb23..e511b88bf5 100644 --- a/srcpkgs/perl-Net-DNS/template +++ b/srcpkgs/perl-Net-DNS/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Net-DNS'. pkgname=perl-Net-DNS -version=1.09 +version=1.10 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -12,4 +12,4 @@ homepage="https://metacpan.org/pod/Net::DNS" license="Artistic, GPL-1" maintainer="Enno Boland " distfiles="${CPAN_SITE}/Net/Net-DNS-${version}.tar.gz" -checksum=fec9b0c74b8fea5e41914339281ffd773ddd0ae3b5cfd532d2ac0c09618b7c0a +checksum=ebe53e7f433138fb9a7845b4edae6b8f4dc227da97eaf6b347584816ec63a525 From 07a8bbabe8f179c1dd326ccd3e105bffd69b2e76 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:38:01 +0000 Subject: [PATCH 0336/1145] perl-Net-HTTP: update to 6.14. --- srcpkgs/perl-Net-HTTP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template index fc9d2798ef..cf4bd0b509 100644 --- a/srcpkgs/perl-Net-HTTP/template +++ b/srcpkgs/perl-Net-HTTP/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Net-HTTP'. pkgname=perl-Net-HTTP -version=6.13 +version=6.14 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/Net-HTTP" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Net/Net-HTTP-${version}.tar.gz" -checksum=2d25e696c5239c8a4aa5a97f07ecaa77cf908cc72bbeef7fa6573570af31ce87 +checksum=df0e71d3ec3a8351204619b32ee4a4a39368a419bcfe9324fcd6655bb11a433e From 0a7dac0ad1858bd4146e4d98d51116b9264dac6f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:38:06 +0000 Subject: [PATCH 0337/1145] perl-Test-Script: update to 1.18. --- srcpkgs/perl-Test-Script/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/perl-Test-Script/template b/srcpkgs/perl-Test-Script/template index 1cc775bd8a..9edf017b01 100644 --- a/srcpkgs/perl-Test-Script/template +++ b/srcpkgs/perl-Test-Script/template @@ -1,7 +1,7 @@ # Template build file for 'perl-Test-Script'. pkgname=perl-Test-Script -version=1.16 -revision=2 +version=1.18 +revision=1 wrksrc="${pkgname#*-}-${version}" build_style=perl-module hostmakedepends="perl perl-Probe-Perl perl-IPC-Run3" @@ -12,5 +12,5 @@ maintainer="Enguerrand de Rochefort " homepage="https://metacpan.org/pod/Test::Script" license="GPL-1, Artistic" distfiles="$CPAN_SITE/Test/Test-Script-${version}.tar.gz" -checksum=9a38d46d8c19d92330d5a6be2547ed709ba6f2fc2758556d9e191754f264df06 +checksum=ffef55b5dd8c8c0b09b6ff650e7a7fb20effcf603701523e93b375a771b15efc nocross="https://api.travis-ci.org/jobs/209362491/log.txt" From 43a5192af572e559d059726b7c2d49aaa0920c11 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 18:38:11 +0000 Subject: [PATCH 0338/1145] perl-XML-Simple: update to 2.24. --- srcpkgs/perl-XML-Simple/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-XML-Simple/template b/srcpkgs/perl-XML-Simple/template index ebf29bd663..4762405434 100644 --- a/srcpkgs/perl-XML-Simple/template +++ b/srcpkgs/perl-XML-Simple/template @@ -1,6 +1,6 @@ # Template build file for 'perl-XML-Simple'. pkgname=perl-XML-Simple -version=2.22 +version=2.24 revision=1 wrksrc="XML-Simple-$version" build_style=perl-module @@ -13,4 +13,4 @@ homepage="http://search.cpan.org/dist/XML-Simple/" license="Artistic, GPL-1" maintainer="Juan RP " distfiles="${CPAN_SITE}/XML/XML-Simple-$version.tar.gz" -checksum=b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49 +checksum=9a14819fd17c75fbb90adcec0446ceab356cab0ccaff870f2e1659205dc2424f From 023820522290a891dfcae4e3e155c02969974f81 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 9 May 2017 20:42:07 +0200 Subject: [PATCH 0339/1145] adobe-flash-plugin: update to 25.0.0.171 --- srcpkgs/adobe-flash-plugin/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 6b152a1cee..67cb150d69 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,6 +1,6 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=25.0.0.148 +version=25.0.0.171 revision=1 # The EULA file _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf" @@ -8,10 +8,10 @@ _eulacksum=91e504a9e99ebd988ffa95ce0d5feaf340410c03709348297301a22dc11df1a8 _url=http://fpdownload.adobe.com/get/flashplayer/pdc/${version} if [ "$XBPS_MACHINE" = "x86_64" ]; then _disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz" - _distcksum=72f93bf2d2f6b6e7ed34321de8324f14d9ddff8bc9f42717691b8904be50e758 + _distcksum=60fe4a22278dda4e778f69bd063833fcce778cf21c88ebe4932095ae00c8cce4 else _disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz" - _distcksum=7d9ffcdca435429d8578adf348ff6e2c336787d2cfca4d28742c92adce8061b1 + _distcksum=83395b43da1689104e569006c2a75d159d6b12f4c07d0d8e4e05e70b233662f4 fi distfiles="${_eula} ${_disttarball}" checksum="${_eulacksum} ${_distcksum}" From a20ef4f96e9b25fb8630e2bce3f6b47659d694ff Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 9 May 2017 19:10:35 +0000 Subject: [PATCH 0340/1145] perl-Devel-Symdump: fix cross --- srcpkgs/perl-Devel-Symdump/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/perl-Devel-Symdump/template b/srcpkgs/perl-Devel-Symdump/template index e88d702a0b..62ec6c355c 100644 --- a/srcpkgs/perl-Devel-Symdump/template +++ b/srcpkgs/perl-Devel-Symdump/template @@ -5,6 +5,7 @@ revision=1 wrksrc="${pkgname#*-}-${version}" build_style=perl-module hostmakedepends="perl" +makedepends="perl" depends="perl" short_desc='Devel::Symdump - Dump symbol names or the symbol table' maintainer="Enguerrand de Rochefort " From 860cbf75b1e6f934bf768065fc3fda86845d67de Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Tue, 9 May 2017 14:06:40 -0600 Subject: [PATCH 0341/1145] google-chrome: update to 58.0.3029.110 --- srcpkgs/google-chrome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index f4fa9ed2b3..3135ebbe62 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,5 +1,5 @@ # Template file for 'google-chrome' -_chromeVersion=58.0.3029.96 +_chromeVersion=58.0.3029.110 _chromeRevision=1 _channel=stable @@ -20,7 +20,7 @@ _filename="google-chrome-${_channel}_${_chromeVersion}-${_chromeRevision}_amd64. _chromeUrl="${_baseUrl}/${_filename}" distfiles="${_chromeUrl}" -checksum=15b943941c827ef1a4fa19cb5346b8ad4f3d07a66b0d0a6ba63a39274782661a +checksum=2d1eed9be2687c0b393699381d1a93bf8913a50eaf8df6b4596e3bfc4b15dd6d do_extract() { mkdir -p ${DESTDIR} From f33fcfc066a171f4ff2d6303fc0366e36fa217f4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 06:51:32 +0000 Subject: [PATCH 0342/1145] git: update to 2.13.0. --- srcpkgs/git/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 0bd6ad178c..7177a09dc3 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for "git" pkgname=git -version=2.12.2 -revision=2 +version=2.13.0 +revision=1 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://git-scm.com/" license="GPL-2" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a +checksum=4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 subpackages="git-cvs git-svn git-perl gitk git-gui git-all" From 1f57edf909dbc07ffb912ccb10f100b347912d56 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 08:21:36 +0000 Subject: [PATCH 0343/1145] youtube-dl: update to 2017.05.09. --- 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 8effd0642e..cb5ea7db80 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.05.07 +version=2017.05.09 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=45308c76b5e49b657ec7fa23b6b09e4d832355b54c86da79f09586b9664f6be0 +checksum=b9af1b8f5b8b245fe46348e7743cf01d323f927e32bd7a98dfdfc83b2866df15 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From 9d36af61ae3cc8abee346b4e453d56eb09eab40d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 08:24:24 +0000 Subject: [PATCH 0344/1145] gucharmap: update to 9.0.4. --- srcpkgs/gucharmap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template index 1b3cc3c35f..47a4765ceb 100644 --- a/srcpkgs/gucharmap/template +++ b/srcpkgs/gucharmap/template @@ -1,6 +1,6 @@ # Template file for 'gucharmap' pkgname=gucharmap -version=9.0.3 +version=9.0.4 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile $(vopt_enable gir introspection) @@ -21,7 +21,7 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt http://www.unicode.org/Public/9.0.0/ucd/Unihan.zip" skip_extraction="Blocks.txt DerivedAge.txt NamesList.txt Scripts.txt UnicodeData.txt Unihan.zip" -checksum="badb002c4d15dca7f3e42b9995ac41dba51490a28709bfefb5a8523fd948f918 +checksum="1588b2b183b843b24eb074fd0661bddb54f18876870ba475d65f35b7a9c677a0 612127d4889032e55d82522e4a0c19793bda8aa8da14ecb3c696d17c83e6be13 5cb15b04693c43df16e0d304deca049e93b001445d163184e0ff1b7c8c852146 eb15aa335aad1c65b9435a8bbbae28461ab641a2243bc41706da5f866e633e46 From f5883d9bbb4d44a74185127d19e7c3da95840017 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 08:25:00 +0000 Subject: [PATCH 0345/1145] libfastjson: update to 0.99.5. --- srcpkgs/libfastjson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfastjson/template b/srcpkgs/libfastjson/template index b9d48b1e29..4c1f136816 100644 --- a/srcpkgs/libfastjson/template +++ b/srcpkgs/libfastjson/template @@ -1,6 +1,6 @@ # Template file for 'libfastjson' pkgname=libfastjson -version=0.99.4 +version=0.99.5 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/rsyslog/libfastjson" distfiles="https://github.com/rsyslog/libfastjson/archive/v${version}.tar.gz" -checksum=03ef63dcc88417e71c19ce4436804159e3397e3a20d3529efef6a43c3bef5c8d +checksum=74401bc45a40a03f1bc6064513503f47dbe3db4fc735627ce122e512be9760f0 pre_configure() { autoreconf -fi From 5b4be5142a641ed38208a51d2f36d7c1e9d6b672 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 09:30:16 +0200 Subject: [PATCH 0346/1145] gnome-builder: update to 3.24.2. --- srcpkgs/gnome-builder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 2b1b0b1a78..0c8d75f7e0 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.24.1 -revision=2 +version=3.24.2 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils appdata-tools @@ -15,4 +15,4 @@ maintainer="Enno Boland " homepage="https://wiki.gnome.org/Apps/Builder" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=d0630dceeaf09285640ecec79545baf811321636a441824a9243e7f3a4467583 +checksum=84843a9f4af2e1ee1ebfac44441a2affa2d409df9066e7d11bf1d232ae0c535a From 7791fe6096e50e35e77812d100adcf1e736cdd80 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 09:31:44 +0200 Subject: [PATCH 0347/1145] gnome-calendar: update to 3.24.2. --- srcpkgs/gnome-calendar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 2d7a1a5e04..53000a0361 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Calendar" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=139d00fa0fa13a4fea4263527a22e5ccebd79b08d1f8d56fe01fc0f6059b0f67 +checksum=da5c9a1cbf28235f03e595253213178816352ef0be97730e8a2278605feb8051 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 08223aea79e98d2880741f51e9d606a374415aa0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 09:58:33 +0200 Subject: [PATCH 0348/1145] gnome-recipes: update to 1.4.2. --- srcpkgs/gnome-recipes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template index 6d20ddd412..bdf5268e36 100644 --- a/srcpkgs/gnome-recipes/template +++ b/srcpkgs/gnome-recipes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-recipes' pkgname=gnome-recipes -version=1.2.0 +version=1.4.2 revision=1 _libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7 hostmakedepends="glib intltool itstool pkg-config meson git" @@ -12,7 +12,7 @@ license="GPL-2" homepage="https://wiki.gnome.org/Apps/Recipes" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz https://github.com/GNOME/libgd/archive/$_libgd_hash.tar.gz" -checksum="ef9f12de50b6a4cbb9da5fe9300128b9cb4b57b490ba432ce0acefa70150c353 +checksum="960a705eb15c22ef0ffb7c2cb59fc153a25c2d0624c16a00dda544e5526fe5a5 02c9ec9192a0f732390292a21f4d123b7595957301608288125ae79451cf4b40" nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2155/steps/shell_3/logs/stdio From 37aa10b616c42268b10c1b48b4b0932f90d0b22b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 09:58:45 +0200 Subject: [PATCH 0349/1145] gnome-todo: update to 3.24.1. --- srcpkgs/gnome-todo/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index 193e70ccbc..af1293811c 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,6 +1,6 @@ # Template file for 'gnome-todo' pkgname=gnome-todo -version=3.24.0.1 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -11,8 +11,8 @@ short_desc="Task manager designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Todo" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" -checksum=65311020613322c03b05dc6e7fac32c7d5ee3529f1a76ba2533a2fb998ed35cb +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=d603bf1db8417f8b84593fd2779e94a414d7ab19a4b8132969ad85c874cb947b LDFLAGS="-ledataserver-1.2 -lgoa-1.0 -ledataserverui-1.2" build_options="gir" From b3d4b3fed64248aee49d62ca63a2ab50e1e1a00d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:11:53 +0200 Subject: [PATCH 0350/1145] at-spi2-atk: update to 2.24.1. --- srcpkgs/at-spi2-atk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template index ef71c9e59c..2093b4dc10 100644 --- a/srcpkgs/at-spi2-atk/template +++ b/srcpkgs/at-spi2-atk/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-atk' pkgname=at-spi2-atk -version=2.24.0 +version=2.24.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config intltool glib-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=022d68497c05cc65ba7cd2b166132de9a160c8d90e9200b5faa473ef7e784c61 +checksum=60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d pre_configure() { autoreconf -fi From 3e2d8ed3eb1bcba75b8d4477be1f8563168c1480 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:11:57 +0200 Subject: [PATCH 0351/1145] at-spi2-core: update to 2.24.1. --- srcpkgs/at-spi2-core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index 2971776095..c21566bf27 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.24.0 +version=2.24.1 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6179f314fbd903b3cd3477a57b6b1fecca88b76ce769ce777fda0d3e5f61afcd +checksum=1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b # Package build options build_options="gir" From fdb15a470f968bc29a8acb3688bf87f471b760f1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:01 +0200 Subject: [PATCH 0352/1145] epiphany: update to 3.24.2. --- srcpkgs/epiphany/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 2c001cd0e5..c6f547435a 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.24.1 -revision=2 +version=3.24.2 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils @@ -15,7 +15,7 @@ depends="webkit2gtk>=2.6 gsettings-desktop-schemas>=3.14 ca-certificates hicolor-icon-theme desktop-file-utils iso-codes" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " -homepage="http://www.gnome.org/projects/epiphany/" +homepage="https://www.gnome.org/projects/epiphany/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=21255f8459eb80fc6e011fc6cac8fa61bb939d626117989495eeaeac994d89dc +checksum=5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d From afde4d8f418d7e13133f6e471cf26672ac83f492 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:08 +0200 Subject: [PATCH 0353/1145] evolution: update to 3.24.2. --- srcpkgs/evolution/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 9be60af6fd..ad854b3b50 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.24.1 +version=3.24.2 revision=1 build_style=cmake configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF @@ -18,7 +18,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=d2da4996285a3fe2eb48edf604772677e19ac91a44d2b776698141013c4c610f +checksum=e7b35a60f4ad53bb5416d8e96390aa79c8601b09a71e635c1de730b94f3aebdf evolution-devel_package() { depends="GConf-devel gtkhtml-devel>=4.6.0 evolution-data-server-devel From d161e4bf7aeb67a36283ddf486b4e1a52be35468 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:11 +0200 Subject: [PATCH 0354/1145] evolution-data-server: update to 3.24.2. --- srcpkgs/evolution-data-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index f081527c9a..299c503a05 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,7 +1,7 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.24.1 -revision=2 +version=3.24.2 +revision=1 build_style=cmake configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF" hostmakedepends="pkg-config intltool flex glib-devel gperf $(vopt_if gir gobject-introspection)" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Evolution" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=6344b8035e2bcc5cd404bc86e6d874cdf54102a8948aa0ab7b4e717d328881b0 +checksum=a9bbb98308f935bac8550838b3b5a2b54b38a3d1dd5b0ad91cfb089b46f298fb nocross=yes case "$XBPS_TARGET_MACHINE" in From 45e18bea8961b0e9709bb3f562b8a6d608ec5ada Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:16 +0200 Subject: [PATCH 0355/1145] gdm: update to 3.24.2. --- srcpkgs/gdm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index b5b1e3e08e..fb9d821b32 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm -version=3.24.1 -revision=3 +version=3.24.2 +revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-schemas-compile --disable-static --with-default-pam-config=arch @@ -32,7 +32,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=1ee22139fe0a3fc1ff897ca1c626b28b4e997275ca8dd4d7e48e019a2f2c2179 +checksum=4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8 # Package build options build_options="gir" From c99b03841deec7307f12733105a61954c538a367 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:21 +0200 Subject: [PATCH 0356/1145] gnome-desktop: update to 3.24.2. --- srcpkgs/gnome-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index bf5017598f..3bd442495a 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,6 +1,6 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--with-gnome-distributor=VoidLinux" @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=de09b7d38b4baccae48c527778480731cb12f00848758be186971b2b4acc45ab +checksum=8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e build_options="gir" if [ -z "$CROSS_BUILD" ]; then From c4949a3d0203c992f5460fe2704d0f093a41bfcc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:24 +0200 Subject: [PATCH 0357/1145] gnome-disk-utility: update to 3.24.1. --- srcpkgs/gnome-disk-utility/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index ceaa35f4dd..2f254ef667 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,6 +1,6 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.24.0 +version=3.24.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=c5f8b1d8aad3136353e4ad4f33c7635bcb563b1adce59d3338202e260a7f3cf3 +checksum=878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1 # Package build options build_options="gir" From 3af69c1383711b0de05b68c8d4282011b91a2505 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:29 +0200 Subject: [PATCH 0358/1145] gnome-getting-started-docs: update to 3.24.1. --- srcpkgs/gnome-getting-started-docs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 7f06692334..139588be3c 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-gettings-stated-docs' pkgname=gnome-getting-started-docs -version=3.24.0 +version=3.24.1 revision=1 noarch="yes" build_style=gnu-configure @@ -10,4 +10,4 @@ short_desc="Getting Started documentation for GNOME" maintainer="Juan RP " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=07d2461602e78f8747826a1592f72f072df620d5abc28470f7e5eeaaa5bca099 +checksum=9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97 From 58d5665ced7d9c747769ed674b57e8876cacbf60 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:36 +0200 Subject: [PATCH 0359/1145] gnome-maps: update to 3.24.2. --- srcpkgs/gnome-maps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 85948c5c6d..f03dbb7b0a 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/Design/Apps/Maps" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=eec390d56410d9cda9b1aed85016bbe24f5eaf7e1e0db7c45d5716c2112a4a0d +checksum=e49a759678538f58c49845a7a77f97d409c55ae3c650c7ed1c0f8ba5e4842202 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 7c872a88fd529e9a3d7aea1037d7531615665c46 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:45 +0200 Subject: [PATCH 0360/1145] gnome-music: update to 3.24.2. --- srcpkgs/gnome-music/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 6adde7c067..026a7e5856 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,6 +1,6 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.24.1.1 +version=3.24.2 revision=1 lib32disabled=yes build_style=gnu-configure @@ -13,8 +13,8 @@ short_desc="GNOME music playing application" maintainer="Juan RP " homepage="https://wiki.gnome.org/Apps/Music" license="GPL-2" -distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz" -checksum=8d3dfd5862553f9cb7fa2514afd6b1812f56e4bba58a14f93579de045d318616 +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c build_options="gir" if [ -z "$CROSS_BUILD" ]; then From fcff7cc4269470a789d4489355bff34c89a3db94 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:49 +0200 Subject: [PATCH 0361/1145] gnome-settings-daemon: update to 3.24.2. --- srcpkgs/gnome-settings-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index c79bd9a415..d956f071ac 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-cups" @@ -18,7 +18,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-3" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=1b14ddc63e4cee616b73d048112878f6f4ac606f877778db882d270db904750b +checksum=4aa9d72644e3ee8a30096a38986b0e9543fca92f586c561f6c8a11fb8148dcca pre_configure() { # XXX workaround wrong paths for build From b912ec4334b28d0afc714ef62013806815b78146 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:54 +0200 Subject: [PATCH 0362/1145] gnome-terminal: update to 3.24.2. --- srcpkgs/gnome-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 171c9cd2d9..ed994ee193 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.24.1 +version=3.24.2 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,4 +16,4 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Apps/Terminal" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a7bf26e6fcc335ca7b8fb94e13262f44357961c0f38ca3f2e0066426e91a60e0 +checksum=281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f From 390914d266f98cf89501767cd5e5b51eb2872aa5 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:12:59 +0200 Subject: [PATCH 0363/1145] gnome-user-docs: update to 3.24.2. --- srcpkgs/gnome-user-docs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index b509a49e0d..2c40322971 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=3.24.0 +version=3.24.2 revision=1 noarch="yes" build_style=gnu-configure @@ -12,4 +12,4 @@ short_desc="User documentation for GNOME" maintainer="Juan RP " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a7fc31b9d7156ef8d617c30641025644fedecf6c8934eaa1468d9a349056379b +checksum=c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f From f617d0d3e35d782e347dddca04634dc7c03b642a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 10:13:13 +0200 Subject: [PATCH 0364/1145] libsoup: update to 2.58.1. --- srcpkgs/libsoup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index b48b0b17be..54f7203d7f 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,6 +1,6 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.58.0 +version=2.58.1 revision=1 build_style=gnu-configure configure_args="--disable-tls-check --disable-static @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b61567e25ed61f4b89bb23a36713c807df6b76a8451beb786d8cc362e8f097f5 +checksum=62c669f557de745b7b20ba9d5b74d839c95e4c9cea1a5ab7f3da5531a1aeefb9 # Package build options build_options="gir" From 617e6fc10351d05d0febb093aad8c0bb0b96fcfc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 9 May 2017 22:32:22 +0200 Subject: [PATCH 0365/1145] gnome: split into gnome and gnome-apps, base dependencies on actual gnome-releases. --- srcpkgs/gnome-apps | 1 + srcpkgs/gnome/template | 232 ++++++++++++++++++++++++++++++----------- 2 files changed, 172 insertions(+), 61 deletions(-) create mode 120000 srcpkgs/gnome-apps diff --git a/srcpkgs/gnome-apps b/srcpkgs/gnome-apps new file mode 120000 index 0000000000..983870499f --- /dev/null +++ b/srcpkgs/gnome-apps @@ -0,0 +1 @@ +gnome \ No newline at end of file diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index a49dff6919..08e89ce342 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,68 +1,178 @@ # Template file for 'gnome' pkgname=gnome -version=3.24.0 -revision=2 +version=3.24.1 +revision=1 build_style=meta -depends=" - baobab>=${version} - bijiben>=3.21.2 - brasero>=3.12.1 - cantarell-fonts>=0.0.25 - cheese>=${version} - empathy>=3.12.13 - eog>=${version} - epiphany>=${version} - evince>=${version} - evolution>=${version} - file-roller>=${version} - gdm>=${version} - gedit>=3.22.0 - glib>=2.52.0 - gnome-backgrounds>=${version} - gnome-bluetooth>=3.20.1 - gnome-calculator>=${version} - gnome-clocks>=${version} - gnome-color-manager>=${version} - gnome-contacts>=3.22.1 - gnome-desktop>=${version} - gnome-dictionary>=${version} - gnome-disk-utility>=${version} - gnome-documents>=${version} - gnome-font-viewer>=3.22.0 - gnome-initial-setup>=${version} - gnome-keyring>=3.20.0 - gnome-maps>=${version} - gnome-menus>=3.13.3 - gnome-music>=${version} - gnome-online-miners>=3.22.0 - gnome-photos>=${version} - gnome-screenshot>=3.22.0 - gnome-session>=${version} - gnome-settings-daemon>=${version} - gnome-shell>=${version} - gnome-shell-extensions>=${version} - gnome-sound-recorder>=${version} - gnome-system-monitor>=${version} - gnome-terminal>=${version} - gnome-themes-standard>=3.22.0 - gnome-user-docs>=3.22.0 - gnome-weather>=${version} - gtk+3>=3.22.11 - gucharmap>=9.0.3 - mousetweaks>=3.12.0 - nautilus>=${version} - nautilus-sendto>=3.8.4 - network-manager-applet>=1.4.6 - rygel>=0.34.0 - seahorse>=3.20.0 - sushi>=3.20.0 - totem>=${version} - tracker>=1.12.0 - vinagre>=3.22.0 - vino>=3.22.0 - xdg-user-dirs-gtk>=0.10 - yelp>=3.22.0" short_desc="The GNOME meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2, LGPL-2" + +depends="NetworkManager>=1.6.2_2 + adwaita-icon-theme>=3.24.0 + at-spi2-atk>=2.24.0 + at-spi2-core>=2.24.0 + atk>=2.24.0 + atkmm>=2.24.2 + baobab>=3.24.0 + cantarell-fonts>=0.0.25 + caribou>=0.4.21 + cheese>=3.24.0 + clutter>=1.26.0 + clutter-gst3>=3.0.24 + clutter-gtk>=1.8.2 + cogl>=1.22.2 + dconf>=0.26.0 + eog>=3.24.1 + epiphany>=3.24.1 + evince>=3.24.0 + evolution-data-server>=3.24.1 + file-roller>=3.24.0 + folks>=0.11.3 + gcr>=3.20.0 + gdk-pixbuf>=2.36.6 + gdm>=3.24.1 + gedit>=3.22.0 + geocode-glib>=3.20.1_1 + gfbgraph>=0.2.3 + gjs>=1.48.1 + glib>=2.52.1 + glib-networking>=2.50.0 + glibmm>=2.50.1 + gmime>=2.6.23_1 + gnome-backgrounds>=3.24.0 + gnome-bluetooth>=3.20.1 + gnome-boxes>=3.24.0 + gnome-calculator>=3.24.0 + gnome-calendar>=3.24.0 + gnome-clocks>=3.24.0 + gnome-color-manager>=3.24.0 + gnome-contacts>=3.22.1 + gnome-control-center>=3.24.1 + gnome-desktop>=3.24.1 + gnome-disk-utility>=3.24.0 + gnome-documents>=3.24.1 + gnome-font-viewer>=3.23.91 + gnome-getting-started-docs>=3.24.0 + gnome-initial-setup>=3.24.0 + gnome-keyring>=3.20.0 + gnome-maps>=3.24.1 + gnome-menus>=3.13.3 + gnome-online-accounts>=3.24.0 + gnome-online-miners>=3.22.0 + gnome-photos>=3.24.1 + gnome-screenshot>=3.22.0 + gnome-session>=3.24.1 + gnome-settings-daemon>=3.24.1 + gnome-shell>=3.24.1 + gnome-shell-extensions>=3.24.1 + gnome-system-monitor>=3.24.0 + gnome-terminal>=3.24.1 + gnome-themes-standard>=3.22.3 + gnome-user-docs>=3.24.0 + gnome-video-effects>=0.4.3 + gnome-weather>=3.24.0 + gobject-introspection>=1.52.1 + gom>=0.3.2 + grilo>=0.3.3 + grilo-plugins>=0.3.3_2 + gsettings-desktop-schemas>=3.24.0 + gsound>=1.0.2 + gspell>=1.4.1 + gssdp>=1.0.2 + gtk+3>=3.22.12 + gtk-doc>=1.25 + gtk-vnc>=0.6.0_2 + gtkmm>=3.22.0 + gtksourceview>=3.24.1 + gupnp>=1.0.2 + gupnp-av>=0.12.10 + gupnp-dlna>=0.10.5 + gupnp-igd>=0.2.4 + gvfs>=1.32.1 + json-glib>=1.2.8 + libchamplain>=0.12.15 + libcroco>=0.6.12 + libgdata>=0.16.1_2 + libgee08>=0.20.0 + libgepub>=0.4 + libgnomekbd>=3.22.0.1 + libgsf>=1.14.41 + libgtop>=2.36.0 + libgweather>=3.24.0 + libgxps>=0.2.5 + libmediaart>=1.9.1 + libnotify>=0.7.6_4 + libpeas>=1.20.0 + librsvg>=2.40.17 + libsecret>=0.18.5 + libsigc++>=2.10.0 + libsoup>=2.57.1 + libwnck>=3.20.1 + libxml2>=2.6.30 + libxslt>=1.1.22 + libzapojit>=0.0.3 + mm-common>=0.9.10 + mousetweaks>=3.12.0 + mutter>=3.24.1 + nautilus>=3.24.0 + network-manager-applet>=1.4.6_1 + orca>=3.24.0 + pango>=1.40.5 + pangomm>=2.40.1 + python-atspi>=2.24.0 + python-gobject>=3.24.1 + rest>=0.8.0 + sushi>=3.23.91 + totem>=3.24.0 + totem-pl-parser>=3.10.7 + tracker>=1.12.0 + vala>=0.36.1 + vino>=3.22.0 + vte3>=0.48.2 + yelp>=3.22.0 + yelp-tools>=3.18.0 + yelp-xsl>=3.20.1 + zenity>=3.24.0" + +_apps_depends="aisleriot>=3.22.1 + dconf-editor>=3.22.3_1 + devhelp>=3.24.0 + empathy>=3.12.13 + evolution>=3.24.1 + five-or-more>=3.22.2 + four-in-a-row>=3.22.1 + ghex>=3.18.3 + glade3>=3.20.0 + gnome-builder>=3.24.1 + gnome-chess>=3.24.0 + gnome-dictionary>=3.24.0 + gnome-klotski>=3.22.1 + gnome-mahjongg>=3.22.0 + gnome-mines>=3.24.0 + gnome-music>=3.24.1.1 + gnome-nettool>=3.8.1 + gnome-nibbles>=3.24.0 + gnome-robots>=3.22.1 + gnome-sound-recorder>=3.24.0.1 + gnome-sudoku>=3.24.0 + gnome-tetravex>=3.22.0 + gnome-todo>=3.22.1 + gnome-tweak-tool>=3.24.0 + hitori>=3.22.2 + iagno>=3.22.0 + lightsoff>=3.24.0 + nautilus-sendto>=3.8.4 + nemiver>=0.9.6 + polari>=3.24.1 + quadrapassel>=3.22.0 + rygel>=0.34.0 + seahorse>=3.20.0 + swell-foop>=3.24.0 + tali>=3.22.0" + + +gnome-apps_package() { + depends="$_apps_depends" + short_desc="The GNOME-Apps meta-package for Void Linux" +} From dfc994a6c9073ce6295ec739f06f1b0d97577348 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 9 May 2017 22:35:10 +0200 Subject: [PATCH 0366/1145] gnome-games: remove; superseeded by gnome-apps --- srcpkgs/gnome-games/template | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 srcpkgs/gnome-games/template diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template deleted file mode 100644 index a404e6baca..0000000000 --- a/srcpkgs/gnome-games/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'gnome-games' -pkgname=gnome-games -version=1.0 -revision=1 -build_style=meta -depends=" - gnome-chess - gnome-klotski - gnome-mahjongg - gnome-mines - gnome-nibbles - gnome-robots - gnome-sudoku - gnome-tetravex - atomix - five-or-more - four-in-a-row - hitori - iagno - lightsoff - quadrapassel - swell-foop - tali" -short_desc="Collection of GNOME games" -maintainer="Jürgen Buchmüller " -license="GPL-2, GPL-3" -homepage="http://wiki.gnome.org/Apps" From bffe9c3639e3350e431c1fd5829cac5a7585f064 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 12:02:08 +0200 Subject: [PATCH 0367/1145] Revert "epiphany: update to 3.24.2." This reverts commit fdb15a470f968bc29a8acb3688bf87f471b760f1. --- srcpkgs/epiphany/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index c6f547435a..2c001cd0e5 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.24.2 -revision=1 +version=3.24.1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils @@ -15,7 +15,7 @@ depends="webkit2gtk>=2.6 gsettings-desktop-schemas>=3.14 ca-certificates hicolor-icon-theme desktop-file-utils iso-codes" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " -homepage="https://www.gnome.org/projects/epiphany/" +homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d +checksum=21255f8459eb80fc6e011fc6cac8fa61bb939d626117989495eeaeac994d89dc From b44053d18996167b79c0c18cd96f813035a0a7d9 Mon Sep 17 00:00:00 2001 From: Pierre Allegraud Date: Wed, 10 May 2017 13:00:48 +0200 Subject: [PATCH 0368/1145] cgal: update to 4.9.1. --- srcpkgs/cgal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template index d443eabc95..0d6e3dd685 100644 --- a/srcpkgs/cgal/template +++ b/srcpkgs/cgal/template @@ -1,7 +1,7 @@ # Template file for 'cgal' pkgname="cgal" -version="4.9" +version="4.9.1" revision=1 build_style=cmake short_desc="Computational Geometry Algorithms Library" @@ -9,7 +9,7 @@ maintainer="Pierre Allegraud " license="GPL-3, LGPL-3" homepage="http://www.cgal.org" distfiles="https://github.com/CGAL/cgal/archive/releases/CGAL-${version}.tar.gz" -checksum="472b6154a0d62a5e78cc51772a460ffe8e8faf1f0a9639ca0054a5a7c2310f3f" +checksum="842a02a4abb5266894fe4e0ccbbed2d93cde13c02cb9a849b829a86aaa95166f" wrksrc="cgal-releases-CGAL-${version}" nocross=yes From 511abdcefd043182369bcb1fdc4680c2f89a968d Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 10 May 2017 13:10:27 +0200 Subject: [PATCH 0369/1145] docker: update to 17.05.0. --- srcpkgs/docker/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 6ef13af070..38dc7cf900 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,18 +1,18 @@ # Template file for 'docker' pkgname=docker -version=17.04.0 -revision=2 +version=17.05.0 +revision=1 _subversion='-ce' _version="$version$_subversion" -wrksrc="$pkgname-$_version" +wrksrc="moby-$_version" hostmakedepends="git go pkg-config cmake" makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.docker.io" -distfiles="https://github.com/$pkgname/$pkgname/archive/v$_version.tar.gz" -checksum=b6ee0aa93ecea44e956d3627907e10557b3ec37d13ddfb40e436656e5037c640 +distfiles="https://github.com/moby/moby/archive/v$_version.tar.gz" +checksum=4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 # These are required at run-time. depends="iptables xz git" From d25af4335b3329b69f6de211c9962a90510e4274 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 10 May 2017 13:52:16 +0200 Subject: [PATCH 0370/1145] git: add git-subtree. This is just a small shell script in contrib/, but quite useful. Fixes #6358. --- srcpkgs/git/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 7177a09dc3..64ce34ef20 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for "git" pkgname=git version=2.13.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" @@ -21,12 +21,14 @@ subpackages="git-cvs git-svn git-perl gitk git-gui git-all" post_build() { make ${makejobs} -C Documentation man + make ${makejobs} -C contrib/subtree all git-subtree.1 } post_install() { make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc vinstall contrib/completion/git-completion.bash 644 \ usr/share/bash-completion/completions git vinstall contrib/completion/git-prompt.sh 644 usr/share/git + make -C contrib/subtree DESTDIR=${DESTDIR} prefix=/usr install install-man } git-perl_package() { From 1817634973bbb3c971cd08c4f9734cf08f1313a8 Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 10 May 2017 14:25:14 +0200 Subject: [PATCH 0371/1145] screen-message: update to 0.25. --- srcpkgs/screen-message/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/screen-message/template b/srcpkgs/screen-message/template index 6a14295d84..0f75dceed5 100644 --- a/srcpkgs/screen-message/template +++ b/srcpkgs/screen-message/template @@ -1,6 +1,6 @@ # Template file for 'screen-message' pkgname=screen-message -version=0.24 +version=0.25 revision=1 build_style=gnu-configure make_build_args='execgamesdir=$(prefix)/bin' @@ -12,5 +12,5 @@ maintainer="lemmi " license="GPL-2" homepage="https://www.joachim-breitner.de/projects#screen-message" distfiles="https://www.joachim-breitner.de/archive/screen-message/screen-message-${version}.tar.gz" -checksum=89d06c9a061ede527757b5f8128c64ee2139ce9e6c50c6faaf2e1c72725703ec +checksum=60291a493a6e30714c8704c614b37ef94621a917c3a9fa290800df82712989d3 From 69ba3000eb96fcc7b4bfdbde98966f6f9a59356c Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 10 May 2017 14:29:40 +0200 Subject: [PATCH 0372/1145] openimageio: update to 1.7.14. --- srcpkgs/openimageio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 9a599d1b1e..1a88a737da 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio -version=1.7.13 -revision=2 +version=1.7.14 +revision=1 wrksrc=oiio-Release-${version} build_style=cmake configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 @@ -18,7 +18,7 @@ maintainer="lemmi " license="BSD" homepage="https://sites.google.com/site/openimageio/home" distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz" -checksum=d9ffed79180232636ebed670233666ec7f05eb05fa24e12519b28d042b673b36 +checksum=5d205cc9baccf9ae3f46a589a656e308d89f7d7f93f2586ed20b9acea8a27f4c pre_build() { # Replace -isystem with -I to avoid "#include_next " file not found From 45e0c5bd9170b5f4946e5e6ce24da377b8fc6226 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 12:42:02 +0000 Subject: [PATCH 0373/1145] New package: yara-3.5.0 Closes #6364 --- common/shlibs | 1 + srcpkgs/libyara | 1 + srcpkgs/yara-devel | 1 + srcpkgs/yara/patches/libressl.patch | 31 +++++++++++++++++++++++ srcpkgs/yara/template | 39 +++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+) create mode 120000 srcpkgs/libyara create mode 120000 srcpkgs/yara-devel create mode 100644 srcpkgs/yara/patches/libressl.patch create mode 100644 srcpkgs/yara/template diff --git a/common/shlibs b/common/shlibs index dc87931092..a7d6cf3c99 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2848,3 +2848,4 @@ libbacsql-7.4.7.so bacula-common-7.4.7_1 libbaccats-7.4.7.so bacula-common-7.4.7_1 libsuperlu.so.5 superlu-5.2.1_1 libgosu.so.0 gosu-0.12.0_1 +libyara.so.3 libyara-3.5.0_1 diff --git a/srcpkgs/libyara b/srcpkgs/libyara new file mode 120000 index 0000000000..82141092ea --- /dev/null +++ b/srcpkgs/libyara @@ -0,0 +1 @@ +yara \ No newline at end of file diff --git a/srcpkgs/yara-devel b/srcpkgs/yara-devel new file mode 120000 index 0000000000..82141092ea --- /dev/null +++ b/srcpkgs/yara-devel @@ -0,0 +1 @@ +yara \ No newline at end of file diff --git a/srcpkgs/yara/patches/libressl.patch b/srcpkgs/yara/patches/libressl.patch new file mode 100644 index 0000000000..e5032b399a --- /dev/null +++ b/srcpkgs/yara/patches/libressl.patch @@ -0,0 +1,31 @@ +--- libyara/libyara.c.orig 2016-09-06 20:09:47.000000000 +0000 ++++ libyara/libyara.c 2017-05-10 12:40:13.393089280 +0000 +@@ -71,7 +71,7 @@ + char altercase[256]; + + +-#if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + + // The OpenSSL library before version 1.1 requires some locks in order + // to be thread-safe. These locks are initialized in yr_initialize +@@ -133,7 +133,7 @@ + FAIL_ON_ERROR(yr_thread_storage_create(&tidx_key)); + FAIL_ON_ERROR(yr_thread_storage_create(&recovery_state_key)); + +- #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L ++ #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + + openssl_locks = (YR_MUTEX*) OPENSSL_malloc( + CRYPTO_num_locks() * sizeof(YR_MUTEX)); +--- libyara/modules/pe.c.orig 2016-09-06 20:09:47.000000000 +0000 ++++ libyara/modules/pe.c 2017-05-10 12:38:23.755095815 +0000 +@@ -42,7 +42,7 @@ + #include + #include + #include +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define X509_get_signature_nid(o) OBJ_obj2nid((o)->sig_alg->algorithm) + #endif + #endif diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template new file mode 100644 index 0000000000..08e5163078 --- /dev/null +++ b/srcpkgs/yara/template @@ -0,0 +1,39 @@ +# Template file for 'yara' +pkgname=yara +version=3.5.0 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool" +makedepends="libressl-devel" +short_desc="Pattern matching swiss knife for malware researchers" +maintainer="Michael Gehring " +license="3-clause-BSD" +homepage="http://virustotal.github.io/yara/" +distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz" +checksum=4bc72ee755db85747f7e856afb0e817b788a280ab5e73dee42f159171a9b5299 + +pre_configure() { + autoreconf -fi +} + +libyara_package() { + short_desc+=" - library" + pkg_install() { + vmove usr/lib/*.so.* + } +} + +yara-devel_package() { + depends="libyara-${version}-${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/*.so + vmove usr/lib/pkgconfig + } +} + +post_install() { + vlicense COPYING +} From cdf24c06eedf92d8c65f0a411f7c3b5667225223 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 12:59:16 +0000 Subject: [PATCH 0374/1145] python-atspi: rebuild for musl repo --- srcpkgs/python-atspi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-atspi/template b/srcpkgs/python-atspi/template index ad88e7badc..923c312d95 100644 --- a/srcpkgs/python-atspi/template +++ b/srcpkgs/python-atspi/template @@ -1,7 +1,7 @@ # Template file for 'python-atspi' pkgname=python-atspi version=2.24.0 -revision=1 +revision=2 noarch=yes wrksrc="pyatspi-${version}" build_style=gnu-configure From 943224c57902829d442226cff5643cd00f2e765e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 10 May 2017 15:04:02 +0200 Subject: [PATCH 0375/1145] jack: fix gcc7 build --- srcpkgs/jack/patches/gcc7-abs_type.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/jack/patches/gcc7-abs_type.patch diff --git a/srcpkgs/jack/patches/gcc7-abs_type.patch b/srcpkgs/jack/patches/gcc7-abs_type.patch new file mode 100644 index 0000000000..2340be8ddb --- /dev/null +++ b/srcpkgs/jack/patches/gcc7-abs_type.patch @@ -0,0 +1,11 @@ +--- tests/test.cpp 2014-07-19 15:34:15.000000000 +0200 ++++ tests/test.cpp 2017-05-10 01:32:47.852989559 +0200 +@@ -480,7 +480,7 @@ + jack_nframes_t delta_time = cur_time - last_time; + + Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); +- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { ++ if (delta_time > 0 && (jack_nframes_t)abs((int)(delta_time - cur_buffer_size)) > tolerance) { + printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); + } + From e2db6b05cb19d4f065ac7757a4484a4724bf3905 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 13:23:35 +0000 Subject: [PATCH 0376/1145] yara: enable magic, cuckoo modules --- srcpkgs/yara/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index 08e5163078..7a3ba7092a 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -3,8 +3,9 @@ pkgname=yara version=3.5.0 revision=1 build_style=gnu-configure +configure_args="--enable-magic --enable-cuckoo" hostmakedepends="automake libtool" -makedepends="libressl-devel" +makedepends="libressl-devel file-devel jansson-devel" short_desc="Pattern matching swiss knife for malware researchers" maintainer="Michael Gehring " license="3-clause-BSD" From 16736fbde0783b4577547795ba06b0283a074710 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 13:13:53 +0000 Subject: [PATCH 0377/1145] yara: install docs --- srcpkgs/yara/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index 7a3ba7092a..4867db233b 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -1,7 +1,7 @@ # Template file for 'yara' pkgname=yara version=3.5.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-magic --enable-cuckoo" hostmakedepends="automake libtool" @@ -36,5 +36,8 @@ yara-devel_package() { } post_install() { + for f in docs/*.rst docs/modules/*.rst; do + vdoc $f + done vlicense COPYING } From ba480b72125df426d286e21db18c9fbfd492f783 Mon Sep 17 00:00:00 2001 From: Jasu Koponen Date: Wed, 10 May 2017 17:45:13 +0300 Subject: [PATCH 0378/1145] New package: brisk-menu-0.3.5 Closes: #6365 [via git-merge-pr] --- srcpkgs/brisk-menu/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/brisk-menu/template diff --git a/srcpkgs/brisk-menu/template b/srcpkgs/brisk-menu/template new file mode 100644 index 0000000000..f18b67390f --- /dev/null +++ b/srcpkgs/brisk-menu/template @@ -0,0 +1,14 @@ +# Template file for 'brisk-menu' +pkgname=brisk-menu +version=0.3.5 +revision=1 +build_style=gnu-configure +hostmakedepends="glib pkg-config intltool" +makedepends="gtk+3-devel mate-menus-devel libmate-panel-devel" +depends="mate-panel" +short_desc="Modern, efficient menu for the MATE DE" +maintainer="Jasu Koponen " +license="GPL-2" +homepage="https://github.com/solus-project/${pkgname}" +distfiles="https://github.com/solus-project/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" +checksum=6648b67c60f395bc72d5a74cd7bae4826ea038814e2947c90e319564ce1381d7 From d58c863b5aef835563a28bb630ac8bf484e13073 Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Wed, 10 May 2017 11:19:23 -0600 Subject: [PATCH 0379/1145] gom: update to 0.3.2 --- srcpkgs/gom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gom/template b/srcpkgs/gom/template index 41f2dc4dd0..c6bdf247f7 100644 --- a/srcpkgs/gom/template +++ b/srcpkgs/gom/template @@ -1,13 +1,13 @@ # Template file for 'gom' pkgname=gom -version=0.3.1 +version=0.3.2 revision=1 short_desc="GObject Data Mapper" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7951eb46ee784cbdbee6e3f2da084ffbf776c11ca1c904404b05feafe37e38f5 +checksum=bce8f0f94af6ff7847b853580ba6baebbab8ae531cedb0c78a5c473f39c758fd build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" From 987b244e5654ceb2e6fbef355b2529e465a56c9a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 19:26:21 +0200 Subject: [PATCH 0380/1145] gtkspell3: fix devel package --- common/shlibs | 1 + srcpkgs/gtkspell3/template | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index a7d6cf3c99..1234ca6182 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1168,6 +1168,7 @@ libnettle.so.6 nettle-3.2_1 libhogweed.so.4 nettle-3.2_1 libmikmod.so.3 libmikmod-3.2.0_1 libgtkspell.so.0 gtkspell-2.0.16_1 +libgtkspell3-3.so.0 gtkspell3-3.0.9_1 libpurple.so.0 libpurple-2.10.6_1 libpurple-client.so.0 libpurple-2.10.6_1 libgnt.so.0 libgnt-2.10.6_1 diff --git a/srcpkgs/gtkspell3/template b/srcpkgs/gtkspell3/template index 2f62a35e99..58f4bfa44e 100644 --- a/srcpkgs/gtkspell3/template +++ b/srcpkgs/gtkspell3/template @@ -1,11 +1,11 @@ # Template file for 'gtkspell3' pkgname=gtkspell3 version=3.0.9 -revision=1 +revision=2 build_options="gir" build_style=gnu-configure configure_args="--disable-silent-rules" -hostmakedepends="$(vopt_if gir 'gobject-introspection vala') intltool pkg-config" +hostmakedepends="$(vopt_if gir 'gobject-introspection vala-devel') intltool pkg-config" makedepends="enchant-devel gtk+3-devel" short_desc="Highlighting and replacement of misspelled words" maintainer="beefcurtains " @@ -20,7 +20,7 @@ if [ -z "$CROSS_BUILD" ]; then fi gtkspell3-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} enchant-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 41ed770fc7945090afdfc6b17ebe12cabc39c552 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 19:43:00 +0200 Subject: [PATCH 0381/1145] New package: gitg-3.24.0 --- srcpkgs/gitg/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/gitg/template diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template new file mode 100644 index 0000000000..31c1218fbf --- /dev/null +++ b/srcpkgs/gitg/template @@ -0,0 +1,15 @@ +# Template file for 'gitg' +pkgname=gitg +version=3.24.0 +revision=1 +build_style=gnu-configure +hostmakedepends="intltool pkg-config gobject-introspection" +makedepends="gtksourceview-devel libgit2-glib-devel libgee08-devel gtkspell3-devel + webkit2gtk-devel libpeas-devel gsettings-desktop-schemas-devel libsecret-devel" +short_desc="git repository viewer for GTK+/GNOME" +depends="git" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://wiki.gnome.org/Apps/Gitg" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e From b27567cbe917c307236eb6a1e8e8e06eef881fe9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 10 May 2017 20:43:11 +0200 Subject: [PATCH 0382/1145] libGL: update to 17.1.0. --- srcpkgs/libGL/patches/configure.ac.patch | 26 ------------------------ srcpkgs/libGL/patches/musl.patch | 14 +++++++++++++ srcpkgs/libGL/template | 6 +++--- 3 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/libGL/patches/configure.ac.patch diff --git a/srcpkgs/libGL/patches/configure.ac.patch b/srcpkgs/libGL/patches/configure.ac.patch deleted file mode 100644 index 68c5551473..0000000000 --- a/srcpkgs/libGL/patches/configure.ac.patch +++ /dev/null @@ -1,26 +0,0 @@ -- remove libpthread stubs -- detect static_assert() correctly for musl - ---- configure.ac.orig 2016-11-01 14:39:59.000000000 +0100 -+++ configure.ac 2016-11-04 13:07:05.317813259 +0100 -@@ -828,7 +828,7 @@ - - dnl pthread-stubs is mandatory on targets where it exists - case "$host_os" in --cygwin* ) -+cygwin* | linux* ) - pthread_stubs_possible="no" - ;; - * ) -@@ -1919,6 +1919,11 @@ - fi - AM_CONDITIONAL(HAVE_ST_NINE, test "x$enable_nine" = xyes) - -+AC_CHECK_DECL(static_assert, [], -+ [AC_DEFINE(static_assert(...), [/* */], [noop static_assert() replacement]), -+ AC_MSG_RESULT([no])], -+ [[#include ]]) -+ - dnl - dnl OpenCL configuration - dnl diff --git a/srcpkgs/libGL/patches/musl.patch b/srcpkgs/libGL/patches/musl.patch index eb85a109cf..8cce8e742a 100644 --- a/srcpkgs/libGL/patches/musl.patch +++ b/srcpkgs/libGL/patches/musl.patch @@ -20,3 +20,17 @@ #define MAXTHREADS 1 struct threadpool { +--- src/util/rand_xor.c.orig 2017-05-10 20:12:01.842040501 +0200 ++++ src/util/rand_xor.c 2017-05-10 20:13:30.818969670 +0200 +@@ -23,8 +23,11 @@ + */ + + #if defined(__linux__) ++#include + #include ++#include + #include ++#include + #else + #include + #endif diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index e8b23f18e8..5aa658d2f2 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,7 +1,7 @@ # Template build file for 'libGL'. pkgname=libGL -version=17.0.5 -revision=2 +version=17.1.0 +revision=1 wrksrc="mesa-${version}" build_style=gnu-configure configure_args="--enable-shared-glapi --enable-gbm @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe +checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" From cd1fbdaa4871eab20299fd99233882edec3945a2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 20:48:00 +0200 Subject: [PATCH 0383/1145] NetworkManager: update to 1.8.0. --- srcpkgs/NetworkManager/patches/musl-basic.patch | 14 -------------- srcpkgs/NetworkManager/template | 10 +++++----- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/srcpkgs/NetworkManager/patches/musl-basic.patch b/srcpkgs/NetworkManager/patches/musl-basic.patch index 66b59c646d..415236ed88 100644 --- a/srcpkgs/NetworkManager/patches/musl-basic.patch +++ b/srcpkgs/NetworkManager/patches/musl-basic.patch @@ -25,17 +25,3 @@ Usual fix for musl libc size_t page_size(void) _pure_; #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) ---- src/systemd/src/basic/parse-util.c.orig -+++ src/systemd/src/basic/parse-util.c -@@ -25,7 +25,11 @@ - #include - #include - #include -+#if defined(__GLIBC__) - #include -+#else -+#include -+#endif - - #include "alloc-util.h" - #include "extract-word.h" diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 92f363e7a3..22eadf6aae 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.6.2 -revision=2 +version=1.8.0 +revision=1 build_style=gnu-configure configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no @@ -14,7 +14,7 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient --with-systemdsystemunitdir=no --enable-polkit-agent --enable-tests=no --with-systemd-journal=no --with-systemd-logind=no --disable-gtk-doc --with-dbus-sys-dir=/etc/dbus-1/system.d - --sbindir=/usr/bin + --sbindir=/usr/bin --enable-concheck ac_cv_file__etc_redhat_release=no ac_cv_file__etc_gentoo_release=no ac_cv_file__etc_fedora_release=no ac_cv_file__etc_mandriva_release=no ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_debian_version=no" @@ -23,7 +23,7 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Projects/NetworkManager" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=b22b6f55cde37bec4982f9be4b1808a21101d807a05049c670116d95059a26f9 +checksum=fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e # gtk-doc generation is disabled but gtkdocisze is required by autogen.sh hostmakedepends=" @@ -31,7 +31,7 @@ hostmakedepends=" gettext-devel gtk-doc dbus iproute2 dhclient wpa_supplicant bluez iptables $(vopt_if gir gobject-introspection) $(vopt_if gir python-gobject)" makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel - libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel + libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel $(vopt_if gir libgirepository-devel)" From ad6d17b7f676e7af27fa82256f6ababbee092188 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 10 May 2017 20:48:18 +0200 Subject: [PATCH 0384/1145] network-manager-applet: update to 1.8.0. --- srcpkgs/network-manager-applet/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 728f5e420d..eccd2ca2b5 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,11 +1,11 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet -version=1.4.6 +version=1.8.0 revision=1 lib32disabled=yes build_style=gnu-configure -configure_args="--disable-static --without-bluetooth - --with-modem-manager-1 --disable-migration +configure_args="--disable-static --with-modem-manager-1 --disable-migration + --without-selinux $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel $(vopt_if gir gobject-introspection)" @@ -20,7 +20,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org/projects/NetworkManager/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=10a6fcfe8c6206cf18ec78a522a716b5ec9d0b7ca1e7d234c638725b316fec76 +checksum=d4de2457d27dc8bc236ece54d79e6b5ab24611b9ce7cbdd514671ebcb772d576 # Package build options build_options="gir" From 9def2bcb1584760c8b89fab7714fefb9450f64d5 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Wed, 10 May 2017 21:00:45 +0200 Subject: [PATCH 0385/1145] vidcutter: update to 3.2.0. --- srcpkgs/vidcutter/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index e455d81a7c..f4ef192ff8 100644 --- a/srcpkgs/vidcutter/template +++ b/srcpkgs/vidcutter/template @@ -1,7 +1,7 @@ # Template file for 'vidcutter' pkgname=vidcutter -version=3.0.1 -revision=2 +version=3.2.0 +revision=1 noarch=yes build_style=python3-module pycompile_module="${pkgname}" @@ -12,7 +12,7 @@ maintainer="bra1nwave " license="GPL-3" homepage="http://vidcutter.ozmartians.com/" distfiles="https://github.com/ozmartian/${pkgname}/archive/${version}.tar.gz" -checksum=3eceb1a27a4f4012322acb82792085b27ff3547370b3ad095cb2de5f89bb87fc +checksum=2f74f40c274b91600f241825872b8f50453000f2d60cb4b3194f521146c29642 pre_configure() { sed -i "s/pypi/arch/" vidcutter/__init__.py From 4a1bfd4a500653dc011ad672bf7e4cc8feb864e3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 10 May 2017 18:33:28 +0000 Subject: [PATCH 0386/1145] scaleway-cli: update to 1.13. --- srcpkgs/scaleway-cli/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template index b54bd9981d..e68df70b36 100644 --- a/srcpkgs/scaleway-cli/template +++ b/srcpkgs/scaleway-cli/template @@ -1,7 +1,7 @@ # Template file for 'scaleway-cli' pkgname=scaleway-cli -version=1.12 -revision=2 +version=1.13 +revision=1 build_style="go" go_import_path="github.com/scaleway/scaleway-cli" go_package="github.com/scaleway/scaleway-cli/cmd/scw" @@ -10,7 +10,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/scaleway/scaleway-cli" distfiles="https://github.com/scaleway/scaleway-cli/archive/v${version}.tar.gz" -checksum=7a23ef6960fe280dd19f8e2e9b0fff6ffaf4b8446ddc7833b530901875652e2e +checksum=0be6076af3d41f94f27138415da394fb5424a654214edab58b9bdb1c9fd8a2cb post_install() { vinstall contrib/completion/bash/scw 0644 usr/share/bash-completion/completions From 05f17e6832759d6c81843945f97a4a02f0600b77 Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Wed, 10 May 2017 21:58:12 -0300 Subject: [PATCH 0387/1145] opera: update to 45.0.2552.635 --- srcpkgs/opera/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index f1b7b681f6..e4da4f9e6d 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=44.0.2510.1218 +version=45.0.2552.635 revision=1 only_for_archs="i686 x86_64" hostmakedepends="freetype-devel" @@ -14,10 +14,10 @@ nopie=yes if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then _debarch=amd64 - checksum=7b2294dfd8b54fa1c3f36d52f2f5be0ca86f03355db7b21053fa8005001f62c6 + checksum=187f27469e30ea7e631b9f977915143a9b92f7ebd7fc859f6a258ef87c5d468b else _debarch=i386 - checksum=c483f6a671e33bee80ffb0d774bc73c7256d4e2914bc8a9ad40c108a82346e50 + checksum=2bb437b81799c0e8936ea843800b7939330bc6a2942674725fe359f8078c8c07 fi distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_${_debarch}.deb" From 3c12786fc0c4297ee32d3ce02ce5f5e9dce23673 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 00:40:17 +0200 Subject: [PATCH 0388/1145] flatpak: split -devel subpackage. --- common/shlibs | 4 ++++ srcpkgs/flatpak-devel | 1 + srcpkgs/flatpak/template | 23 ++++++++++++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/flatpak-devel diff --git a/common/shlibs b/common/shlibs index 1234ca6182..36181bf080 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2850,3 +2850,7 @@ libbaccats-7.4.7.so bacula-common-7.4.7_1 libsuperlu.so.5 superlu-5.2.1_1 libgosu.so.0 gosu-0.12.0_1 libyara.so.3 libyara-3.5.0_1 +libgcab-1.0.so.0 gcab-0.7_1 +libappstream-glib.so.8 appstream-glib-0.6.13_1 +libappstream-builder.so.8 appstream-glib-0.6.13_1 +libflatpak.so.0 flatpak-0.9.3_2 diff --git a/srcpkgs/flatpak-devel b/srcpkgs/flatpak-devel new file mode 120000 index 0000000000..3f5bc0dd20 --- /dev/null +++ b/srcpkgs/flatpak-devel @@ -0,0 +1 @@ +flatpak \ No newline at end of file diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index e00d44b7d7..5be4138f9b 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,10 +1,10 @@ # Template file for 'flatpak' pkgname=flatpak version=0.9.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-documentation --with-system-bubblewrap" -hostmakedepends="bubblewrap libxslt pkg-config" +hostmakedepends="bubblewrap libxslt pkg-config glib-devel" makedepends="elfutils-devel fuse-devel glib-devel gpgme-devel json-glib-devel libarchive-devel libcap-devel libostree-devel libseccomp-devel libsoup-devel libXau-devel polkit-devel" @@ -16,6 +16,19 @@ homepage="http://flatpak.org/" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" checksum=a842e1ee03178a5f4236c39786433f6f822d22595a9ef4525004a6c72b4b3846 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" glib-devel" -fi +post_install() { + rm -rf $DESTDIR/usr/lib/systemd +} + +flatpak-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision} glib-devel libostree-devel" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.so + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} From a60dcbf063128426ee159624c3c6f0cb4589ac77 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 08:54:17 +0200 Subject: [PATCH 0389/1145] CopyQ: update to 3.0.1. --- srcpkgs/CopyQ/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template index f26d7fe06d..f6e8077cb0 100644 --- a/srcpkgs/CopyQ/template +++ b/srcpkgs/CopyQ/template @@ -1,6 +1,6 @@ # Template file for 'CopyQ' pkgname=CopyQ -version=3.0.0 +version=3.0.1 revision=1 build_style=cmake hostmakedepends="qt5-host-tools qt5-tools-devel" @@ -10,5 +10,5 @@ maintainer="Enno Boland " license="GPL-3" homepage="https://hluk.github.io/CopyQ/" distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz" -checksum=10137a47e506cde74a76236ef5d040a2d31b824325a90c7b7b39d54a9a63611c +checksum=318ae35f0a55cd15e879ae7a1f9a2a5a3d4c8524bd63b625ee8e9d351f302f04 configure_args="-DWITH_QT5=TRUE" From 2ca0a50dc9fbf695784903969a5e8c7e2cac5d62 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:26:50 +0200 Subject: [PATCH 0390/1145] pkgconf: update to 1.3.6. --- srcpkgs/pkgconf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index 0ed383a302..d107c4c982 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,6 +1,6 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.3.5 +version=1.3.6 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/pkgconf/pkgconf" distfiles="$homepage/archive/$pkgname-$version.tar.gz" -checksum=0da226f5d2fa9432d1b007e7a33168e46b7505b9cbf40c620abe35d97e3abab8 +checksum=95331d7e77c43a253cc677f87a319b5f8e36b163b715dc155df2711fcddd5437 wrksrc="$pkgname-$pkgname-$version" pre_configure() { From 92e71add21c951eed1b66ad875a51a33f2de3a5b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:27:15 +0200 Subject: [PATCH 0391/1145] webkit2gtk: update to 2.16.2. --- srcpkgs/webkit2gtk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 8585fef567..966b489b03 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,7 +1,7 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.16.1 -revision=2 +version=2.16.2 +revision=1 wrksrc="webkitgtk-$version" build_style=cmake configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc" @@ -10,7 +10,7 @@ maintainer="Enno Boland " homepage="http://webkitgtk.org/" license="LGPL-2.1, 2-clause-BSD" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 +checksum=5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 # ETOOHUGE nodebug=1 From 791b4eb6f5c56d1335d9eb8c1d8b4584dd3a48e0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:27:47 +0200 Subject: [PATCH 0392/1145] ConsoleKit2: update to 1.1.1. --- srcpkgs/ConsoleKit2/patches/9999-musl.patch | 12 ------------ srcpkgs/ConsoleKit2/template | 9 +++------ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/ConsoleKit2/patches/9999-musl.patch diff --git a/srcpkgs/ConsoleKit2/patches/9999-musl.patch b/srcpkgs/ConsoleKit2/patches/9999-musl.patch deleted file mode 100644 index 779a091ece..0000000000 --- a/srcpkgs/ConsoleKit2/patches/9999-musl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- pam-ck-connector/pam-ck-connector.c.orig 2015-05-14 06:36:12.217472340 +0200 -+++ pam-ck-connector/pam-ck-connector.c 2015-05-14 06:37:03.465067270 +0200 -@@ -197,7 +197,8 @@ _util_name_to_uid (const char *username, - - bufsize = sysconf (_SC_GETPW_R_SIZE_MAX); - if (bufsize == -1) { -- return res; -+ /* musl returns -1, so that use a considerable buffer size */ -+ bufsize = BUFSIZ; - } - buf = calloc (sizeof (char), bufsize); - rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp); diff --git a/srcpkgs/ConsoleKit2/template b/srcpkgs/ConsoleKit2/template index b1d8abb749..782473d19d 100644 --- a/srcpkgs/ConsoleKit2/template +++ b/srcpkgs/ConsoleKit2/template @@ -1,6 +1,6 @@ # Template file for 'ConsoleKit2' pkgname=ConsoleKit2 -version=1.1.0.1 +version=1.1.1 revision=1 build_style=gnu-configure configure_args="ac_cv_file__sys_class_tty_tty0_active=yes @@ -13,11 +13,8 @@ short_desc="A framework for defining and tracking users, login sessions, and sea maintainer="Enno Boland " homepage="http://consolekit2.github.io/ConsoleKit2/" license="GPL-2" -#distfiles="https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${version}/ConsoleKit2-${version}.tar.bz2" -_gitcommit="8f1794996638dc3829cb1d2562a5601d055e0b91" -wrksrc="${pkgname}-${_gitcommit}" -distfiles="https://github.com/ConsoleKit2/ConsoleKit2/archive/${_gitcommit}.tar.gz" -checksum=e74f5efe79a11da56a7bb4526ef92b6246006e0470f4591d94b24db9f6ed8659 +distfiles="https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${version}/ConsoleKit2-${version}.tar.bz2" +checksum=795b2cfb766bdffb9187ef7f8beb8d8298e4c38df4a69377115297a0dee3b0d0 make_dirs=" /etc/ConsoleKit/run-seat.d 0755 root root From a477edcb9f77664b5638dd7cc2a21a76c62eb614 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:27:55 +0200 Subject: [PATCH 0393/1145] libode: update to 0.15.2. --- srcpkgs/libode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libode/template b/srcpkgs/libode/template index 64269211a2..682e08b766 100644 --- a/srcpkgs/libode/template +++ b/srcpkgs/libode/template @@ -1,6 +1,6 @@ # Template build file for 'libode' pkgname=libode -version=0.15.1 +version=0.15.2 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="LGPL-2/BSD" homepage="http://www.ode.org" distfiles="https://bitbucket.org/odedevs/ode/downloads/ode-$version.tar.gz" -checksum=2e563de4cff09b56bdd8a702e0f8f857345dccbabc23cf2c2b9543996d586c08 +checksum=02c43ac96ada3cd623061c79b71a6f66e31e003a3138343d2df0d0d6fef9b9a7 wrksrc="ode-$version" configure_args="--disable-static --enable-shared --enable-double-precision" From f74407e5e816eefadd283baa7f9e62f907bd480f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:34:44 +0200 Subject: [PATCH 0394/1145] vte3: update to 0.48.3. --- srcpkgs/vte3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index bdc9ec3a55..7b52aad80b 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template build file for 'vte3'. pkgname=vte3 -version=0.48.2 +version=0.48.3 revision=1 wrksrc=vte-${version} build_style=gnu-configure @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=c278b301edfe38b43baec1bccc86e225dacea5b670a96ca7ea55ca9a4b030690 +checksum=a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" From 9580bd355d7135315da89b1006ea6e7960dde87d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:41:29 +0200 Subject: [PATCH 0395/1145] libGL: broken on armv6 and i686 --- srcpkgs/libGL/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 5aa658d2f2..bb411ca435 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -14,6 +14,11 @@ homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 +case "$XBPS_TARGET_MACHINE" in + armv6*) broken=https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2613/steps/shell_3/logs/stdio + i686*) broken=https://build.voidlinux.eu/builders/i686_builder/builds/2596/steps/shell_3/logs/stdio + ;; +esac hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" From 8974fc42310dfa203ccd859e0e76e3de153c07a9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:45:27 +0200 Subject: [PATCH 0396/1145] gnome-control-center: update to 3.24.2. --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 58dc206548..b5a7dab624 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-static --with-cheese" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=30cc8e19fdddf4bde7607fa3897bbba837659e1df9db0de8741723053889a53c +checksum=382a4b1bf54754c1f5f83adb1faeca2e9de70df5d3d85ac6b0fb192801518f2b hostmakedepends="pkg-config intltool glib-devel gnome-doc-utils gobject-introspection" makedepends=" From 3de3f2a2fef444bf9a89753c40e604d5e647496f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:45:37 +0200 Subject: [PATCH 0397/1145] gnome-initial-setup: update to 3.24.2. --- srcpkgs/gnome-initial-setup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index c3d03df701..220ddef738 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup'. pkgname=gnome-initial-setup -version=3.24.0 +version=3.24.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=c66fadfb5ec8febaecbd81d6bf976cbf9557e9f65efd4d8e59ef712700bae554 +checksum=a88c404538a62059deeb294571eb25145fb44432da181cd93caa404701d57c60 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 537ce9b1dca94dc44ad56b352b8811ba0b58bdbd Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 09:45:46 +0200 Subject: [PATCH 0398/1145] gnome-photos: update to 3.24.2. --- srcpkgs/gnome-photos/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index 03603686ac..185154c12c 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,6 +1,6 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Apps/Photos" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=5937dd44feb370c772f9f710da21a5a24e52c9e49d789db1ec86bda6f631482b +checksum=31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9 nocross="https://s3.amazonaws.com/archive.travis-ci.org/jobs/219873990/log.txt" build_options="gir" From e799e1d3c7ba1a1320b208c9221fdaee006b8dc8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 10:34:59 +0200 Subject: [PATCH 0399/1145] libGL: fix syntax error --- srcpkgs/libGL/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index bb411ca435..fd259dc514 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -14,10 +14,10 @@ homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 + case "$XBPS_TARGET_MACHINE" in - armv6*) broken=https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2613/steps/shell_3/logs/stdio - i686*) broken=https://build.voidlinux.eu/builders/i686_builder/builds/2596/steps/shell_3/logs/stdio - ;; + armv6*) broken=https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2613/steps/shell_3/logs/stdio ;; + i686*) broken=https://build.voidlinux.eu/builders/i686_builder/builds/2596/steps/shell_3/logs/stdio ;; esac hostmakedepends=" From e6d1b7d864f4251ffb78b2c2f0083ba90e1c457a Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 11 May 2017 10:28:02 +0200 Subject: [PATCH 0400/1145] kubernetes: update to 1.6.3. --- srcpkgs/kubernetes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 5cdf6d5fad..79da1156e2 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.6.2 +version=1.6.3 revision=1 build_style=go nocross=yes @@ -12,7 +12,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=2af4bcc196a90b78baf65d5bcdf6cbb613d71d3952a98813e15bb6a41f3b922c +checksum=903f4fe7c943e0e07ccb225a4ec2065baa07a80b9e9ff915d869199a0112effd system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" From 07e29833c4314abd9f36b87f6ea3c13a087c3456 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 11 May 2017 10:42:24 +0200 Subject: [PATCH 0401/1145] go-jira: update to 0.1.14. --- srcpkgs/go-jira/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template index ed39874498..362f44241e 100644 --- a/srcpkgs/go-jira/template +++ b/srcpkgs/go-jira/template @@ -1,6 +1,6 @@ # Template file for 'go-jira' pkgname=go-jira -version=0.1.13 +version=0.1.14 revision=1 build_style=go hostmakedepends="git-perl" @@ -11,7 +11,7 @@ go_import_path="github.com/Netflix-Skunkworks/go-jira" go_package="$go_import_path/main" homepage="https://$go_import_path" distfiles="$homepage/archive/v$version.tar.gz" -checksum=da80d2f8d2eeea411c191e9767d5b9d3eb87ad7e9710703a07aee75a1cb78824 +checksum=561f388a0dcb6da531469fa913f9e5377f30f406b2afab78f6a0dd66b5352384 pre_build() { git config --global http.https://gopkg.in.followRedirects true From 937e1c616cb185f40f2f4cbe772a1036f9b82ec3 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 11 May 2017 10:43:17 +0200 Subject: [PATCH 0402/1145] bash-preexec: update to 0.3.3. --- srcpkgs/bash-preexec/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bash-preexec/template b/srcpkgs/bash-preexec/template index d3ae03e1f0..eef9f21df1 100644 --- a/srcpkgs/bash-preexec/template +++ b/srcpkgs/bash-preexec/template @@ -1,6 +1,6 @@ # Template file for 'bash-preexec' pkgname=bash-preexec -version=0.3.2 +version=0.3.3 revision=1 noarch=yes depends="bash" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://github.com/rcaloras/bash-preexec" distfiles="https://github.com/rcaloras/bash-preexec/archive/${version}.tar.gz" -checksum=bf35c21ffdb8a48a908f1503c681017399e62e5580852e3e598e303bb86fc24d +checksum=019a556c5ec77a6c5b4c53c0afbe6596b0d8eac2ffde076af44b0a1d5793cc7b do_install() { vbin bash-preexec.sh From 2c3a9df3b9f6374aff964103627be2728c0d72a6 Mon Sep 17 00:00:00 2001 From: allan Date: Thu, 11 May 2017 13:37:30 +0200 Subject: [PATCH 0403/1145] klystrack: update to 1.7.2. --- srcpkgs/klystrack/template | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template index 38ffacaa1f..e19229c9b6 100644 --- a/srcpkgs/klystrack/template +++ b/srcpkgs/klystrack/template @@ -1,9 +1,8 @@ # Template file for 'klystrack' pkgname=klystrack -version=1.7.0 +version=1.7.2 revision=1 -_klystronsha=4bbadbda271da642b87b2d83cd44742f36c27da0 -wrksrc=klystrack-${version}-final +_klystronsha=f5114db4de299ece73852becbef56d7d461bf421 create_wrksrc=yes hostmakedepends="SDL2-devel" makedepends="SDL2_image-devel SDL2_mixer-devel" @@ -11,22 +10,22 @@ short_desc="Chiptune music tracker" maintainer="allan " license="BSD" homepage="http://kometbomb.github.io/klystrack/" -distfiles="https://github.com/kometbomb/klystrack/archive/${version}-final.tar.gz +distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz" -checksum="cc8fd6a8ee84974ee1ee576342901a0e63f311848495ae0ba504305a5ccdfb97 - 8f957d1250fa36d343d3eecd6585c5890342b0a1b3d8ecaec22217e95d1dbf96" +checksum="96b46fca5cd150a7ca0ea27cc339eb2b2394e48580ced1d43b0083bb8a628d5c + 877bf4b7dc506ede2309c5c9c838d58d52ff031fef7415e9b491ce584078e2f5" do_build() { test -d klystron || mv klystron-${_klystronsha} klystron - cd klystrack-${version}-final + cd klystrack-${version} sed -i \ -e 's/\r$//' \ -e "/^CFLAGS/s,\$, ${CFLAGS}," \ -e "/^LDFLAGS/s:\$: ${LDFLAGS}:" \ -e 's/^CC := gcc/CC := $(CC)/' \ - -e '36s/$/ -lSDL2_mixer/' \ + -e '37s/$/ -lSDL2_mixer/' \ Makefile sed -i \ -e 's/\r$//' \ @@ -37,7 +36,7 @@ do_build() { } do_install() { - cd klystrack-${version}-final + cd klystrack-${version} vbin bin.release/klystrack vmkdir usr/lib/klystrack vcopy res usr/lib/klystrack From 497d3c3e1dcc03021a9b3779ecd1e20dd945e77e Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 11 May 2017 17:47:24 +0200 Subject: [PATCH 0404/1145] New package: sct-0.3 --- srcpkgs/sct/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/sct/template diff --git a/srcpkgs/sct/template b/srcpkgs/sct/template new file mode 100644 index 0000000000..1cc0454048 --- /dev/null +++ b/srcpkgs/sct/template @@ -0,0 +1,17 @@ +# Template file for 'sct' +pkgname=sct +version=0.3 +revision=1 +build_style=gnu-makefile +makedepends="libXrandr-devel" +short_desc="Lightweight utility to set the color temperature of the screen" +maintainer="Duncaen " +license="ISC" +homepage="http://www.tedunangst.com/flak/post/sct-set-color-temperature" +distfiles="https://www.umaxx.net/dl/sct-${version}.tar.gz" +checksum=e8249e18cbc35fa106bfb90e715938b180f711d0e4f917636b340382ff2cf35c + +do_install() { + vbin sct + vman sct.1 +} From 14c42d81d6248a7de329b8160867c2b9f5f754d3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 11 May 2017 17:50:32 +0200 Subject: [PATCH 0405/1145] vidcutter: broken, checksum changed --- srcpkgs/vidcutter/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index f4ef192ff8..4d997d755f 100644 --- a/srcpkgs/vidcutter/template +++ b/srcpkgs/vidcutter/template @@ -14,6 +14,8 @@ homepage="http://vidcutter.ozmartians.com/" distfiles="https://github.com/ozmartian/${pkgname}/archive/${version}.tar.gz" checksum=2f74f40c274b91600f241825872b8f50453000f2d60cb4b3194f521146c29642 +broken="checksum changed?" + pre_configure() { sed -i "s/pypi/arch/" vidcutter/__init__.py } From 41721850f7be27cc400e8f336ea2cca4359c5dc4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 19:47:08 +0200 Subject: [PATCH 0406/1145] bmake: update to 20170510. --- srcpkgs/bmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index c978ed3642..9489cf69f7 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20170505 +version=20170510 revision=1 create_wrksrc=yes short_desc="Portable version of the NetBSD make build tool" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="BSD" homepage="http://www.crufty.net/help/sjg/bmake.html" distfiles="http://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz" -checksum=f903a449c1227092c3b943418a29589105db9a16f54696afacc3fde691de35fd +checksum=ce5d73a8b5267495132bd00392a411178155dafecd66b50860419e9cf8683e3c do_configure() { cd bmake From c66125c97b71213ed73517ce2df998203fc2a69f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 19:47:11 +0200 Subject: [PATCH 0407/1145] re2: update to 2017.05.01. --- srcpkgs/re2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template index a4c01ac4e8..99cfab81f1 100644 --- a/srcpkgs/re2/template +++ b/srcpkgs/re2/template @@ -1,7 +1,7 @@ # Template build file for 're2'. pkgname=re2 reverts=20140304_1 -version=2017.04.01 +version=2017.05.01 revision=1 wrksrc="${pkgname}-${version//./-}" build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="3-clause-BSD" homepage="https://github.com/google/re2" distfiles="${homepage}/archive/${version//./-}.tar.gz" -checksum=908b2152eea1a7c5eefe27131d322308a9c30ed62e1254824404a2ab92bb2992 +checksum=337dc0857b8f83b4fc3b78a334829945d7f35c3c6e2b06bd10a1dd4858dcf4a5 post_install() { vlicense LICENSE From d0a18e064d2cd34ef6c20e87fe3cdef77336ea43 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 20:01:27 +0200 Subject: [PATCH 0408/1145] perl-Class-Load: update to 0.24. --- srcpkgs/perl-Class-Load/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Class-Load/template b/srcpkgs/perl-Class-Load/template index d43623e2b0..bc99443530 100644 --- a/srcpkgs/perl-Class-Load/template +++ b/srcpkgs/perl-Class-Load/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Class-Load'. pkgname=perl-Class-Load -version=0.23 +version=0.24 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="John Regan " homepage="http://search.cpan.org/dist/Class-Load" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Class/${pkgname/perl-/}-$version.tar.gz" -checksum=f2bca579e72ea96c6b1c5ebc86dfa1929062c412443277f0bc0437e50874b28f +checksum=0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36 From 7e6c51baf51a9cc9dc7f12f264d25bb660fe166c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 20:02:39 +0200 Subject: [PATCH 0409/1145] perl-Params-Validate: update to 1.28. --- srcpkgs/perl-Params-Validate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Params-Validate/template b/srcpkgs/perl-Params-Validate/template index 12f7306bd5..f7d6f67463 100644 --- a/srcpkgs/perl-Params-Validate/template +++ b/srcpkgs/perl-Params-Validate/template @@ -1,6 +1,6 @@ # Template file for 'perl-Params-Validate' pkgname=perl-Params-Validate -version=1.26 +version=1.28 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-ModuleBuild @@ -12,4 +12,4 @@ maintainer="John Regan " homepage="http://search.cpan.org/dist/Params-Validate/" license="Artistic" distfiles="${CPAN_SITE}/Params/${pkgname/perl-/}-${version}.tar.gz" -checksum=821ac3cfa9715b94f60926faf316b9ff722785594b37036202371ad2303a72ed +checksum=dde5ec77993a9cac300c53053588a50b9c5aeadb77626fe8bc9c2d9b29aaff77 From 1ce0da733a1ffd2f32f003f3b07854c11785a549 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 20:21:00 +0200 Subject: [PATCH 0410/1145] lvm2: update to 2.02.171. --- srcpkgs/lvm2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index 2b5d64dfd3..a32c3b3c14 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,7 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 -version=2.02.170 -revision=2 +version=2.02.171 +revision=1 wrksrc="LVM2.${version}" build_style=gnu-configure configure_args="--disable-selinux --enable-readline --enable-pkgconfig @@ -22,7 +22,7 @@ maintainer="Juan RP " homepage="http://sourceware.org/lvm2/" license="GPL-2, LGPL-2.1" distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" -checksum=9372d2523027a751cf54eafdf8b761ff843969520c32b0c50abfba65e23d0d40 +checksum=b815a711a2fabaa5c3dc1a4a284df0268bf0f325f0fc0f5c9530c9bbb54b9964 post_install() { sed -i 's,use_lvmetad = 1,use_lvmetad = 0,' ${DESTDIR}/etc/lvm/lvm.conf From f322620ae3fa79da50032912fbc87945aa74ce2c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 20:30:56 +0200 Subject: [PATCH 0411/1145] ne: update to 3.1.0. --- srcpkgs/ne/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template index 285b937338..eedf242aa7 100644 --- a/srcpkgs/ne/template +++ b/srcpkgs/ne/template @@ -1,6 +1,6 @@ # Template file for 'ne' pkgname=ne -version=3.0.1 +version=3.1.0 revision=1 makedepends="ncurses-devel" short_desc="The Nice Editor" @@ -8,8 +8,11 @@ maintainer="Juan RP " license="GPL-3" homepage="http://ne.di.unimi.it/" distfiles="http://ne.di.unimi.it/ne-${version}.tar.gz" -checksum=92b646dd2ba64052e62deaa4239373821050a03e1b7d09d203ce04f2adfbd0e4 +checksum=bf2a664e788e4f39073d0000a4ba80f02c43c556cb7fd714704f13175a4b8b51 +post_extract() { + sed -i 's/ne.dvi ne.pdf//' doc/makefile +} do_build() { make CFLAGS="$CFLAGS -std=c99 -D_GNU_SOURCE" CC=$CC ${makejobs} } From fcae96d347a494ece272407cc6b92260ec19b857 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 11 May 2017 20:32:18 +0200 Subject: [PATCH 0412/1145] sudo: update to 1.8.20. --- srcpkgs/sudo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 1b9a7b3592..75f77c9163 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -1,6 +1,6 @@ # Template build file for 'sudo'. pkgname=sudo -version=1.8.19p2 +version=1.8.20 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="https://www.sudo.ws/" license="ISC, BSD, zlib" distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz" -checksum=237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 +checksum=9e97b8da859c6cc1b5b8c31db93002b750eae16af1bbda9140f8dd85b970e0e0 post_configure() { case "$XBPS_TARGET_MACHINE" in From 39e15e17f98f687a194de5c018c1bf858e37fdc7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 11 May 2017 19:57:53 +0000 Subject: [PATCH 0413/1145] libproxy: update to 0.4.15. --- srcpkgs/libproxy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template index 8727e6035b..abce59f88d 100644 --- a/srcpkgs/libproxy/template +++ b/srcpkgs/libproxy/template @@ -1,6 +1,6 @@ # Template file for 'libproxy' pkgname=libproxy -version=0.4.14 +version=0.4.15 revision=1 build_style=cmake configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0 @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://github.com/libproxy/libproxy" license="LGPL-2.1" distfiles="https://github.com/libproxy/libproxy/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=6220a6cab837a8996116a0568324cadfd09a07ec16b930d2a330e16d5c2e1eb6 +checksum=18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0 libproxy-devel_package() { depends="libproxy>=${version}_${revision}" From 533241eaad42b2cca59757ca569c7c8a6c62579c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 11 May 2017 19:59:03 +0000 Subject: [PATCH 0414/1145] liboping: update to 1.10.0. --- srcpkgs/liboping/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/liboping/template b/srcpkgs/liboping/template index 33d2f6e0f6..d5f931822a 100644 --- a/srcpkgs/liboping/template +++ b/srcpkgs/liboping/template @@ -1,7 +1,7 @@ # Template file for 'liboping' pkgname=liboping -version=1.9.0 -revision=2 +version=1.10.0 +revision=1 build_style=gnu-configure hostmakedepends="perl" makedepends="ncurses-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-2.1,GPL-2" homepage="http://noping.cc/" distfiles="http://noping.cc/files/liboping-${version}.tar.bz2" -checksum=44bb1d88b56b88fda5533edb3aa005c69b3cd396f20453a157d7e31e536f3530 +checksum=eb38aa93f93e8ab282d97e2582fbaea88b3f889a08cbc9dbf20059c3779d5cd8 post_configure() { ( From 49f8c3e1256de158f413ac004aded49134161c7e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 11 May 2017 19:59:10 +0000 Subject: [PATCH 0415/1145] gnutls: update to 3.5.12. --- srcpkgs/gnutls/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index e5fb6b2107..f9b5d69a42 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,6 +1,6 @@ # Template file for 'gnutls' pkgname=gnutls -version=3.5.11 +version=3.5.12 revision=1 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="https://gnutls.org" license="GPL-3, LGPL-2.1" distfiles="ftp://ftp.gnutls.org/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" -checksum=51765cc5579e250da77fbd7871507c517d01b15353cc40af7b67e9ec7b6fe28f +checksum=63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb pre_configure() { autoreconf -fi From d6196fa89c67122d04989800fa2c13b9225b9041 Mon Sep 17 00:00:00 2001 From: eater Date: Fri, 12 May 2017 09:27:04 +0200 Subject: [PATCH 0416/1145] openvpn: update to 2.4.2 --- srcpkgs/openvpn/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index 428a9d6e0c..b3e483a0ec 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,7 +1,7 @@ # Template file for 'openvpn' pkgname=openvpn -version=2.4.1 -revision=2 +version=2.4.2 +revision=1 build_style=gnu-configure configure_args="--enable-iproute2 --disable-systemd" hostmakedepends="iproute2" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://www.openvpn.net" distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz" -checksum=fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5 +checksum=df5c4f384b7df6b08a2f6fa8a84b9fd382baf59c2cef1836f82e2a7f62f1bff9 post_install() { vmkdir usr/share/examples/${pkgname} From 43921a5e2c4144a277d31c02ac696af4a8761902 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Fri, 12 May 2017 11:04:28 +0200 Subject: [PATCH 0417/1145] vidcutter: distfile checksum changed --- srcpkgs/vidcutter/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index 4d997d755f..25ba861685 100644 --- a/srcpkgs/vidcutter/template +++ b/srcpkgs/vidcutter/template @@ -1,7 +1,7 @@ # Template file for 'vidcutter' pkgname=vidcutter version=3.2.0 -revision=1 +revision=2 noarch=yes build_style=python3-module pycompile_module="${pkgname}" @@ -12,9 +12,7 @@ maintainer="bra1nwave " license="GPL-3" homepage="http://vidcutter.ozmartians.com/" distfiles="https://github.com/ozmartian/${pkgname}/archive/${version}.tar.gz" -checksum=2f74f40c274b91600f241825872b8f50453000f2d60cb4b3194f521146c29642 - -broken="checksum changed?" +checksum=a1b1042c90e9e0cc7dd2e3c436c273bbf417248788154d4b35d030e67b4720ab pre_configure() { sed -i "s/pypi/arch/" vidcutter/__init__.py From 12248de551af40b721f2092aa6e5f96f547c9ee2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 12 May 2017 13:41:20 +0200 Subject: [PATCH 0418/1145] ripgrep: update to 0.5.2. --- srcpkgs/ripgrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ripgrep/template b/srcpkgs/ripgrep/template index 81310c55e5..1534876e64 100644 --- a/srcpkgs/ripgrep/template +++ b/srcpkgs/ripgrep/template @@ -1,6 +1,6 @@ # Template file for 'ripgrep' pkgname=ripgrep -version=0.5.1 +version=0.5.2 revision=1 hostmakedepends="cargo rust" short_desc="Fast search tool inspired by ag and grep" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="Public Domain, MIT" homepage="https://github.com/BurntSushi/ripgrep/" distfiles="https://github.com/BurntSushi/${pkgname}/archive/${version}.tar.gz" -checksum=e0724d40f069580bac9f28cbf6005020fdc1b80e5d15fb69679d50ca341116f9 +checksum=5d880c590cbb09d907d64ba24557fb2b2f025c8363bcdde29f303e9261625eea nocross=yes do_build() { From 8b827748c9a2b9608ed874c1601e3ee7dfb01bec Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 12 May 2017 13:54:23 +0200 Subject: [PATCH 0419/1145] libGL: fix i686 --- srcpkgs/libGL/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index fd259dc514..d7553f2ec7 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -17,7 +17,6 @@ checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 case "$XBPS_TARGET_MACHINE" in armv6*) broken=https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2613/steps/shell_3/logs/stdio ;; - i686*) broken=https://build.voidlinux.eu/builders/i686_builder/builds/2596/steps/shell_3/logs/stdio ;; esac hostmakedepends=" @@ -86,6 +85,10 @@ pre_configure() { post_install() { vmkdir usr/lib/xorg/modules/extensions ln -s libglx-xorg.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so + if [ -d "$DESTDIR/usr/lib32" ]; then + mv "$DESTDIR/usr/lib32/d3d" "$DESTDIR/usr/lib" + mv "$DESTDIR/usr/lib32/pkgconfig"/* "$DESTDIR/usr/lib/pkgconfig" + fi } libglapi_package() { From 427367eb6adc78183d30db095c8d12cf07e2c185 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 12 May 2017 15:55:27 +0200 Subject: [PATCH 0420/1145] mate-polkit: update to 1.18.1. --- srcpkgs/mate-polkit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-polkit/template b/srcpkgs/mate-polkit/template index 720bdbc7ef..3d1a636db3 100644 --- a/srcpkgs/mate-polkit/template +++ b/srcpkgs/mate-polkit/template @@ -1,6 +1,6 @@ # Template file for 'mate-polkit' pkgname=mate-polkit -version=1.18.0 +version=1.18.1 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f41a06a0a76e2af5ae01f877b48e6eb4c0d31ccda6f35bf610e24052ac2a7e4e +checksum=ec011e845184bb766684811b6befaef3797f12895cf21807d71f3de92d146e97 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 29449654441cbe76db5aa2db101f9f28ec03563d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 12 May 2017 16:59:35 +0200 Subject: [PATCH 0421/1145] mutter: update to 3.24.2. --- srcpkgs/mutter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 519aab84fe..bb7b88cf87 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --enable-egl-device" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=acaa77f9705cc6ca4a3d41935524ff31ba7a4c677bdd3e1d4662bbf3ece86a24 +checksum=e18063a200c4bc2fad744232d01478e01b5a1bbfc9f2055d9333f34dd0187810 shlib_provides="libmutter-clutter-0.so libmutter-cogl-path-0.so libmutter-cogl-0.so libmutter-cogl-pango-0.so" nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio" CFLAGS+=' -Wno-error=sign-compare -Wno-error=format' From b48d81cc68069ccc668a8e4c644a5d34a0cc1af6 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 12 May 2017 16:59:40 +0200 Subject: [PATCH 0422/1145] gnome-shell: update to 3.24.2. --- srcpkgs/gnome-shell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 7469ddafab..417925bb5d 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-systemd" @@ -21,7 +21,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=53f93d64307a3c74dd9854a311a82d9ea9671dd424560f5a6f61dbf9474f423f +checksum=70c79a38b5aa19b0a8f73d833ceba2648bce319f9e5e96f567f4efdc2a63e2f6 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From d08bf69031a346f2b299b26df1dfd6841dba2e73 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 12 May 2017 16:59:45 +0200 Subject: [PATCH 0423/1145] gnome-shell-extensions: update to 3.24.2. --- srcpkgs/gnome-shell-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 3194438460..234dbdb42d 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=3.24.1 +version=3.24.2 revision=1 noarch="yes" build_style=gnu-configure @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell/Extensions" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=f8008064e732f1b29d8343c43b2b5ca029411af33e47b32a4daed2cae5b9aa60 +checksum=9a1cc6c17dcf692121bdfe503d4e386a0992b2c976f90bd2f495155af9414f83 From 3972e58afc279f886f7926282e73858f0cb73511 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 12 May 2017 16:59:57 +0200 Subject: [PATCH 0424/1145] gnome-documents: update to 3.24.2. --- srcpkgs/gnome-documents/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index d2d654d2b0..bc8438d054 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,6 +1,6 @@ # Template file for 'gnome-documents' pkgname=gnome-documents -version=3.24.1 +version=3.24.2 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="https://wiki.gnome.org/Apps/Documents" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a34d1366a7fa86458ca8a9fb76adcbb6ad0f609fa2458adab60b066f1b03c57e +checksum=513a7640967cf94a2233da5e38b3bdc6b71c89b84727dded8dc3f6ce13b35130 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 000bf86012032f951e5f24b8a389465edfa8a745 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 12 May 2017 21:00:07 +0000 Subject: [PATCH 0425/1145] upx: update to 3.94. --- srcpkgs/upx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template index 50cd356ea7..2ab51afdf9 100644 --- a/srcpkgs/upx/template +++ b/srcpkgs/upx/template @@ -1,6 +1,6 @@ # Template file for 'upx' pkgname=upx -version=3.93 +version=3.94 revision=1 build_style=gnu-makefile make_build_target="all" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://upx.github.io/" license="GPL-2" distfiles="https://github.com/upx/upx/releases/download/v${version}/upx-${version}-src.tar.xz" -checksum=893f1cf1580c8f0048a4d328474cb81d1a9bf9844410d2fd99f518ca41141007 +checksum=81ef72cdac7d8ccda66c2c1ab14f4cd54225e9e7b10cd40dd54be348dbf25621 do_install() { vbin src/upx.out upx From fc0d14cb24f885a604a43c3fd400127cc2f98045 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 06:43:32 +0200 Subject: [PATCH 0426/1145] v4l-utils: update to 1.12.5. --- srcpkgs/v4l-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index 1def6685e8..a84de2b02c 100644 --- a/srcpkgs/v4l-utils/template +++ b/srcpkgs/v4l-utils/template @@ -1,6 +1,6 @@ # Template file for 'v4l-utils' pkgname=v4l-utils -version=1.12.4 +version=1.12.5 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-qv4l2 --with-udevdir=/usr/lib/udev" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://freshmeat.net/projects/libv4l" license="GPL-2, LGPL-2.1" distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2" -checksum=96ee79b35c54c175f39c9303ab71c5e46f07b2ad688f4aaa64f11a1e3ad579cc +checksum=0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" From 45621fc6edbc273de0afa64d15fd6e4c4faeb24d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 06:43:58 +0200 Subject: [PATCH 0427/1145] qv4l2: update to 1.12.5. --- srcpkgs/qv4l2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index 36c59e3447..dc9a022f1b 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -1,6 +1,6 @@ # Template file for 'qv4l2' pkgname=qv4l2 -version=1.12.4 +version=1.12.5 revision=1 wrksrc="v4l-utils-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://linuxtv.org/" license="GPL-2, LGPL-2.1" distfiles="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2" -checksum=96ee79b35c54c175f39c9303ab71c5e46f07b2ad688f4aaa64f11a1e3ad579cc +checksum=0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d nocross="detects X11/GL support incorrectly" From 43d6fb1cf8c6ea5e1bed5862b92a8f92d96d0c00 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 06:56:35 +0200 Subject: [PATCH 0428/1145] snapper: update to 0.5.0. --- srcpkgs/snapper/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 51ae3c3618..2528022d75 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper -version=0.4.1 -revision=2 +version=0.5.0 +revision=1 lib32disabled=yes build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d --sbindir=/usr/bin" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://snapper.io" distfiles="ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$version.tar.bz2" -checksum=db9cce7f61ed1197d2663dfca444d313b05d7fb2d50af5ab468c7bdba6dd660f +checksum=8876b6fa946dc46df5dcbaf747bb11ac4c5a3418dd59c5ba09c47910cbad1835 case "$XBPS_TARGET_MACHINE" in *-musl) # We define MUSL_LIBC to pick the correct return type From 3a6345f9e6016146c70f3d5026ee3829d4dbe08c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:07:20 +0200 Subject: [PATCH 0429/1145] mate-themes: update to 3.22.11. --- srcpkgs/mate-themes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-themes/template b/srcpkgs/mate-themes/template index a8305107f9..a700130998 100644 --- a/srcpkgs/mate-themes/template +++ b/srcpkgs/mate-themes/template @@ -1,6 +1,6 @@ # Template file for 'mate-themes' pkgname=mate-themes -version=3.22.10 +version=3.22.11 revision=1 noarch=yes build_style=gnu-configure @@ -12,4 +12,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/themes/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8bc9ffe898d2e28eec7a92f1c36f9f6c479ffb171342cd36e91713d59d64d10d +checksum=d529a64b84a97152417f2398d2d4f366c6a820fad1a49a46f0c8e0e12d0bcabd From ca85d5f9b2cf1e2a9e57d8948184b8be416ef0e6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:08:53 +0200 Subject: [PATCH 0430/1145] marco: update to 1.18.1. --- srcpkgs/marco/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template index 6eb249de0d..1fb795d89b 100644 --- a/srcpkgs/marco/template +++ b/srcpkgs/marco/template @@ -1,6 +1,6 @@ # Template file for 'marco' pkgname=marco -version=1.18.0 +version=1.18.1 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-startup-notification --disable-schemas-compile" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9b273026bc739352b5287f9d804ffae2d873f7ee3fbe4d1d5673473eae2938a8 +checksum=65a276104745817208582e5da1894eeb86391ea2e288775aa1d098e679ba8b53 pre_configure() { NOCONFIGURE=1 ./autogen.sh From aa2999dae4c3b1164655b2030c8e54677d19ad67 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:09:18 +0200 Subject: [PATCH 0431/1145] caja: update to 1.18.3. --- srcpkgs/caja/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template index ee824cfda8..f83a3d5174 100644 --- a/srcpkgs/caja/template +++ b/srcpkgs/caja/template @@ -1,6 +1,6 @@ # Template file for 'caja' pkgname=caja -version=1.18.2 +version=1.18.3 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-packagekit --disable-schemas-compile @@ -16,7 +16,7 @@ maintainer="Juan RP " license="LGPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=117fbc320bf73e76b20eeef87c69e2b2245b50520cf33b51999abe53929686a6 +checksum=b562c544f907944b2e1ce426b5e1d1d02886ecfff8d44f0a3ae2a2793ac39256 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 23d840e999bffea5931c19c7886093263f7a2afe Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:09:54 +0200 Subject: [PATCH 0432/1145] mate-panel: update to 1.18.2. --- srcpkgs/mate-panel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template index 96c64612a6..a68dfbf0a7 100644 --- a/srcpkgs/mate-panel/template +++ b/srcpkgs/mate-panel/template @@ -1,6 +1,6 @@ # Template file for 'mate-panel' pkgname=mate-panel -version=1.18.1 +version=1.18.2 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4782cadcadf8204790697d9c6aec6b3f2ab74983faeb13d9fc3301001fa94139 +checksum=6c4f5d63b173079c298ae2d05375081c2e452745f3ccf339da757bf83e5d3e17 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 6b25ff506078580bd283ce5dd20d27724fa0708c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:10:21 +0200 Subject: [PATCH 0433/1145] mate-sensors-applet: update to 1.18.2. --- srcpkgs/mate-sensors-applet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-sensors-applet/template b/srcpkgs/mate-sensors-applet/template index 3f3d33bb21..176c1e4d9d 100644 --- a/srcpkgs/mate-sensors-applet/template +++ b/srcpkgs/mate-sensors-applet/template @@ -1,6 +1,6 @@ # Template file for 'mate-sensors-applet' pkgname=mate-sensors-applet -version=1.18.1 +version=1.18.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=582640e462e2174a46bcb592d3ca4e02ab938b1f476baa5ab9bd9c846f2ab397 +checksum=404b609c9363135407525c3dda9e4a2663528ebf68530cf4778e21223c3d4e2e From 5c07b67d0c6a069467b97dcb5f21f1733834a412 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:13:45 +0200 Subject: [PATCH 0434/1145] lxc: update to 2.0.8. --- srcpkgs/lxc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index fc4da31ff7..ebc44eb69e 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -2,7 +2,7 @@ _desc="Linux Containers" pkgname=lxc -version=2.0.7 +version=2.0.8 revision=1 build_style=gnu-configure configure_args="--enable-doc --enable-seccomp --enable-cgmanager @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="https://linuxcontainers.org" license="LGPL-2.1" distfiles="https://linuxcontainers.org/downloads/lxc-${version}.tar.gz" -checksum=1c09c075f06ec029f86fa6370c7d379494ff4c66a129eda17af7b7b41e055f5d +checksum=0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494 conf_files="/etc/lxc/default.conf" make_dirs=" From 85d700314a69268e4609c68eac48e2908824f5df Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:14:46 +0200 Subject: [PATCH 0435/1145] libwacom: update to 0.25. --- srcpkgs/libwacom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template index 3e5a1e604b..017b1da05e 100644 --- a/srcpkgs/libwacom/template +++ b/srcpkgs/libwacom/template @@ -1,6 +1,6 @@ # Template file for 'libwacom' pkgname=libwacom -version=0.24 +version=0.25 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="http://linuxwacom.sourceforge.net/wiki/index.php/Main_Page" distfiles="${SOURCEFORGE_SITE}/linuxwacom/$pkgname-$version.tar.bz2" -checksum=2905a0ee5cc85eceb9f5bd06109e66a051b0ed18102c3e6798717c259c8d66c3 +checksum=29d0862cd008a82e19f4b74a35ca9da49dfdb994a1bc761bc87e503c9de040cc post_install() { vlicense COPYING From bd1a94a15884ca43e3f0af1d0916a9fe899efa0b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:22:29 +0200 Subject: [PATCH 0436/1145] gtk+3: update to 3.22.15. --- srcpkgs/gtk+3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index fc734f5827..bb3270ed21 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,6 +1,6 @@ # Template build file for 'gtk+3'. pkgname=gtk+3 -version=3.22.12 +version=3.22.15 revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c +checksum=c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb hostmakedepends="automake gettext-devel libtool pkg-config glib-devel gtk-doc gobject-introspection gtk-update-icon-cache From d8068053f9781424dde2d090ccb1d78413309056 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 May 2017 07:32:03 +0200 Subject: [PATCH 0437/1145] clutter: update to 1.26.2. --- srcpkgs/clutter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 9fbd254986..d104054b51 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,6 +1,6 @@ # Template file for 'clutter' pkgname=clutter -version=1.26.0 +version=1.26.2 revision=1 build_style=gnu-configure build_options="gir" @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" -checksum=67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06 +checksum=e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56 if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" From d31ef1c93173bdf8f9a94fffc6299a54eea71494 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 00:01:36 +0200 Subject: [PATCH 0438/1145] New package: gcab-0.7 --- srcpkgs/gcab-devel | 1 + srcpkgs/gcab/template | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 120000 srcpkgs/gcab-devel create mode 100644 srcpkgs/gcab/template diff --git a/srcpkgs/gcab-devel b/srcpkgs/gcab-devel new file mode 120000 index 0000000000..d9386652d1 --- /dev/null +++ b/srcpkgs/gcab-devel @@ -0,0 +1 @@ +gcab \ No newline at end of file diff --git a/srcpkgs/gcab/template b/srcpkgs/gcab/template new file mode 100644 index 0000000000..c61ca1c068 --- /dev/null +++ b/srcpkgs/gcab/template @@ -0,0 +1,29 @@ +# Template file for 'gcab' +pkgname=gcab +version=0.7 +revision=1 +build_style=gnu-configure +hostmakedepends="glib-devel intltool pkg-config" +makedepends="glib-devel" +short_desc="A GObject library to create cabinet files" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://wiki.gnome.org/msitools" +distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" +checksum=a16e5ef88f1c547c6c8c05962f684ec127e078d302549f3dfd2291e167d4adef +configure_args="--disable-gtk-doc" + +post_install() { + rm -r $DESTDIR/usr/share/gtk-doc +} + +gcab-devel_package() { + depends="${sourcepkg}>=${version}_${revision} glib-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 792fadb75b1731b9193729e04734b8987a834ef1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 11 May 2017 00:14:54 +0200 Subject: [PATCH 0439/1145] New package: appstream-glib-0.6.13 --- srcpkgs/appstream-glib-devel | 1 + srcpkgs/appstream-glib/template | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 120000 srcpkgs/appstream-glib-devel create mode 100644 srcpkgs/appstream-glib/template diff --git a/srcpkgs/appstream-glib-devel b/srcpkgs/appstream-glib-devel new file mode 120000 index 0000000000..a9ae197f2f --- /dev/null +++ b/srcpkgs/appstream-glib-devel @@ -0,0 +1 @@ +appstream-glib \ No newline at end of file diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template new file mode 100644 index 0000000000..0fdbb482f8 --- /dev/null +++ b/srcpkgs/appstream-glib/template @@ -0,0 +1,34 @@ +# Template file for 'appstream-glib' +pkgname=appstream-glib +version=0.6.13 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool gobject-introspection automake gperf" +# XXX: add libstemmer support +makedepends="gtk+3-devel libyaml-devel gcab-devel libsoup-devel libarchive-devel + json-glib-devel" +short_desc="Install and update applications" +maintainer="Enno Boland " +license="GPL-2" +homepage="https://people.freedesktop.org/~hughsient/appstream-glib/" +distfiles="$homepage/releases/$pkgname-$version.tar.xz" +checksum=1a3734b2cdaab55ad63c6e3ee31026fdceb122cecae39f9f7126a0305e8836bf + +pre_build() { + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool +} + +post_install() { + rm -r $DESTDIR/usr/share/gtk-doc +} + +appstream-glib-devel_package() { + depends="${sourcepkg}>=${version}_${revision} libarchive-devel gcab-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 38f14e8f226b3cb988d2b98ae1e69f65b93aabc7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 08:58:18 +0200 Subject: [PATCH 0440/1145] New package: gnome-characters-3.22.0 --- srcpkgs/gnome-characters/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/gnome-characters/template diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template new file mode 100644 index 0000000000..b819ab19aa --- /dev/null +++ b/srcpkgs/gnome-characters/template @@ -0,0 +1,19 @@ +# Template file for 'gnome-characters' +pkgname=gnome-characters +version=3.22.0 +revision=1 +lib32disabled=yes +build_style=gnu-configure +hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)" +makedepends="gjs-devel gtk+3-devel libunistring-devel glib-devel" +short_desc="utility to find and insert unusual characters for GNOME." +maintainer="Enno Boland " +homepage="https://wiki.gnome.org/Apps/Characters" +license="GPL-2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" +checksum=0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi From a249d9f887ecb3e02d6d4f6a4427c9d241d59052 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 09:17:30 +0200 Subject: [PATCH 0441/1145] epiphany: update to 3.24.2. --- srcpkgs/epiphany/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 2c001cd0e5..b7cf616698 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,7 +1,7 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.24.1 -revision=2 +version=3.24.2 +revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils @@ -18,4 +18,4 @@ maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=21255f8459eb80fc6e011fc6cac8fa61bb939d626117989495eeaeac994d89dc +checksum=5abc0d0c60591df5236ac9b8979dc9f7d9acbb8ad0902b4772d2b7beea81c58d From 31c2eee6c82b7683c8594788f7be9c8dc43238f6 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 09:34:46 +0200 Subject: [PATCH 0442/1145] grilo-plugins: update to 0.3.4. --- srcpkgs/grilo-plugins/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index c3537ed13d..40000083fa 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,7 +1,7 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins -version=0.3.3 -revision=2 +version=0.3.4 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-shoutcast --enable-compile-warnings=no" hostmakedepends="pkg-config intltool itstool glib-devel gnome-doc-utils" @@ -16,4 +16,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://live.gnome.org/Grilo" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c +checksum=990282a518968c52f6a67b96c6b708e236a59da1c7c920ed45e6316ab49ddeb5 From 150aaf593b42e63306bb7de67c8d328d4613f790 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 09:34:51 +0200 Subject: [PATCH 0443/1145] gspell: update to 1.5.1. --- srcpkgs/gspell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index 9aa8d9998a..d01a7b181d 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -1,6 +1,6 @@ # Template file for 'gspell' pkgname=gspell -version=1.4.1 +version=1.5.1 revision=1 build_style=gnu-configure configure_args="--disable-static @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://www.gnome.org" distfiles="http://ftp.gnome.org/pub/GNOME/sources//gspell/${version%.*}/gspell-$version.tar.xz" -checksum=442f88fecd7f9e00a6a9d0af2d762744dd3c119217ff11d6739500f75b0f10be +checksum=f56f4881adced86fbc26d21038c28cdf06a1520eaf83c6d7640fc2e04f8a3fcf # Package build options From eee4cadbca1df0c7417013c49e76dcdbe458240e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 09:47:15 +0200 Subject: [PATCH 0444/1145] btrbk: rebuild to add to repository --- srcpkgs/btrbk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template index 4e58360599..8ed7f01928 100644 --- a/srcpkgs/btrbk/template +++ b/srcpkgs/btrbk/template @@ -1,7 +1,7 @@ # Template file for 'btrbk' pkgname=btrbk version=0.25.0 -revision=2 +revision=3 build_style=gnu-makefile depends="perl btrfs-progs openssh pv" short_desc="backup tool for btrfs subvolumes" From 7f0e30f2a8fd9c5effdb98485ca131eb33fbe355 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 10:13:16 +0200 Subject: [PATCH 0445/1145] appstream-glib: fix cross --- srcpkgs/appstream-glib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template index 0fdbb482f8..8e2a7840e7 100644 --- a/srcpkgs/appstream-glib/template +++ b/srcpkgs/appstream-glib/template @@ -3,7 +3,7 @@ pkgname=appstream-glib version=0.6.13 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool gobject-introspection automake gperf" +hostmakedepends="pkg-config intltool gobject-introspection automake gperf gcab" # XXX: add libstemmer support makedepends="gtk+3-devel libyaml-devel gcab-devel libsoup-devel libarchive-devel json-glib-devel" From 08c83b514462bf39852aaa5a59f3ffddc5d6539a Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 12 May 2017 11:23:09 +0200 Subject: [PATCH 0446/1145] terraform: update to 0.9.5. --- srcpkgs/terraform/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index 4e31f0408e..90bfba865e 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,6 +1,6 @@ # Template file for 'terraform' pkgname=terraform -version=0.9.4 +version=0.9.5 revision=1 build_style=go short_desc="A tool for building, changing, and combining infrastructure" @@ -9,7 +9,7 @@ license="MPL-2.0" homepage="https://www.terraform.io/" go_import_path="github.com/hashicorp/$pkgname" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=aeb7ae29a8da6035d995ffb00f767911746165f4cb7432657d361f399370f377 +checksum=93baf92902ae7bb4575344e389f522a593b7cdcc5896f9b1590cd33c5fb6a74b case "${XBPS_TARGET_MACHINE}" in arm*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/1032/steps/shell_3/logs/stdio" ;; From f989f12775ce8bc3a4049a7872fd3672c6ad56e3 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 13 May 2017 10:29:50 +0200 Subject: [PATCH 0447/1145] calibre: update to 2.85.1. --- srcpkgs/calibre/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index f7234a78dc..372126c87b 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=2.84.0 +version=2.85.1 revision=1 hostmakedepends="qt5-qmake python-devel pkg-config python-dateutil python-lxml python-Pillow @@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://calibre-ebook.com" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=75a6c2f142ccee594d6e208c4c7f57e137e2c4f06c81d36d5bc42f0dcdaa76cf +checksum=8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd nocross=yes pycompile_dirs="/usr/lib/calibre/" From 43893d7d6a8ef69c0316739fd4a1f7df9d3a2700 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 13 May 2017 10:33:01 +0200 Subject: [PATCH 0448/1145] yoshimi: update to 1.5.2. --- srcpkgs/yoshimi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index efc6c8c947..a91807ebb4 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -1,6 +1,6 @@ # Template file for 'yoshimi' pkgname=yoshimi -version=1.5.1.1 +version=1.5.2 revision=1 build_style=cmake build_wrksrc=src @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://yoshimi.sourceforge.net" distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz" -checksum=1ef6d0d9aed21b8db3dd1e851c6a14b3cc9a6b0ad3611a083f92abf002db0f70 +checksum=a91dd71e4768aac389484a3703ec8b7ca4950180cd9fad0ba8b60891e2467d94 case "$XBPS_TARGET_MACHINE" in *-musl) broken="https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/10648/steps/shell_3/logs/stdio";; From 20a0d7c9df66374324531df1bbe82465de21bbd8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 11:35:45 +0200 Subject: [PATCH 0449/1145] Revert "clutter: update to 1.26.2." This reverts commit d8068053f9781424dde2d090ccb1d78413309056. clutter applications exit with: (gnome-control-center:7986): Clutter-Gtk-ERROR **: *** Unsupported backend. [1] 7986 trace trap gnome-control-center clutter-1.26.2 fails to correctly check for the X11 backend. --- srcpkgs/clutter/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index d104054b51..bf98c275c4 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,6 +1,7 @@ # Template file for 'clutter' pkgname=clutter -version=1.26.2 +reverts=1.26.2_1 +version=1.26.0 revision=1 build_style=gnu-configure build_options="gir" @@ -16,7 +17,7 @@ maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" -checksum=e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56 +checksum=67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06 if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" From eafc4bfb176d692eb8fe96048784dec9cff01ce1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 12:11:52 +0200 Subject: [PATCH 0450/1145] clutter: fix x11 when GDK_BACKEND isn't set --- .../patches/clutter-x11-startup-error.patch | 39 +++++++++++++++++++ srcpkgs/clutter/template | 7 ++-- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/clutter/patches/clutter-x11-startup-error.patch diff --git a/srcpkgs/clutter/patches/clutter-x11-startup-error.patch b/srcpkgs/clutter/patches/clutter-x11-startup-error.patch new file mode 100644 index 0000000000..8612c8a775 --- /dev/null +++ b/srcpkgs/clutter/patches/clutter-x11-startup-error.patch @@ -0,0 +1,39 @@ +The following patch reverts this change as it breaks gnome with x11 which +is still the default with void linux: + +From 55093e304ec0c8cdc287ed933f4d78ca6eea5e07 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Mon, 29 Feb 2016 19:50:43 +0100 +Subject: [PATCH] backend: check for wayland before x11 + +this way, clutter-gtk applications work fine on wayland +without the need of exporting CLUTTER_BACKEND=wayland +as gtk+ checks for wayland and x11 in the same order + +https://bugzilla.gnome.org/show_bug.cgi?id=762888 + +Signed-off-by: Marc-Antoine Perennou +--- + clutter/clutter-backend.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c +index d150e7c..b4e5f82 100644 +--- clutter/clutter-backend.c ++++ clutter/clutter-backend.c +@@ -545,12 +545,12 @@ static const struct { + #ifdef CLUTTER_WINDOWING_GDK + { CLUTTER_WINDOWING_GDK, clutter_backend_gdk_new }, + #endif ++#ifdef CLUTTER_WINDOWING_X11 ++ { CLUTTER_WINDOWING_X11, clutter_backend_x11_new }, ++#endif + #ifdef CLUTTER_WINDOWING_WAYLAND + { CLUTTER_WINDOWING_WAYLAND, clutter_backend_wayland_new }, + #endif +-#ifdef CLUTTER_WINDOWING_X11 +- { CLUTTER_WINDOWING_X11, clutter_backend_x11_new }, +-#endif + #ifdef CLUTTER_WINDOWING_EGL + { CLUTTER_WINDOWING_EGL, clutter_backend_egl_native_new }, + #endif diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index bf98c275c4..3b5f18eecd 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,8 +1,7 @@ # Template file for 'clutter' pkgname=clutter -reverts=1.26.2_1 -version=1.26.0 -revision=1 +version=1.26.2 +revision=2 build_style=gnu-configure build_options="gir" configure_args="$(vopt_enable gir introspection) --enable-evdev --enable-evdev-input @@ -17,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" -checksum=67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06 +checksum=e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56 if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" From a7babff56c7eadb10f36959c431a4908ce9442a7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 13 May 2017 12:12:54 +0200 Subject: [PATCH 0451/1145] clutter-gtk: fix short_desc --- srcpkgs/clutter-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template index e8bf6b6282..819405eb61 100644 --- a/srcpkgs/clutter-gtk/template +++ b/srcpkgs/clutter-gtk/template @@ -1,12 +1,12 @@ # Template file for 'clutter-gtk' pkgname=clutter-gtk version=1.8.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel clutter-devel" -short_desc="GTK+3 bindings for the Clutter Tolkit" +short_desc="GTK+3 bindings for the Clutter Toolkit" maintainer="Juan RP " homepage="http://clutter-project.org/" license="LGPL-2.1" From fb0549d864064535e8884dda6e149911fdc1d232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 13 May 2017 13:18:45 +0200 Subject: [PATCH 0452/1145] aisleriot: update to 3.22.2 --- srcpkgs/aisleriot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template index cbfe18c459..56ff5045cd 100644 --- a/srcpkgs/aisleriot/template +++ b/srcpkgs/aisleriot/template @@ -1,6 +1,6 @@ # Template file for 'aisleriot' pkgname=aisleriot -version=3.22.1 +version=3.22.2 revision=1 _pysol_cardsets=PySolFC-Cardsets _pysol_ver=2.0 @@ -15,5 +15,5 @@ license="GPL-2" homepage="https://wiki.gnome.org/Apps/Aisleriot" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz ${SOURCEFORGE_SITE}/pysolfc/${_pysol_cardsets}/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2" -checksum="52b11114205f901e63c8e1e8aacd317dd7fb50217061bc2cdabba339d3c0cd07 +checksum="bd312f15a2212851f0c80f997c6acbaaaa10f0f5ec544099d5c7c4b74f8e0c29 c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7" From ecedf93fd52d030ee6086f0ea7301449d8432f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 13 May 2017 14:24:55 +0200 Subject: [PATCH 0453/1145] libgdal: update to 2.2.0 --- srcpkgs/libgdal/patches/jasper-1.900.27.patch | 22 +++++++++---------- srcpkgs/libgdal/template | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/libgdal/patches/jasper-1.900.27.patch b/srcpkgs/libgdal/patches/jasper-1.900.27.patch index b68e1cb118..708d54aefe 100644 --- a/srcpkgs/libgdal/patches/jasper-1.900.27.patch +++ b/srcpkgs/libgdal/patches/jasper-1.900.27.patch @@ -1,11 +1,11 @@ ---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2016-10-24 11:00:33.000000000 +0000 -+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-11-13 09:38:17.714513103 +0000 -@@ -209,7 +209,7 @@ - /* The buffer must be large enough to accommodate maximum - putback. */ - assert(bufsize > JAS_STREAM_MAXPUTBACK); -- stream->bufbase_ = JAS_CAST(uchar *, buf); -+ stream->bufbase_ = JAS_CAST(jas_uchar *, buf); - stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK; - } - } else { +--- frmts/jpeg2000/jpeg2000_vsil_io.cpp 2017-04-28 18:07:35.000000000 +0200 ++++ frmts/jpeg2000/jpeg2000_vsil_io.cpp 2017-05-13 13:47:12.058749833 +0200 +@@ -207,7 +207,7 @@ + /* The buffer must be large enough to accommodate maximum + putback. */ + assert(bufsize > JAS_STREAM_MAXPUTBACK); +- stream->bufbase_ = JAS_CAST(uchar *, buf); ++ stream->bufbase_ = JAS_CAST(jas_uchar *, buf); + stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK; + } + } else { diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index f657d87f5b..ed864740ac 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,6 +1,6 @@ # Template file for 'libgdal' pkgname=libgdal -version=2.1.3 +version=2.2.0 revision=1 wrksrc=gdal-${version} build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller " license="MIT" homepage="http://www.gdal.org/" distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005 +checksum=0d4c326862e0f118e17418c042c2bcd037b25abd3fb198e1fc5d40b11a9fc8ea post_install() { vinstall gdal.pc 644 usr/lib/pkgconfig From 95a95c8878075f4a6e4e561a7c7eb70203197c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 13 May 2017 15:20:23 +0200 Subject: [PATCH 0454/1145] tslib: update to 1.10 --- srcpkgs/tslib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tslib/template b/srcpkgs/tslib/template index 8e9a13d262..7c9edaec58 100644 --- a/srcpkgs/tslib/template +++ b/srcpkgs/tslib/template @@ -1,6 +1,6 @@ # Template file for 'tslib' pkgname=tslib -version=1.9 +version=1.10 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://github.com/kergoth/tslib" distfiles="https://github.com/kergoth/tslib/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=af4e40a4cf2aa7a81f1602de1613190a101760689709103cc3590132266ac7b8 +checksum=26ce1df4647dc8d16f6247062f30a8a03c34165dd19e042d0b2df8860da265b2 pre_configure() { sed -i configure.ac -e "5iAC_CONFIG_MACRO_DIRS([m4/internal])" From 9911c27b8134adcd8ad71f2d2a4530450fec0b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 13 May 2017 15:48:36 +0200 Subject: [PATCH 0455/1145] opencollada: update to 1.6.47 --- srcpkgs/opencollada/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template index 1de8625ea5..e6b728807b 100644 --- a/srcpkgs/opencollada/template +++ b/srcpkgs/opencollada/template @@ -1,6 +1,6 @@ # Template file for 'opencollada' pkgname=opencollada -version=1.6.45 +version=1.6.47 revision=1 wrksrc="OpenCOLLADA-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://github.com/KhronosGroup/OpenCOLLADA" distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=29c04320a34bf704a3a6716c3ca233bd9b435382bd493a7c52bc4dc64e53a5ae +checksum=cba45eb0894e4eb8351f98cf699e51174817a2fdfb95e73b5f0942833e68f46c CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" if [ -n "$CROSS_BUILD" ]; then From c02f754fd031c1b5a6d5e7af67611f2b6f84047c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 13 May 2017 16:58:55 +0200 Subject: [PATCH 0456/1145] lollypop: update to 0.9.233 --- srcpkgs/lollypop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 23b35d9647..7a52fcca70 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,6 +1,6 @@ # Template file for 'lollypop' pkgname=lollypop -version=0.9.231 +version=0.9.233 revision=1 build_style=gnu-configure noarch=yes @@ -15,4 +15,4 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://gnumdk.github.io/lollypop-web/" distfiles="https://github.com/gnumdk/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=d30040fd45d7c0d61e5d89d3564e0171cad3b4ce7d2fee7283065638e1d4e964 +checksum=98e3c2d782673e690c0015ea5e3d64971761d4d8199ce5659382232324403445 From 7f86d72cc2d187cbf9d217b9c50755ff9dfa5dbe Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 13 May 2017 15:05:12 +0000 Subject: [PATCH 0457/1145] weechat: update to 1.8. --- srcpkgs/weechat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index ff71d97ecf..e9850cfafb 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,6 +1,6 @@ # Template file for 'weechat' pkgname=weechat -version=1.7.1 +version=1.8 revision=1 lib32disabled=yes build_style=cmake @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.weechat.org" distfiles="${homepage}/files/src/$pkgname-$version.tar.bz2" -checksum=c0f9786cdfcf7411bfadca828c5e0819ac641717f775da804d8fa2aa69a84080 +checksum=087c44282e499bb0faf2d3e793ca4b2e714113d24040139cd1353d7a06017582 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua" if [ -z "$CROSS_BUILD" ]; then From bba4a83f0f2beba6b1387ffc94a453f3e4c7c969 Mon Sep 17 00:00:00 2001 From: cr6git Date: Sat, 13 May 2017 20:26:24 +0200 Subject: [PATCH 0458/1145] intel-ucode: update to 20170511 --- srcpkgs/intel-ucode/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index 558d49f7cc..a874e60d64 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,15 +1,15 @@ # Template file for 'intel-ucode' pkgname=intel-ucode -version=20161104 -revision=2 +version=20170511 +revision=1 noarch=yes create_wrksrc=yes short_desc="Microcode update files for Intel CPUs" maintainer="Juan RP " license="INTEL Software License Agreement" homepage="http://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22microcode%22" -distfiles="http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz" -checksum=70154ca62ff9b3da6291dfdecc90daaeb399d7290c0d308d719df16dff5ee3d1 +distfiles="http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz" +checksum=2f77fd2d87403b754d01a66c78a36a8b8ffc16dc3c50fb7aa2c4cd4da7f681a3 only_for_archs="i686 x86_64 i686-musl x86_64-musl" From ff923f4af6985a7ae0e41192712ba8c62b8540a1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 13 May 2017 19:22:51 +0000 Subject: [PATCH 0459/1145] glib: fix high cpu load in some apps Closes #6388 Fixes #6375 --- ...233476d61771b4d67d50bec5420f551ef922.patch | 103 ++++++++++++++++++ srcpkgs/glib/template | 2 +- 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glib/patches/5d74233476d61771b4d67d50bec5420f551ef922.patch diff --git a/srcpkgs/glib/patches/5d74233476d61771b4d67d50bec5420f551ef922.patch b/srcpkgs/glib/patches/5d74233476d61771b4d67d50bec5420f551ef922.patch new file mode 100644 index 0000000000..42fbc61f08 --- /dev/null +++ b/srcpkgs/glib/patches/5d74233476d61771b4d67d50bec5420f551ef922.patch @@ -0,0 +1,103 @@ +From 5d74233476d61771b4d67d50bec5420f551ef922 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 4 Apr 2017 09:56:47 +0200 +Subject: [PATCH] gmain: only signal GWakeup right before or during a blocking + poll + +Since commit e4ee307 ("Do not wake up main loop if change is from same +thread", bug 761102), GMainContext uses context->owner to decide if the +event loop is being run in the current thread. However, what really +matters is the phase in the prepare/query/poll/check/dispatch sequence. +Wakeups are only needed between the end of prepare and the end of poll, +and then only if prepare found that no sources were ready. + +There is no need to take threads into account, because prepare, check +and all callers of conditional_wakeup all look at the new need_wakeup +flag inside LOCK_CONTEXT/UNLOCK_CONTEXT. + +With this change, g_main_context_is_owner and g_main_context_wait are +the only functions for which acquire/release matters, just like before +commit e4ee307. + +Signed-off-by: Paolo Bonzini +--- + glib/gmain.c | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +diff --git a/glib/gmain.c b/glib/gmain.c +index ab2908e..af0a29a 100644 +--- glib/gmain.c ++++ glib/gmain.c +@@ -277,7 +277,8 @@ struct _GMainContext + + guint next_id; + GList *source_lists; +- gint in_check_or_prepare; ++ gboolean in_check_or_prepare; ++ gboolean need_wakeup; + + GPollRec *poll_records; + guint n_poll_records; +@@ -651,6 +652,7 @@ g_main_context_new (void) + + context->pending_dispatches = g_ptr_array_new (); + ++ context->need_wakeup = FALSE; + context->time_is_fresh = FALSE; + + context->wakeup = g_wakeup_new (); +@@ -1127,17 +1129,11 @@ source_remove_from_context (GSource *source, + static void + conditional_wakeup (GMainContext *context) + { +- /* We want to signal wakeups in two cases: +- * 1 When the context is owned by another thread +- * 2 When the context owner is NULL (two subcases) +- * 2a Possible if the context has never been acquired +- * 2b Or if the context has no current owner +- * +- * At least case 2a) is necessary to ensure backwards compatibility with +- * qemu's use of GMainContext. +- * https://bugzilla.gnome.org/show_bug.cgi?id=761102#c14 ++ /* This flag is set if at the start of prepare() we have no other ready ++ * sources, and hence would wait in poll(). In that case, any other threads ++ * attaching sources will need to signal a wakeup. + */ +- if (context->owner != G_THREAD_SELF) ++ if (context->need_wakeup) + g_wakeup_signal (context->wakeup); + } + +@@ -3469,6 +3465,10 @@ g_main_context_prepare (GMainContext *context, + + LOCK_CONTEXT (context); + ++ /* context->need_wakeup is protected by LOCK_CONTEXT/UNLOCK_CONTEXT, ++ * so need not set it yet. ++ */ ++ + context->time_is_fresh = FALSE; + + if (context->in_check_or_prepare) +@@ -3594,6 +3594,8 @@ g_main_context_prepare (GMainContext *context, + } + } + g_source_iter_clear (&iter); ++ /* See conditional_wakeup() where this is used */ ++ context->need_wakeup = (n_ready == 0); + + TRACE (GLIB_MAIN_CONTEXT_AFTER_PREPARE (context, current_priority, n_ready)); + +@@ -3728,6 +3730,12 @@ g_main_context_check (GMainContext *context, + + TRACE (GLIB_MAIN_CONTEXT_BEFORE_CHECK (context, max_priority, fds, n_fds)); + ++ /* We don't need to wakeup during check or dispatch, because ++ * all sources will be re-evaluated during prepare/query. ++ */ ++ context->need_wakeup = FALSE; ++ ++ /* And if we have a wakeup pending, acknowledge it */ + for (i = 0; i < n_fds; i++) + { + if (fds[i].fd == context->wake_up_rec.fd) diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index f2340516c2..76bc8f2a86 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template build file for 'glib' pkgname=glib version=2.52.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-libelf --disable-fam --with-pcre=system --enable-static" hostmakedepends="automake libtool pkg-config perl python libxslt docbook-xsl" From af79570068d3431a72f2f338edeff80c96fa44ca Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 14 May 2017 08:03:13 +0200 Subject: [PATCH 0460/1145] freetype: update to 2.8. --- srcpkgs/freetype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index 0c20a602df..dd6fe2c823 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -1,6 +1,6 @@ # Template build file 'freetype'. pkgname=freetype -version=2.7.1 +version=2.8 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.freetype.org/" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88 +checksum=a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b build_options="v35 v38 v40" build_options_default="v40" From 988c0cb0665943b780e5d83134b276411aafc384 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sat, 13 May 2017 23:45:13 -0700 Subject: [PATCH 0461/1145] go-ipfs: update to 0.4.9. And remove the install message. Not really relevant anymore. Closes: #6390 [via git-merge-pr] --- srcpkgs/go-ipfs/INSTALL.msg | 3 --- srcpkgs/go-ipfs/template | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 srcpkgs/go-ipfs/INSTALL.msg diff --git a/srcpkgs/go-ipfs/INSTALL.msg b/srcpkgs/go-ipfs/INSTALL.msg deleted file mode 100644 index 762dc9f8d3..0000000000 --- a/srcpkgs/go-ipfs/INSTALL.msg +++ /dev/null @@ -1,3 +0,0 @@ -Please note that go-ipfs 0.4.0 introduces a change that breaks compatibility -with earlier versions at the networking layer. Thus, it will be unable to -communicate with peers running versions of go-ipfs older than 0.4.0. diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template index c7168501f8..d530dc7a9d 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -1,7 +1,7 @@ # Template file for 'go-ipfs' pkgname=go-ipfs -version=0.4.8 -revision=2 +version=0.4.9 +revision=1 create_wrksrc=yes build_wrksrc=${pkgname}-${version} build_style=go @@ -14,8 +14,8 @@ license="MIT" homepage="https://ipfs.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz http://the-brannons.com/ipfs-gx-deps-${version}.tar.xz" -checksum="a5b5556374b30d162e79858f8ead475d7d073a6f862d6fb85afa6148c62541fa - 19ba225a56c7238ea8b304222f623db14f0b6294cd86e4eb23baf43e54d7cb12" +checksum="922d88170d203b7f644b3cd1df50fb212c9a3f7062411ad2d17335f191ee69d8 + dae7bad8f0ac7e904dbd050b3b091aa1fe9926384bc88cd7839efae47b721698" do_build() { local path="${GOPATH}/src/${go_import_path}" From c0b05b4ed85a675e353ae46daa4d516184d803cf Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 08:13:25 +0000 Subject: [PATCH 0462/1145] wxWidgets: update to 3.0.3. --- .../patches/fix-gcc6-disambiguate-abs.patch | 14 -------------- srcpkgs/wxWidgets/template | 8 ++++---- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/wxWidgets/patches/fix-gcc6-disambiguate-abs.patch diff --git a/srcpkgs/wxWidgets/patches/fix-gcc6-disambiguate-abs.patch b/srcpkgs/wxWidgets/patches/fix-gcc6-disambiguate-abs.patch deleted file mode 100644 index dfdf86806a..0000000000 --- a/srcpkgs/wxWidgets/patches/fix-gcc6-disambiguate-abs.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/stc/scintilla/src/Editor.cxx 2014-10-06 23:33:44.000000000 +0200 -+++ src/stc/scintilla/src/Editor.cxx 2016-09-18 15:34:29.359258750 +0200 -@@ -5841,9 +5841,9 @@ - } - - static bool Close(Point pt1, Point pt2) { -- if (abs(pt1.x - pt2.x) > 3) -+ if (abs(static_cast(pt1.x - pt2.x)) > 3) - return false; -- if (abs(pt1.y - pt2.y) > 3) -+ if (abs(static_cast(pt1.y - pt2.y)) > 3) - return false; - return true; - } diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index 98d1e5bbb2..4f9c2d91ec 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets' pkgname=wxWidgets -version=3.0.2 -revision=6 +version=3.0.3 +revision=1 build_style=gnu-configure configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify" @@ -12,8 +12,8 @@ homepage="http://www.wxwidgets.org/" hostmakedepends="pkg-config" makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel libXinerama-devel libmspack-devel SDL-devel glu-devel webkitgtk2-devel" -distfiles="${SOURCEFORGE_SITE}/wxwindows/${version}/${pkgname}-${version}.tar.bz2" -checksum=346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d +distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" +checksum=08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b # Cross compiling works, but then wx-config is wrong for native builds # on target. From 4938cac55e5e71abc32fad569b2a9051c0f782c4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:43 +0000 Subject: [PATCH 0463/1145] ImageMagick: update to 6.9.8.5. --- srcpkgs/ImageMagick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 541da48ede..ead6cf0f39 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=6.9.8 -_patchver=4 +_patchver=5 version=${_majorver}.${_patchver} revision=1 wrksrc=${pkgname}-${_majorver}-${_patchver} @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.imagemagick.org/" license="ImageMagick" distfiles="http://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" -checksum=a6c24f6badc30ba624f1dda14e7927fa3109dea7dd6a7e4408e127f65107cb11 +checksum=33404592e3c11f1887dafc0ee0f5161ba89ed3d5c9198a877ac90c94edb87856 subpackages="libmagick libmagick-devel" From 1df765fd08af996d53220c3219725771e2f93c06 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:18 +0000 Subject: [PATCH 0464/1145] slit: update to 1.1.5. --- srcpkgs/slit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template index 95908bdb53..cd6e7bd32c 100644 --- a/srcpkgs/slit/template +++ b/srcpkgs/slit/template @@ -1,6 +1,6 @@ # Template file for 'slit' pkgname=slit -version=1.1.4 +version=1.1.5 revision=1 build_style=go go_import_path="github.com/tigrawap/slit" @@ -10,7 +10,7 @@ license="MIT" hostmakedepends="git" homepage="https://github.com/tigrawap/slit" distfiles="https://github.com/tigrawap/slit/archive/${version}.tar.gz" -checksum=59f01c25b21ffc1659e9ce8008e6dbe1e4a9a605d1ab2f5cacd1395a13624abb +checksum=8bc3bf6da6dd94a0b873eef91c94f6d74d7f9acf0925450823ff0443b62aa2ea post_install() { vlicense LICENSE From b9952d85ad299dab5f07a5a1cf1c83bac67133cc Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:22 +0000 Subject: [PATCH 0465/1145] youtube-dl: update to 2017.05.14. --- 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 cb5ea7db80..35dc33f5f6 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.05.09 +version=2017.05.14 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=b9af1b8f5b8b245fe46348e7743cf01d323f927e32bd7a98dfdfc83b2866df15 +checksum=363e8f16752dfc35730351d3ead56ebd34ffa394864f7aa00ebf07d6ec5e8793 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From 32e95ad1d9104985678904ff6678cb3e8a7bcbd6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:27 +0000 Subject: [PATCH 0466/1145] s3fs-fuse: update to 1.82. --- srcpkgs/s3fs-fuse/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template index f63267a85c..33acb49404 100644 --- a/srcpkgs/s3fs-fuse/template +++ b/srcpkgs/s3fs-fuse/template @@ -1,7 +1,7 @@ # Template file for 's3fs-fuse' pkgname=s3fs-fuse -version=1.80 -revision=3 +version=1.82 +revision=1 build_style=gnu-configure configure_args="--with-openssl ac_cv_file__git=no" hostmakedepends="automake libtool pkg-config" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2.1" homepage="https://github.com/s3fs-fuse/s3fs-fuse/wiki" distfiles="https://github.com/s3fs-fuse/s3fs-fuse/archive/v${version}.tar.gz" -checksum=de8381c9bd73e491904e73561882dc91e5fad9c28fe88834a93d7b4fe12cbd35 +checksum=8a40f0b11b558b6d733eeff4fcc025cc416df37b6732001bb0c630f6d6d760dd pre_configure() { NOCONFIGURE=1 ./autogen.sh From 720c16e65d7729c255562fcf38113850e3f3e6c3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:32 +0000 Subject: [PATCH 0467/1145] poedit: update to 2.0.2. --- srcpkgs/poedit/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 8e55f03a82..9221dd964c 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -1,7 +1,7 @@ # Template file for 'poedit' pkgname=poedit -version=2.0.1 -revision=3 +version=2.0.2 +revision=1 build_style=gnu-configure configure_args="--with-wx-config=wx-config-3.0" hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.poedit.net/" distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz" -checksum=8766874175b2221ef670d89b32f0fe900cde3e27e5dcb2c1b6cf6d01e8d56ff3 +checksum=b88bc222d4215344d0eb87dda19aafcc0b2465718c4b556015330beb96f7b402 CPPFLAGS="-DUCHAR_TYPE=uint16_t" From 27cbdc7ab6d39b35277fc8ad8ba8aeec6471af79 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:36 +0000 Subject: [PATCH 0468/1145] exiftool: update to 10.52. --- srcpkgs/exiftool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 372b0bee73..5dc0691473 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.51 +version=10.52 revision=1 noarch=yes wrksrc="Image-ExifTool-${version}" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" license="Artistic, GPL-1" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" -checksum=0a9d4cec4700e974df4ec5ff537aa2f783399a0ee595e646d665144198073fcf +checksum=ffd50444efab6141b1bf7373b194dc023272a98fec79b4c6fec4f42e6d08ad22 From bb7f06539e4dd05d3461a3bc85ce3ab023990df9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 07:46:39 +0000 Subject: [PATCH 0469/1145] cppcheck: update to 1.79. --- srcpkgs/cppcheck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 7496ed0f09..90695e5d79 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -1,6 +1,6 @@ # Template file for 'cppcheck' pkgname=cppcheck -version=1.78 +version=1.79 revision=1 hostmakedepends="libxslt docbook-xsl" short_desc="Static analysis of C/C++ code" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://cppcheck.sourceforge.net" distfiles="https://github.com/danmar/cppcheck/archive/$version.tar.gz" -checksum=31048901dd8744d12b3e6ac1bc904c08a72cad8118bd6a1f56ce489701ffd1b6 +checksum=9c222fb41452fa40020233ef3c314f8e43c01600f08d9a03d3584cd121a0c7e1 CXXFLAGS="-std=c++11" From c54b2174d9f995eed2c6d0314815a0153878dcc1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 09:12:16 +0000 Subject: [PATCH 0470/1145] thefuck: update to 3.18. --- srcpkgs/thefuck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 5e2d2a0ab1..33774c31cf 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,6 +1,6 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.16 +version=3.18 revision=1 build_style=python2-module pycompile_module="thefuck" @@ -13,7 +13,7 @@ maintainer='Benjamin "Doctors" Hoffmeyer ' license="MIT" homepage="https://github.com/nvbn/thefuck" distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz" -checksum=536582810a522144c8bc1ce69b3882979841af1b7aa61e9b245d2b216b77304b +checksum=c6175c45ac82b1abe552f28a05b9b369f864a763d4d60178c1fde584209e5bf7 post_install() { vlicense LICENSE.md From 48c0264264b4dcba142df3fa70c5a96aabd75b12 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 09:25:45 +0000 Subject: [PATCH 0471/1145] dialog: update to 1.3.20170509. --- srcpkgs/dialog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index 2582dccfe6..a53a4b328d 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -1,7 +1,7 @@ # Template file for 'dialog' pkgname=dialog _distver=1.3 -_date=20170131 +_date=20170509 version=${_distver}.${_date} revision=1 wrksrc=${pkgname}-${_distver}-${_date} @@ -13,7 +13,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://invisible-island.net/dialog/" distfiles="ftp://invisible-island.net/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" -checksum=81baec14cb7d76951763576ec276210b3a869e768ad5e2e6ee1cc53420ece8c9 +checksum=2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756 post_install() { rm -r ${DESTDIR}/usr/lib From 54d7f38b1271007bf09f829e25e379e827339a4b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 09:28:02 +0000 Subject: [PATCH 0472/1145] glog: update to 0.3.5. --- srcpkgs/glog/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/glog/template b/srcpkgs/glog/template index 6b5418b956..d3035de6db 100644 --- a/srcpkgs/glog/template +++ b/srcpkgs/glog/template @@ -1,14 +1,14 @@ # Template build file for 'glog' pkgname=glog -version=0.3.4 -revision=2 +version=0.3.5 +revision=1 build_style=gnu-configure short_desc="Logging library for C++" maintainer="John Regan " license="3-clause-BSD" homepage="https://github.com/google/glog" distfiles="$homepage/archive/v${version}.tar.gz" -checksum="ce99d58dce74458f7656a68935d7a0c048fa7b4626566a71b7f4e545920ceb10" +checksum=7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0 glog-devel_package() { short_desc+=" - development files" From ae30b0e26268d24901d580e71f909bae3190cacf Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 09:35:12 +0000 Subject: [PATCH 0473/1145] wxWidgets: fix update-check --- srcpkgs/wxWidgets/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/wxWidgets/update diff --git a/srcpkgs/wxWidgets/update b/srcpkgs/wxWidgets/update new file mode 100644 index 0000000000..76643c26cf --- /dev/null +++ b/srcpkgs/wxWidgets/update @@ -0,0 +1 @@ +site="https://github.com/wxWidgets/wxWidgets/releases/latest" From 700b682a5472228d5b0813e0ff108dbe19725a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 14 May 2017 12:15:39 +0200 Subject: [PATCH 0474/1145] libreoffice: update to 5.3.3.2 --- srcpkgs/libreoffice/files/musl-fcntl_h.patch | 12 ++++++ srcpkgs/libreoffice/patches/0010-icu-58.patch | 42 ------------------- srcpkgs/libreoffice/template | 26 +++++++----- 3 files changed, 28 insertions(+), 52 deletions(-) create mode 100644 srcpkgs/libreoffice/files/musl-fcntl_h.patch delete mode 100644 srcpkgs/libreoffice/patches/0010-icu-58.patch diff --git a/srcpkgs/libreoffice/files/musl-fcntl_h.patch b/srcpkgs/libreoffice/files/musl-fcntl_h.patch new file mode 100644 index 0000000000..9dd7752f31 --- /dev/null +++ b/srcpkgs/libreoffice/files/musl-fcntl_h.patch @@ -0,0 +1,12 @@ +--- src/common/os/os_utils.h 2016-09-27 10:03:58.000000000 +0200 ++++ src/common/os/os_utils.h 2017-02-04 03:05:37.357148694 +0100 +@@ -29,6 +29,9 @@ + #define INCLUDE_OS_FILE_UTILS_H + + #include ++#if !defined(__GLIBC__) ++#include ++#endif + + #include "../common/classes/fb_string.h" + #include "../common/StatusArg.h" diff --git a/srcpkgs/libreoffice/patches/0010-icu-58.patch b/srcpkgs/libreoffice/patches/0010-icu-58.patch deleted file mode 100644 index 9b0e971d34..0000000000 --- a/srcpkgs/libreoffice/patches/0010-icu-58.patch +++ /dev/null @@ -1,42 +0,0 @@ -Minimal exceprt from upstream fix only to unbreak build - -https://cgit.freedesktop.org/libreoffice/core/commit/?id=3e42714c76b1347babfdea0564009d8d82a83af4 - ---- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2016-05-04 21:28:24 UTC -+++ i18npool/source/breakiterator/breakiterator_unicode.cxx -@@ -64,10 +64,13 @@ BreakIterator_Unicode::~BreakIterator_Un - class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator - { - public: -+#if (U_ICU_VERSION_MAJOR_NUM < 58) -+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. - inline void publicSetBreakType(int32_t type) - { - setBreakType(type); - }; -+#endif - OOoRuleBasedBreakIterator(UDataMemory* image, - UErrorCode &status) - : RuleBasedBreakIterator(image, status) -@@ -143,12 +146,21 @@ void SAL_CALL BreakIterator_Unicode::loa - } - } - if (rbi) { -+#if (U_ICU_VERSION_MAJOR_NUM < 58) -+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private -+ // instead of protected, so the old workaround of -+ // https://ssl.icu-project.org/trac/ticket/5498 -+ // doesn't work anymore. However, they also claim to have fixed -+ // the cause that an initial fBreakType==-1 would lead to an -+ // endless loop under some circumstances. -+ // Let's see ... - switch (rBreakType) { - case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break; - case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break; - case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break; - case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break; - } -+#endif - icuBI->aBreakIterator = rbi; - } - } diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 63e736b90d..702d2fc57b 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,14 +1,14 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=5.2.5.1 -revision=7 +version=5.3.3.2 +revision=1 build_style=gnu-configure configure_args="--disable-werror" nopie=yes nocross=yes # -# XXX: mit-krb5-devel nasm openjdk hamcrest iwyu ogl-math +# XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math # Missing, required libraries are downloaded and built internally # hostmakedepends="automake libtool pkg-config bison flex gperf icu @@ -19,9 +19,9 @@ makedepends="apr-devel boost-devel cups-devel libcurl-devel libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-devel MesaLib-devel nss-devel python3-devel libressl-devel libgcrypt-devel libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-devel - liborcus11-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel + liborcus-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-devel - libcmis-devel libcppunit-devel libe-book-devel libfbclient-devel libfreehand-devel + libcmis-devel libcppunit-devel libe-book-devel libfreehand-devel libexttextcat-devel liblangtag-devel libldap-devel libmspub-devel libmwaw-devel glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel libpagemaker-devel librevenge-devel libvisio-devel libetonyek-devel libwpd-devel libwpg-devel @@ -58,10 +58,10 @@ distfiles=" ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip " checksum=" - 9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300 - a892f933b7da5dda3e4c5d399096cde77d75c4beb8bdf6ea64442ab6890dc357 - 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 - abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353 + 9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a + 06c604794a33de125d08e3abf68a6326720304e4a9e8b5e82aad5c99eed88a21 + f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 + 7f2d8da74b744bf7749602207b41c92225527ac34a2170601dd4fb9065bba6af cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d @@ -123,6 +123,11 @@ pre_configure() { -i bin/distro-install-desktop-integration sed -e "/distro-install-file-lists/d" -i Makefile.in chmod +x bin/unpack-sources + mkdir -p external/firebird + # Add musl patch + cp ${FILESDIR}/musl-fcntl_h.patch external/firebird/ + sed -i external/firebird/UnpackedTarball_firebird.mk \ + -e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-fcntl_h.patch\2;' } do_configure() { @@ -227,7 +232,8 @@ do_configure() { configure_args+=" --with-system-openssl" configure_args+=" --with-system-neon" configure_args+=" --with-system-postgresql" - configure_args+=" --with-system-firebird" + # Firebird-3.0.1 does not work with libreoffice + # configure_args+=" --with-system-firebird" configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen" configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}" From ee3b09c91c23be5762f730cf5fc8705b6aa6ff84 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 14 May 2017 16:58:46 +0200 Subject: [PATCH 0475/1145] linux4.11: update to 4.11.1. --- srcpkgs/linux4.11/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux4.11/template b/srcpkgs/linux4.11/template index 256452fe75..0a2f53c5e8 100644 --- a/srcpkgs/linux4.11/template +++ b/srcpkgs/linux4.11/template @@ -1,6 +1,6 @@ # Template file for 'linux4.11' pkgname=linux4.11 -_distver=4.11.0 +_distver=4.11.1 version=${_distver} revision=1 patch_args="-Np1" From f770ee9f93f65e4e8c19002850789ef54eb381bc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 14 May 2017 18:11:19 +0200 Subject: [PATCH 0476/1145] linux4.11: fix distfile --- srcpkgs/linux4.11/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/linux4.11/template b/srcpkgs/linux4.11/template index 0a2f53c5e8..59613d0751 100644 --- a/srcpkgs/linux4.11/template +++ b/srcpkgs/linux4.11/template @@ -1,16 +1,15 @@ # Template file for 'linux4.11' pkgname=linux4.11 -_distver=4.11.1 -version=${_distver} -revision=1 +version=4.11.1 +revision=2 patch_args="-Np1" -wrksrc="linux-${_distver%.*}" +wrksrc="linux-${version}" maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" -distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${_distver%.*}.tar.xz" -checksum=b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6 +distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" +checksum=7e46f9e216907942b0b07f2bb59708dc33501d4e2a0938164396386ebd21e608 nodebug=yes # -dbg package is generated below manually nostrip=yes From 4a4ec956ef3e9a87077f8d9a749690b45b884858 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 14 May 2017 15:14:42 +0200 Subject: [PATCH 0477/1145] collectl: update to 4.1.3. --- srcpkgs/collectl/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template index 38a627a334..802897a812 100644 --- a/srcpkgs/collectl/template +++ b/srcpkgs/collectl/template @@ -1,6 +1,6 @@ # Template file for 'collectl' pkgname=collectl -version=4.1.2 +version=4.1.3 revision=1 noarch=yes conf_files="/etc/collectl.conf" @@ -9,8 +9,9 @@ short_desc="Collects data that describes the current system status" maintainer="Leah Neukirchen " license="GPL-2, Artistic" homepage="http://collectl.sourceforge.net/" +_changelog="http://collectl.sourceforge.net/Releases.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz" -checksum=972654e93ffa1ad535c6ef760c55f1ee53323893217aa83d4ad0f5aff824c431 +checksum=c9fa7e4a66fe333471bd485a8008b171fdf431faa79d9b43fa830ae7d6c85bb3 do_install() { export DESTDIR From c1fb00450c131e85ca38186f60076ee894a6f2e1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 14 May 2017 15:18:35 +0200 Subject: [PATCH 0478/1145] schedule: update to 7.5.3. --- srcpkgs/schedule/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/schedule/template b/srcpkgs/schedule/template index 0878a4ce36..48de3ee499 100644 --- a/srcpkgs/schedule/template +++ b/srcpkgs/schedule/template @@ -1,6 +1,6 @@ # Template file for 'schedule' pkgname=schedule -version=7.5.2 +version=7.5.3 revision=1 noarch=yes hostmakedepends="perl" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD" homepage="https://github.com/vaeth/schedule/" distfiles="https://github.com/vaeth/schedule/archive/v${version}.tar.gz" -checksum=e4dd7cbce6a7abe905fe9acbda1b32846873254b083da51a97b53374b782be6e +checksum=c9879a96bc7624f2df603209d9227ad7b32f0b57995a015a135033675a2ea9d0 do_install() { for bin in bin/*; do From d462919995bf4b80ad250bd022854d075db1a7f8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 14 May 2017 19:02:10 +0200 Subject: [PATCH 0479/1145] polyml: update to 5.7. --- srcpkgs/polyml/patches/poly-aarch64.patch | 42 ----------------------- srcpkgs/polyml/template | 14 ++++---- 2 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/polyml/patches/poly-aarch64.patch diff --git a/srcpkgs/polyml/patches/poly-aarch64.patch b/srcpkgs/polyml/patches/poly-aarch64.patch deleted file mode 100644 index e7b2ae10c6..0000000000 --- a/srcpkgs/polyml/patches/poly-aarch64.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- config.h.in 2014-02-19 14:11:05.000000000 +0000 -+++ config.h.in 2015-07-09 14:18:31.313388000 +0000 -@@ -551,6 +551,9 @@ - /* Define if the host is an ARM (32 bit) */ - #undef HOSTARCHITECTURE_ARM - -+/* Define if the host is an ARM (64 bit) */ -+#undef HOSTARCHITECTURE_AARCH64 -+ - /* Define if the host is Itanium */ - #undef HOSTARCHITECTURE_IA64 - ---- configure 2014-05-09 10:11:45.000000000 +0000 -+++ configure 2015-07-09 14:18:55.073388000 +0000 -@@ -21306,6 +21306,12 @@ - - polyarch=interpret - ;; -+ aarch64*) -+ -+$as_echo "#define HOSTARCHITECTURE_AARCH64 1" >>confdefs.h -+ -+ polyarch=interpret -+ ;; - ia64*) - - $as_echo "#define HOSTARCHITECTURE_IA64 1" >>confdefs.h ---- libpolyml/elfexport.cpp 2013-10-15 16:25:39.000000000 +0000 -+++ libpolyml/elfexport.cpp 2015-07-09 14:13:35.433388000 +0000 -@@ -344,6 +344,10 @@ - directReloc = R_IA64_DIR64LSB; - fhdr.e_flags = EF_IA_64_ABI64; - useRela = true; -+#elif defined(HOSTARCHITECTURE_AARCH64) -+ fhdr.e_machine = EM_AARCH64; -+ directReloc = R_AARCH64_ABS64; -+ useRela = true; - #else - #error "No support for exporting on this architecture" - #endif - - diff --git a/srcpkgs/polyml/template b/srcpkgs/polyml/template index 6481fa790f..3c1ff9cb66 100644 --- a/srcpkgs/polyml/template +++ b/srcpkgs/polyml/template @@ -1,22 +1,22 @@ # Template file for 'polyml' pkgname=polyml -version=5.5.2 -revision=4 -wrksrc="${pkgname}.${version}" +version=5.7 +revision=1 build_style=gnu-configure configure_args="--with-system-libffi --enable-shared" case "$XBPS_TARGET_MACHINE" in + i686-musl|x86_64-musl) nopie=yes ;; # crash in do_relocs else i686*|x86_64*) ;; - *) configure_args+=" --with-portable" ;; + *) configure_args+=" --disable-native-codegeneration" ;; esac makedepends="gmp-devel libffi-devel" conflicts="mesa-demos>=0" # /usr/bin/poly short_desc="The Poly/ML Standard ML (SML) implementation" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="LGPL-2.1" homepage="http://www.polyml.org/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname.$version.tar.gz" -checksum=73fd2be89f7e3ff0567e27ef525ef788775d9f963d6db54069cb34d53040a682 +distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" +checksum=19340d8e9cea15c3fd786dde27028cd2947608955a376d1317a20268c8a19279 nocross=yes # Since this is a compiler, no -devel package. From d00102b3c90def7cdb14c1775e5de152f306d4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 14 May 2017 19:18:34 +0200 Subject: [PATCH 0480/1145] libreoffice-i18n: update to 5.3.3 --- srcpkgs/libreoffice-i18n/template | 343 +++++++++++++++--------------- 1 file changed, 177 insertions(+), 166 deletions(-) diff --git a/srcpkgs/libreoffice-i18n/template b/srcpkgs/libreoffice-i18n/template index b6578a09f9..93a6d1e2a3 100644 --- a/srcpkgs/libreoffice-i18n/template +++ b/srcpkgs/libreoffice-i18n/template @@ -1,6 +1,6 @@ # Template file for 'libreoffice-i18n' pkgname=libreoffice-i18n -version=5.2.5 +version=5.3.3 revision=1 build_style=meta nocross=yes @@ -11,6 +11,7 @@ license="LGPL-3" homepage="http://www.documentfoundation.org/" _url="http://download.documentfoundation.org/libreoffice/stable/${version}/rpm/x86" _skiplang="en-US de es fr it pl pt" +# ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_am.tar.gz distfiles=" ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_am.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_helppack_ast.tar.gz @@ -83,6 +84,7 @@ distfiles=" ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_br.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_brx.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_bs.tar.gz + ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ca-valencia.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ca.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_cs.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_cy.tar.gz @@ -104,6 +106,7 @@ distfiles=" ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_gd.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_gl.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_gu.tar.gz + ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_gug.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_he.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_hi.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_hr.tar.gz @@ -115,6 +118,7 @@ distfiles=" ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ka.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kk.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_km.tar.gz + ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kn.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ko.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_kok.tar.gz @@ -154,6 +158,7 @@ distfiles=" ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sk.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sl.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sq.tar.gz + ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sr-Latn.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_sr.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ss.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_st.tar.gz @@ -171,6 +176,7 @@ distfiles=" ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_uk.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_uz.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_ve.tar.gz + ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_vec.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_vi.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_xh.tar.gz ${_url}/LibreOffice_${version}_Linux_x86_rpm_langpack_zh-CN.tar.gz @@ -289,7 +295,7 @@ _languages=( do_build() { for i in $distfiles; do - _localver="${version}.1" + _localver="${version}.2" _tarbname="${i##*/}" _tarbname="${_tarbname%*.tar.gz}" _lang="${_tarbname##*_}" @@ -346,168 +352,173 @@ _pkgtmpl() { } checksum=" -9217c11a647bb5378da97e7edefa956ee372c2a41f2e3bf9ac32b2c88e1830e8 -12116fc95520c82a97c6a08aace02a3828aec3354971dc07441abea01a4843dd -b5343da86ecc5b9e1e7fb2cfe2da253e1d82f4eb0cacd559d5fe3b073939bb3e -761d521b66fdf889699b7e5cfc877d0ff36b63f984787dfed9c03276ace4a708 -9066a125a741bf5ec14fec7a1af41c04ec6451ca1cc1fe456075516a8fd56ff1 -9e0c4f85527696aa35e31eb5ead62c099075d48f9a88f433ffc62b5f95de9cea -67daad480d059ff7f4deb4c16488b52b492741b7611898daf5418636655f1176 -161d03a1e0a10f9887e4cfe1501817814de0b8adc1a6f8d51ddf782e2f37c9b6 -b57650de60cedf8eb57bbab0b2a9c113f1d095abb5ff37d05abf7dc7079c143e -e3951fd31e6a03bf99e957ed7389668f93e7d875860a0df15fd10b7cbcc8e720 -9cdac33ae7fd85b3fb746ffd7270a0e139124709b4d92f08d1a24b84280bc402 -9764895f181001fd95351b08fd0db6cb015ed1ac06448cb5ff0e9e7f99135029 -b8bcc9a8443b5ccad3027f29f5cc4fb206edfa72095456e42f9546e28fd87207 -0d1de6d6900c7be003111e0e4867d0b26285f74063e183aada1bd844451b9c03 -d935b5d0b7ad43282ad8c91d8b7d5a8d25e946b6e66bd36f9a04bec51d023c31 -336afd9c332f3ffc3b01c7473ddb6c17feba9e56e3c5e3b898aceea04b43a0c7 -abc28fbdd3bafed31107dd96b805faebdb8cca09adfc92847e01770eadf069fa -1944c70e97dffe7fb4e7c875c2fcf229d14caf30733200fba9714e90b89541f8 -c0f0f39795686e36d98950a8722c1a1e5b393dd3cec1022a75332083388b080d -ddeaa55e41da9ce7a0b92c598e2aa35e55472d10bf14cb931680574c1e659408 -1967e1c89a55c2db065ac9c7ee5f68a56903229ac498d333b9ab456f5d02ea11 -ead43f9a617b1c724e77eacb3147322c95252cb28fb615b857e7c4a8fb350330 -b44de12f531f50e66c545134fb87e1e53911ea0f7e424a14f38771d130536a5c -36a2804008aecb5d59c04ea1bc685c365a946f59431d758e049b5567be5a9f9c -85fe5e79a25f4dd82a4be06e642ce80944ac2a609ad31b31344ea8a951d67d62 -02ad88115a3511a11382cf4b2bac02f1c1e759ff7bcedcb86c1f38cf6c273a5b -8de734312dc65e010e02e3a51e12daf5ccfd8be5eaabef05d202def8d8179f2a -56c49707dfbce36c47f5b9398da112c99e990a30bf1fcb8dd18fa67b362eeb98 -541bcbae98f2eae1b57f332feff66f1623b6684ba1c972550cf1dabb009a04b4 -31a72a803552065634885ba1991bcfdabe1eac5295a586fb759204660daa0e6a -e148527ef379759bbe33c619ca9e83d0deafd8e25a48517367cbe162d022c62e -01c6a03a89c44fdcba9328617e2611169b258aee1f17ac72b47621ffd80a1e62 -94be3bc838ba66653c3cb8c3af994ae8e7e2e3700c05201b48fbc7cb9da79d71 -73f21d50da659929865dfc1e3eaaabe63c34922c4d72763a0edcea7fc2539074 -a606f32897a77cc3a01e66016f92c83f296a5e2ce8ed26c7add4ec79f9ba51f5 -30d2fb2ba2b97e0f2d5b0dae0b190c7d351b148cfee94094623ca444fd03af93 -4777a8081813369d6216e78eed25863284731d98fd27e71e12aaef289523dd0f -41af9cdb91a28984b6552c698fd7330ff5f4cb785d4efc7f53ed6b43cf6d76ef -c47defce2bcba7c6d10209dbc291e69cf6ab10eb387aced9c0ae9e49307907e7 -71a2ef7f56c20d99205cc2543631594520be5e8d8070814ece0f3c8cb75f7aea -69403abe188e79a4406cde997d6b216a72edaf932fb67867bce046e8f636bf5d -f5ee38d25af12eac207994424e9b22fe87d66ad9040f025e2b140065994667bd -5626008e15b734d7d7998a94d4d09eba590d6968decbef80cb67a743bb02eb60 -a459208b9446db15b35f3553337d1f722a3822a3dc5da8100fd16eac713f0a30 -f5e6ff64d8db1e2e3c96d34d1722de176490cb171a5599d5eb7f12535626bdee -5094f26b688bfea649f68817b3265c701ac0b18af202cb12b2ab759539cc3305 -9ebd9e62639c132cd8edaa01a5db320368fe33f9a8eb0d67137e87fe39804954 -b25fa6010d5adce5da6dc49dc809dc6110bc0adc442d6ceb70f61ab517923eab -c425af3e53eb946a54198804a288804eb3e57d09306d19669b869c4be1e75ccc -223a0e0ed4ef93981fbb9801c388265a3ba4e1fc039988f7202cd66e89bab4f3 -729f62e9633c341d4e53f994a7da57b1ea3adae716af1561a9297ba9baaa8d3f -1f50ca26ad370d16dbcb98a382fbaaa99e1749ad6b7d83959cffeac55629f9cb -5e72ca54d4ac99f5334c3c54d279bc62f288f96880acf7ad90cee30f465a7481 -e1611a8f0cc961a859b61d82da0f3f9c3fa057d2f64c08ae73a8ec157820848f -2d8082b80ca1d0f493938daf1b18fa7745d372da02b7080cb4861962eaa2d11b -0a67b05bbcf3653acbb2577b700db21e71f8bc7a73661f907ac7f61354ff8faa -fdddfe14c3940f1bdbf56d420e8ed4fbc7311c3c1e930ec05d0e3f7c1ef2bee3 -85c3146058eb0a68271a9a949c70f9d062f0598d6400e493adbf80f3bcf8f1f8 -8d74535a1ee8be323b9587a08c4f93fad40f952c85a6ee7e03fea2e8b53ae65b -c5fccc6243cafaa8f0c11f8457d8b7c20a2da48449aa360cc59e7ba9e5d4005d -6dc41f7ae703cf2dabcab88117379e8c5bf50e5ec65da439ad26801d8509708a -28cdb90ebf960fb1012d0c6608541dd1315a2cbc8e6b908b9b51d64b1993170e -57a3d65c6b1ea7a3427a934ed85001f4ba376ca462a8ed4dff790f84789c4104 -81afd8391f6582eff685e8d0c34ffc618b7f98f4865d8710a4a104264c0c3bef -a8e20164f2dd003484cc7d5ea4bbbfe6e615d4246074d8e3bcc44a49ef15622d -6c1e8723609c1b2c8e53b335238d241a48a96234f24fbeb12a6bb52533fe3e1e -e3a0f3d0a5b80a2b329ca4b8d6e44a0d8a45e5a6e251834dd43232020a402732 -c218e506a9fdd860f8c8642f66fbe96bec1321eb1a23411a8be67cb1dc1f0022 -f8cf7d7512b4c8e106c1853e7e862f976f91c4ac0184de440d7a8c3da8a16e7c -020b0f6552e9cc0ebfd870cd5325fae727bc79d3d2149ccd2a19b54ff55d9a6f -a0f9c2f820ba308f0665f7257a8ee9800f418ec74cc7dd74082ffaf3148bf548 -c1b43a303b6f7a125b66db272516be48da0a59249fa3ad2fc4281b016b0f9ae4 -a0a56c2681d68dcf7d121f1d5768cbe6218ab389fd6ce29259b6a09843ae65f5 -63d4acf224025ea073532afd22261e3c9cd9264d5c8f4c75c50139dafc644e10 -535e004c2432e2c3e6295d3e555ae791d92f4dfe6402e11113466c19a10e0879 -637063b747745f46e16b5fced042b4bb6e2956a4b9e298d221c82a8e28d517d0 -99b47555cf4e6a33a989a02d7750b3960894d1cda497aff711aad910075bb2be -48316f647207778d3abc569e7a922d066a5798174189186990039f06f93b58a7 -b5ea5a795e31f0108715f0055d2cd71895dcf5b882a8d357369efbc19677a962 -55d8d287a27999a506ae0ee943c5f57d54ea8a6606066a02810e300ddf1f1e9c -1d7fa8430b0ee3be91ba6a8f6f151c326fb4404a672471d480879b8fc9533a2c -fbc16c35dd357416f1b8a479da4a8d0985e4762a3aa199ca0b3f877425520fc3 -28c661ae50b5db6d93146f412cbad199e4cddac31ae01b1ff29adb02dd089925 -ea8049383bae4b45ac2174589e397fbfd6072684d1bffb978502c00003435b42 -0da534cf1c8edcbcc25464ce4089bed3cd7c74218229daf248a1cc7c3b19b22f -c934a8c1d62bb4728da7a30f070b4db5681732d23d6a8a1dbe2b2dea925b8d92 -dc9b9de6a7d6ed1602e536599d8e64a5bf3abfff2fbfa4bfc4fa7daaff96e137 -e68f9e06f2c5fa536389baf4fdb463f742e1a4dab89b3b18e9f351e08aed258e -b01d53fc5ab2910d35ed23e2bad4cf24dcf0d2cf4b6f80ab81f7893f8fcbfa41 -ed941c3562ab198e742a1f7c60a7a002bdb20daa5d1328daa7cc6ad8bb62ca18 -ea7d0131a6af428f0cfa292876c448c2a8750803135f50cfe3a2cfb8e1114ba1 -fe366ad2b89caa104960d2b38c94c0df544c28705e0bc4a5e3010799300c8753 -7a3f937c4b8349f8509d448eedf1c650131f64bef4f62d241ec9e048018e8187 -b784f671625fdccf9275006eb10867a934f322fbd3ad8936434d38ce4c9b3508 -4474d126eba0e183ca382a324867225dba9e0eb08afa2b4cb39baa5c42a31e5b -08aaff58e9728f84641a4f137797aab0aa8c12bc6f6ae1e1fc582c974bf47d36 -78708a3325684d42426467e3d1dce856d1e6551fa93da28912a671947d83be2f -9c7d5331f7c3c8f741daa4e9beac43eb743b980b0c03bb384bc4e0219b51a867 -1128cc846b915c8a3cf9f034663335598b6c9fac873bda032e05902f069e8181 -762db2ae83c0912e7c3962c72dbec934bbec001ffa54ccbf276fda4d7fc8dd06 -d445f4a667cda29dc4b7eaafb252cdea38345d61779d14b9ba568be6164c9bb7 -d77e826d2a4784f7a62f027595dc66db333ba51f0d889e2933ec29f2fffa31ab -645a99b1b5b24cdbaec7659306d319e3572ad79db0b6901cecf26343e1a96ad0 -067434ed6b1f6d0522b8295f65fdf0a9f82b49e507cc83c6585db0b0b4c505e4 -37ce9e9204b8000801ef17673b83c892d37492065ee75ee1fa023838e4c569e6 -bc4fe53f793e4a9e8b53495740dbfc46b56970742ed58672b244a07f455737cb -8f680d1ef56433be4ff0b5605d112ee199a9170401d7d4efe5f2f5022efec29f -a0f2ba9bed64952c287376142aa20d5cd3d48949971792fced15ab808618b653 -8a7b3084da03310337f00ba5948b5df4ed795153fae9b488c231a8e141ff52ae -56ac6dc6dec62515903d9b4c2147154addf42aab360babe1806b385e5ef493e7 -c23d7d276bc22ff392a375246a520a291ec0bbaf37a578d21beb1293f4b1964d -6225999735e89ffc86b08ec1229f79fcde3bc87048ce7f851dbed95a52953265 -c9eacde54cc0b13e0d0684ad72400c80015d7858106eff406f1aeead1834b69a -092998856f708219cf07cc8e0e784bbd3a5f857e3efaeb1fb181ed5b0b374783 -8a6d4aefc864bcee854a2dfc509b71f18538c1176b74c9bf103d7e2e3bbf15eb -853e919d80afc5ff0cb1b40f4b31a93da91b5687936be5930b281ed0d7ec8b82 -c2023cf353ee8531252d6cdeb1e6e28e99f27e40e9abe8b6a299a7eec4e03bba -d2441a70c17edab3065ab3c1cbbe77126b3057abb4eee0157ba20dafb51c004b -9698735adce73a9dc161eac5f44d405c89a83131609649646e4e6a276e10f2c3 -be6123b7f2e135160e0ea2b91e78ef762c9e8f19bff4e1ea7e0802719307ea1e -8add92e4bcdc21c0c453cf0060f031c7d7d9b104191641f20b27d9709398491f -1b8d95296da0581ce1f4006d90b6a261b1b518351d471b2024a7ea17b4918a1a -c92a1d857929b65265cce42d28ab94b905ee414b0aa4e0c5a27194c904a65b21 -f07edb74828e4ad77137f2a3a72fdc7fb773ff48155a3f27f8f4878483680a9b -fe3ebc6efdd796b3ef81c86db767cc847ed8f9394bbd6a8089062662cea2d0d2 -a2ead78c3751364e8aa92595e69438112a8e2a47f1ba610a19abb70c04d78cb3 -2f7ba28d77db26a9ce7e64820b470f15dc4ed945f990e4d4afeccc78d2c8c4c4 -bfb5d9b4c06f7ff43f14a7a4c66c74766612850275c3a45205ab1ae0e16a8b37 -a08fe059d3c52e753ace2b42951b072104a4b76bb342fbf6578e081cc81adaaf -a88f0b461989de8cc455fc532723fc162b1b851595bbd47d7828b196317f2c0b -ab3427410ed261339d11db0a62c315affd467b2590f5f41f6dd10fb145748046 -ced8e9d82ec1f9de36547a0dce3778c520ab3fa3506e8e3e0a1daf275b043a56 -42bb4a929172eb92934c1bb938808fd8c9b0006238cede4a0460624ceb15c7c9 -48c6be0714a9b939f4424fa89b4050e1f5fb6aa1cb675550ce0aa0430b0ca1e1 -373d63957d0c46591dcfe9ad915f64059351757aa5dbebb24c6229e98b408187 -5bee53debd0a0632ed6c4c1477bf6017f0842dfa751b8c8b040556eb1e367559 -894f5794638afdd3e4b737fdc1328aa6c55390c126cfa72ae55d783c1488b680 -2e3e4a40309728b2f178ecce479e40915b5832bf5bf2943661f3b6ead11e47d4 -e2afcd7e0554500b830a2ca501797feed8ed657dc69371d05cfdf430f2c0e692 -e8750a37ff49f3adf10d815192de7bb265c04cf9b9ac663cbab046c0e15239aa -5318a282370e9d78b959de902fe12d6239059c4a52d5d658749bd4c5f2f68380 -2f469249541d36030d0f3a0387dd1b2e459da13543464ffb89b9daefee82cd05 -2b916c5d87f1d97bd2a094d2e90abdeb549f2a9ef99efb641030b3544d160242 -53842f786211b5bc1c86598c7d0cb312f619cbae754e20d20339d920fde58e70 -e0d41ba6b1215bb6269371fd51adb2b1416c7c691a9408d38b4f9b85b54f60f8 -55e317b76e89f23738e284a4cd6c9bd6e2c10a33b1e75c7cc208b12d925ebb0d -45cfcac9bceb3ead893d462b50446aeeb20eaf2e8e9d599279efbfe2cf1c3182 -b764a19889700984ddb4dd7d87bc9a2280370baf049beb166b5b4b9bf671c33c -f77bfc601eeda7ad58ee5214e7a4e3d3cb50a5bb8f4f001a869d81f728f80bbb -c2345f73a41258e91634d6b96ad2a2601e9fa325510b0d913bebf7805b3e35d1 -a6846ddc3bde013cc5e42c24f18056fc53b06d6f4eef2f664b95c93285aec5d9 -64b59daa025b84c0c70d2e3d6d09649d505892de0fd2c50a77a9c0553e7f0523 -b3ce6b6287a0fc831d710ce9011aa17c0f1ec34fbd64de43af6fe87a8962a0b5 -b9a670dfa1a656cb0eaabfa02a685dd426d83538b8580902f3e79d439e041577 -16568e4af68a45ebedb33bca7f510be013435c19ccc57aa093fbf113be7d0a36 -1ef14cb23a67f6dafd9de960c27a1796b814d0af8dba071bf4e11d8be9c53dca -fb8ef51a264cc99bc931022f936e1616bfc1fd8574a52c5b71276f9bfaaca256 -92dced6f288ceb97b598229fb5b239aade0dc7994b112ec1dce1021c162c2098 -f8783575521bd87e5c335341fab73ccd371fed8756243447f13324be2e4c02cd -c636a419fec11ee3cfe99b1e09c215d189eb3a341a40a425bba30320b7886b6b -5ef8ff0eea47283614d378df0884857d21c54f99989564e41799649052410ea1 -6ddc43494978869a16f438e3b655573c6d09966f6028b4551e660c01477178de -12a00ff224ea088a882cb25d8d4a83cd94c344c952c9025afbbd679180f7dfc2 -669ba1e82ff2ef9b6308a5a38f997f7cb8d71db939e69da1675094b45329ec3c +da672b943ee8850bef9161f92129c8b8723dc0f0caba8d3b763b0e2c661a401f +5ca0dee22ef27c5804fdfc70cf638fa778c1604ad7530c06cfdf0ed39ea13944 +405afa75b3effdb88392766ae8c06c7625a063d1708c30ea535063c3b84a58d0 +bf399943039919e638927b92803462fb533d25ce53e07016f7332e139d315a01 +4e74bb36e3b4edeb612cff89d3ead8b9fd28cda137a353cf3a6c210a8c19ffea +d8aa66b1cf263f9c6b6f27081f81bce5bd329f9245aa2b4c792e623d7f3c6113 +5187742f7605a7c694b4962adc676357d35674ba3298d6d11f69e904712f8ca9 +057a6649caf13bc5c842ad73fd7b802fda5237f12570cf7cfc307994bc5f1ff8 +f965e7c7feef1d96e9be6b66c0e8fc2eeaa5e3c4fa91e88d6521edd57918446d +83c3627223af3b0405105c405913c6c8126e753cefff804b44a00af4c2850917 +aaab8dd48a78b10f4f60829631bd894dc0c6155b57b20f14e653b0691b65d4f2 +670f2dbcfdede09d76b76987c83b803256faeaa8049584bfdbb4b8c0bd1f89ec +d56556ab9c0fc581037a8c7486a6bb810d448cbd6ca4ce456c0d15b116bd1c63 +4d609539e7b85775c33d8495b9c12192b14e419b11ec72396e54dc48263ff141 +7fc972e1508e92c0c9b9373d9a622113027bf42b683671258041c7ba324ab1d5 +ffdc9b2b9a362a7cb60e1ba68f2077acee4814f63ae1b590ca64851d9e4a46ed +d77b7d4fde44b5cc8dadde723b39e2831ff02edb5a2037f974b7859a217f65c1 +b7b36a2f6ab2de99a42f9b15298d42bd2def137dda808729df87f5fd6a406813 +28c51b77d6f96fc4101274970d88f68ec867a5838611b7672a7c6e7dd8c34fb8 +0f9a029bf1042d36e68f418f99161b90878675d53bd6d2c2c08b4629cb69b863 +6014f3ba62245678cdb24bff1f6391f8a2642d0a5e550b4af6641dd84ab55ae6 +eb5e0abaf5907d88304e7ad66fee6a5323488ebb4fcb31498371ebd1b7888bd0 +b43565603e7eeefadece2c803158f0b048b8f7d2c4efb8515dcf2f345c708a96 +c7e1169a3eb5a0cc5d4579df73ddae6284b21cc59c14c251eeeb7f860d5718ba +1064784fb0d8edf1885c845f126251e28071a85bc339542d468f8537a52ca435 +a9cedcba1054c6a21d656841431af85bb4f31ab07e18cb30bc976cf3f79a16ec +0be1f6ba561072c912c3adf6b788d6e227fbf38e93e5640b1214b0ecd07dbef6 +fa29487eda646f4d3692db25ed0b251af473a25d34091de483c6e854e19baa3f +ee8abafbba1d17863299db5ae144c6e9169a18b7851aef94493d606a0f08fe0b +e792e6ce5375e412492c359019becdf14d6bea282b05bb9c5d0f469818621cf3 +624b1a98910afe46d7a035383c35b53d8864902431dbf570bc2a8958043c023e +a2ff8874113ffb9a9ffaa54938a86f51ccad643784713221e04ac4374842b09a +afe34a4e76728295d69704c1066967dd9795a6b37e95e3463bee649ee1f31f84 +a7c93e6c775e03fc276af2056ce24a1ac1fd9783d19bbfcae688398105a7355d +84926b4b72afd65f8e23bcfcf0dd9304559691fc8731b4b440d20a55ab0c45e6 +3b855910114f2e96642874465cdaca3af95bf92e026802617d0f8277cc0e47fd +37dace20ca7a20b41c656e70d2d14a53ad2a21de861707836fba1a441b2f9a78 +fe9d3060e049ecbf19b253bb1dff8fd66fcada1ee063f010a98ee5b5d8b09456 +07d0477f9c934070dec79cda08e563d3f4c8570ba1c4b32054a83a0017f2954b +80d22a7057e9547a2e90a99a4a664b13ed58462b82e671c930d52f339db26f1f +6143ffd87aa39563e2bf48922a266d755358f79421d037be0d02e185ef06f7d6 +cf956ee23ad70ef9bbfad819e4633b34664f750bef4de7bc3dced47ad0d5ae35 +4c153f9a45211dbef1ed100bdb9b9d18e2592f4f84c7a9c016aa53f9e0781118 +3a8cab30f964c85055f43f3931922d58bd9c65df08b268556d9ff9c55e75fafc +0c94b2d258e447d82423e79884e246ee34110868d21a1e34fd284e32f71d88d1 +7214632429550daae6630fbbd427f67c638fb479abd0ae6a8dfcc5a688e669dd +9c1f60e69afcd920360b5fe2f4a468c15b521a7c9a535d9619045a556aa55fdd +5690af3da52a56307e75e011730fcdb79cec1c70033138a6894426b252c2e5cc +1a788762db13f2b7cecadfb5a7bf97fe962df6c412649e5928dac7c3fc0b04c8 +c00516b6c2851b504ca700e27fa9267917185da10f4aac19ca9ad712a256ed09 +d16fdaa44e1397e64fe5d4ea2502db2ecc46087a9d7fc219482a9ec66634fcc2 +1b78124c27de3655c62a4a74029c98a6539aa87b969ca91173e562f95dba2e52 +2700cf17058cd1d1446c93df463e8796dab3c8c234130b35b425e5a6af36e4d0 +fc553273b67096b12413838dd1aa00e60575e1a2f7a0a4477b9f7ab2ec6941c8 +f6bc08b15b44ac36fc415b30bd4d76d0dbf1c2742306d99ef42f49b19fd6dff6 +65ee5c81d2560c507f3ca4f57c736127ee0ff06bf2a8659e881596a4e9ab9a76 +6ca1f93295591d4e427ec5f74d86504dccf0d31d48cd3000c3d97d73ddfb592f +a2b118b58b890fc976a7c387fc06d9b8eeee4070e5644a02bf98de8da87a9ff7 +ebd016c45f98a0aed3c799477aceeb21e4c679b7373c86af5acade707738ad24 +ffd3c849f40eb54d918745a15471a6e39125720991cbd131a08c60c72e79a5bb +3dd431be1360a931c7fe5f59df6673004db248a8855b663f37153118b4199f87 +0e7977a455fbfe3652b4cc4d04721ebfe8014b0ae3108a853486143f90e72903 +5b4d5456ae0f407201368aceb1de0fd831e2f9531cfb334d294cd62f9817551a +3cf5c48078f0d8d3afe13c844f2a584e66de077dcca8a66a50f50289191456b4 +ba734addb67ef4cf621407a52191c5d7e5e6b1e993fdc09a608f43579284d81a +277286cfaa464fa8d010ef2a8648a9f1b976a882d954bb6da4be710872c52729 +7095a0065070f72714c62cedb602debe55cc10e88f43496cb67d24d8f065d9bc +51efe762579b785ef955dcb313639b515f37e4b8be819fc70811864a3c61349c +4df2fb814b948176d1445619976f6d57273d7dbe5cbb45ccacc9734fb6e7a082 +095d33872a6793c811516281715266ee5ce165208f12f92c60b4b871fcd4e259 +7a9b134113a9bdfd365671e2328364a0981dd1106bfa9cb6077abc344eee5529 +1c6de3689cd55c2542ec42c63d605a7490665dc5f3ea7d71c4d5ae059cf72220 +2fe9f0d550e396d50bbc91a106b1f132528f6540457a5baf7245de46b22a6128 +56e9bfa556f4ba07adcc9c4102d060a9b05007c8ab730260134256b59fab7a43 +656c38ddc6b6576842fa334355499a50b2a4f5ec6c9a2a08f8192bb0aa9bbe61 +5dde042f8f6fdc9b78003505c47bdb5ee4efdc5a4031107504bbc7d58326ac19 +c0a62a7313841174e5a11cd0c6feec1ea06ea73b15efb339d3bd849e18d518b9 +2f96bd5a9d5a80389b82f8a0cb83036497bc2ef9402e5d299860b5dfd85fcb59 +9123719563322bff8e1e67a1ed77ebfc6ffe20580b060c9980d9240989bf988d +89508d7c736bdf85fbf23b6577696c60e7e03317ab8810a719cd5766cb96e7cb +72e167fbb04708d89115761888a6c718883d4d2f6cf245d857813e996208b382 +fe3677b7a071411e3ebad8a96a20f0db3167624c97911b9ce883bb7c98207a41 +bd031f70b2760755121940ede6b8961cd686550d4b28a048e16c4fab759cfc8b +5272061a143354c54c72e741e00545d53f45c3a22752481c5cba6a6153333784 +eec737f0db7a8ab71a659bf257d96da2c5646c3072299cecb144f653150831a2 +dc1f77d49a3677b49d188ecea49471e38dfdceb4c46a9f0f72dc4239dc2606dd +5a95b486ed794369aa2eb7357cd6d836ea5dcc50933864f5e63692f3aa4ba00b +1a8df6d131262a69dc227bd9b455ab3eafefffe384aec2e699e15c152d4761cd +d364e584d980791461718b95cd79e88df6301d3fade2ee16967518d663681c23 +9d6931425dbe408d0aca9d0eee115bb48fddbee08a50b48326c3938d5d57539a +9a23fe06cd6cf246bef85e082fd09082ae48d7b873c8cd768e23d49e0fa23c40 +a282a4e655b1040d1a7731beec3421b840f1c30d23352d8c5d3a6ed663acb2c8 +a59c12e7b4c8916e23b2ef97dfd1f6c6de7b0d8d4c36067772572bbeaa62971d +d698bfed8c5e8b8b139d3cf13d5003f79990881e30fc743a1841e7de8e49a4fb +a05a556795b526462641acd8942021b2cdb877843b8e3717b0ff1dd29c4d424f +91afe9ff3d7b714f02011f494fae96691cbece9688d7650998141f9e34567057 +693638336850add8ac9708345b24cdd82a99c4cd91ba562876ac66865f83d8ff +86369554933a90189a8e338e4f2fb3914a9013db31e0cb60412d3ea56f639dfc +97ac2b25d7fe2d06cc79956da1ce371799ca33c39dfe94346139e8aab6127681 +baba48ac367bcc1ba45d9d65bdbac4c8f98cc3a5f4dae38249f4974ba3ceb12c +db2a76747caf2111c443e1c3e6130faff2340cc614b1ccc01ae03587d53e02ec +1137675b09912d663bd8d5587701a8e7ea62b72424d28ba24304fa3d6791c957 +e2b98189db8bd237e31b382ce251ddf7a624217764d4be72eda5a6897753a192 +ca7e6247d63ac44a8376b3cff60e6cac0804eda23d51b75f6e1e539b7cd0a9c5 +07f2e5792633377edaa719cbc8ccf1b8358e8f68692f2aff36df21c864a076f1 +80b06bea3f6a7ee8363060dc169ed91fa5f9910f368d597e2240e317b3b6b0a8 +1334fad282a0e0f30ba41727dd8ffe9ede47234b4b8f46ac3bb7d37c6434178f +d04e45529fe8141242fff30841a72dfd577a1a8d005b0063ac7e9d0ac75f3ffe +d45a412bfe7124245045940a2cf0bc0a6721f577d509aefbdcb59d2cdadf7aa4 +3af39df6cd30d789e3258d1c5031590f13927ca5252c23a2240d984904797270 +5f468ccbaa98367ca1162b0d9fa5450b92065cabbc3197cb572ac6126447b769 +73319209e5aa1e23aa754de064a5b434591226186e33c61b1a145909a39504aa +e352edc0b37cd26e78884bb3b1dc237845b63c98d460d0acf15e9314061d4acd +26e46027a17d49373bc2a281306332516bad507eac1e22cee7d82e8730489c2e +1e619c361535b073b1c6f7764de2bb7c325e02d0d47f1ffbd3e85648d1188ca3 +1dd332bd31eaca9395178a6a9b92c391dc97b38fad9b8d552e7e2844b146c4a0 +5846ada273b5bc2a6d3d5fa4e6c0bf6323ad6ad3e01357ac8bf3742bb6dacbc0 +670b32e8f061b58906611b87ed3eff7ea75a592cec653dce181a6217d904948c +d5baaa02ce836743e848d0cc4cbf00f30a7b1bece0d854f3331dd50ba809eb43 +d6eb9108c1c6d1a7823d4da7e03fb331cb1591e5183bd5c171166f6af4cd99a0 +33d5fdd2ab7880869076e342c72405d761c076cf6ed5703037262b1cbce70d55 +8542715d31829a8d46d83a24865e6120b71d575088e4d59312416d7ff3f8e9cc +bfe8444d5ba00a0cde9680847c9169c46ccf8bf50194be93a8f32406368f5723 +746e9abfd271b16dae009743965b42d690b4bad438d1763d48970e731efad790 +ecc892b867388c47bfc312db4f062b19f0271af4bc509a81fe4b9b6519711335 +20245c665a0e62cc4a523bc73bc89d346030a0eb072820498e9545b17a80f070 +53a594d108c78dd4c66f5d67292c2665c89f5603fb8f6fdcf9a9ab1eed9befd5 +d8236d1ce79b5c44e67ad9d8c7ef3e42445e8e5ef8d007e3574521f60911623d +17015770e1deda0db03a8042f982b4d1e2d3355119b0cae13abb1f25e30befc7 +bd658da91c034a803149c2e9f56bb48e876d3a52c3a9b527c19bf6cd7c647894 +331d57ac73cfd50699e2475166c0659c07c3664570165c01190ffdc04e1179d6 +b09ee7f90ad95f7e80fc744fe880b8ec0a95f4e6913e15d6f70948f8934bf5a3 +328475444915d018c03c949620bcf85f74a3cae333b961943a1175ba03151eac +b6cc01e8e6bee5038ccb62f1a75cd3fd061b0972d54c54521411a034f20dd89e +c2679be22b018086e2043c1ed7aed8e9ff9c81d6f191aa23916b16adefe680a6 +dfc1e593b37068f2e87b67e638799d72150e44e5ee90204944e39637be23566d +96f68d999bbdb69678ea660b52e97e558a715d06d23b8b61a66908d39d1790e3 +7859bf09b335fa80b06ddd7d46c111cf69f6df9b3af3f2ea2e76899c6cd8ec80 +bab2267750fe52b893cae6a872a71958ed1475a6c4824484fd532ccaa548de62 +4dd9b72459ac7e8520a5926bec17fdcf513e3562470bef55ca286cd194db0286 +5e96a391659a166b9f90e741a812db2bcadfa98d11e314ac18fbdc1f32162fe0 +1ed75dc390dd89ac5299b124dfdaf402ab8f720fe9c556d95f69206278f71fc8 +8dbc4d4e28a9d53158be8b12e2cc5284a4ba1dc36eb3e1b5245bef13fe7dac4f +cc118b5b898dd238312a6501edcab101303b8afce83dfb7556ee211a16cae4bd +e3425f44aa6039d31a6e0258474f0b285ae16df89997d9069f8ce605bf15c604 +c62d9e8eb532fac11f294f192e91b8cf97d5d799162d9195e3393552700f5e7d +8cec32b2c5d84454ac91e2a32546a6d636123951fa1aac0b355bdec1b084a596 +90d1c733227fb31e8bb565c356448ef674abef93089c0dddc0fbc8fd0dbbe28e +0ee9cd9a9a5ddc6fe601cf72c19c2d8118b07d7722d51fe40f6c29e534320941 +a33bb1d9836cb1e9f2fd902612dc90ce0f196ebe5741283dcc7590681de0f474 +959d7c690a99bb64deab18c316af07309edad56a433e18cf4e2b6de5ef4e104e +e015416cc60a0a9e417b1d5f43e64f8fe04e3b9a6ab0329bcd0858019562169a +517a82a7b5ac635066642a5c7fd5b00cbbe08df500e15bd1b5c1d3f78eb1df96 +8e564cbf92917e9de83439945c2277f4f8cd7d4acb0b544956906336207f66ca +484432f9ebbbf3601ade198311a85e3a5dad460d16eb5d9d467c4c89d5395643 +72b5625ba315943d64b1345e2e2416a675ad89aea047d4bb7233395ff4eed1eb +72ddbfb267c0e286d0a413e21beaa54771498ad1ec68d0b19d22e070ca8c5084 +cce7181804b8f98a21983e55185ffe7b53bc20bb140314b8fc71e43df478097b +1aa9b9862f6b142adaf12348dd3469683f8bcc952be0944d2b7d041c0741b5bf +fc1156d2d7bf1bafc1265ee1a49aaed905434b51c2b6ed8fefbfa1b1b7b6b54f +22aefee90243bfe60bdfc094a685a97aefdccfeb40a8b0cbc3d4bfa51b2bde44 +d20dd311f6de466715e1d9cebad8589230c3de098548df0970d84034408d19cf +b60dc984b158621a4ff332093456c325d75d6bb3e25d300c2a6e331a586bcba6 +d019627eb4e990bab9e2a805ea3da62300786c4c6c0d41dafb501050a1358d4d +9de57dcf7f401b67c4080271186fd201927942dbc243f66fb39a33bce1aff761 +745a010ef51f39c5490a87cb9dca455d61cb4b8c5be6b60c1b07d9f53fb9a0c9 +478f5e6fa3fd2a168b9c3114f62502213ac64c4c442c07609bba877a6bea3223 +3b3e7673c548f359f19474b17826cc774f4b7c93e7e772e1e221683edea053b1 +12856099cd519d281e5098f8cae662924554a3058f66fbb8ca0a70fd27a44230 " From f05ba41ef03b827ac58d26547ac819fdf137988f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 14 May 2017 19:24:09 +0200 Subject: [PATCH 0481/1145] linux4.10: update to 4.10.16. --- srcpkgs/linux4.10/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.10/template b/srcpkgs/linux4.10/template index ffcd8a77cd..414a523e24 100644 --- a/srcpkgs/linux4.10/template +++ b/srcpkgs/linux4.10/template @@ -1,6 +1,6 @@ # Template file for 'linux4.10' pkgname=linux4.10 -version=4.10.15 +version=4.10.16 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=d8412210f02703366290348f2ab682b7de4723e2a9ae36582cd3a5fb4e1c2445 +checksum=dcc547c505e4b4d150c32426547e4aad070d7b4b103bfd559f1674c9fc7fe00b nodebug=yes # -dbg package is generated below manually nostrip=yes From 91455a5d4b45c2041527f672aa35ce0601026425 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 14 May 2017 18:19:01 +0000 Subject: [PATCH 0482/1145] nnn: update to 1.1. --- srcpkgs/nnn/patches/fix-includes.patch | 14 ++++++++++++++ srcpkgs/nnn/template | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nnn/patches/fix-includes.patch diff --git a/srcpkgs/nnn/patches/fix-includes.patch b/srcpkgs/nnn/patches/fix-includes.patch new file mode 100644 index 0000000000..16422f49e8 --- /dev/null +++ b/srcpkgs/nnn/patches/fix-includes.patch @@ -0,0 +1,14 @@ +--- nnn.c.orig 2017-05-11 20:36:57.000000000 +0000 ++++ nnn.c 2017-05-14 18:17:10.801284862 +0000 +@@ -6,11 +6,7 @@ + #include + + #include +-#ifdef __linux__ +-#include +-#else + #include +-#endif + #include + #include + #include diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template index d6edbd68f4..7878c3e2d7 100644 --- a/srcpkgs/nnn/template +++ b/srcpkgs/nnn/template @@ -1,15 +1,15 @@ # Template file for 'nnn' pkgname=nnn -version=1.0 +version=1.1 revision=1 build_style=gnu-makefile -makedepends="ncurses-devel" +makedepends="ncurses-devel readline-devel" short_desc="A lightweight terminal file browser" maintainer="Dennis Kraus " license="BSD" homepage="https://github.com/jarun/nnn" distfiles="https://github.com/jarun/nnn/archive/v${version}.tar.gz" -checksum=032d8cdcaa237f4392cc0ab335b984f2107c458c7d1ffec35a4abfe3aa0e5486 +checksum=15ce2a205147b8dd9da5de1ffa6e4b273ac8385959740786f7342057d0209cc3 post_install() { vlicense LICENSE From 30bed35222c506830dda9cdf25152499b182abbc Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 14 May 2017 15:09:17 -0400 Subject: [PATCH 0483/1145] flightgear: fix description Closes issue #6395 --- srcpkgs/flightgear/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 1d96a715d9..d1c7f59580 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,7 +1,7 @@ # Template file for 'flightgear' pkgname=flightgear version=2017.1.3 -revision=1 +revision=2 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata" hostmakedepends="fltk pkg-config" @@ -9,7 +9,7 @@ makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-dev libgsm-devel glew-devel speex-devel sqlite-devel osg-devel plib-devel libcurl-devel simgear $(vopt_if qt qt5-devel)" depends="flightgear-data>=${version}" -short_desc="Sophisticated flight wimulator" +short_desc="Sophisticated flight simulator" maintainer="Jürgen Buchmüller " license="GPL-3" homepage="http://www.flightgear.org/" From 6c1e581d21e0a0aa50700b379d0e9363f8e1db79 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 14 May 2017 23:12:22 +0200 Subject: [PATCH 0484/1145] polyml: explain nopie issue better. --- srcpkgs/polyml/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/polyml/template b/srcpkgs/polyml/template index 3c1ff9cb66..9cc75eafbc 100644 --- a/srcpkgs/polyml/template +++ b/srcpkgs/polyml/template @@ -5,7 +5,12 @@ revision=1 build_style=gnu-configure configure_args="--with-system-libffi --enable-shared" case "$XBPS_TARGET_MACHINE" in - i686-musl|x86_64-musl) nopie=yes ;; # crash in do_relocs else + i686-musl|x86_64-musl) + # musl doesn't allow writing to .rodata and .text during + # relocation, but polyexport.o contains DT_TEXTREL + # since libpolyml/elfexport.cpp only creates absolute + # relocations. Drop PIE and do relocations at link time. + nopie=yes;; i686*|x86_64*) ;; *) configure_args+=" --disable-native-codegeneration" ;; esac From 5d1b05771b5807dace49785453e37c83e8df8a33 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 May 2017 08:48:13 +0200 Subject: [PATCH 0485/1145] ffmpeg: update to 3.3.1. --- srcpkgs/ffmpeg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index fdbcf81e98..14e4ed9e3d 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,13 +1,13 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=3.3 +version=3.3.1 revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" homepage="https://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d +checksum=b702a7fc656ac23e276b8c823a2f646e4e6f6309bb2788435a708e69bea98f2f hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel From f8acb9c936b005de96b983d960828acadf9fa3d0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 May 2017 09:09:46 +0200 Subject: [PATCH 0486/1145] clipgrab: update to 3.6.5. --- srcpkgs/clipgrab/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index bb1fd3e6ff..834fc7ede7 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -1,6 +1,6 @@ # Template file for 'clipgrab' pkgname=clipgrab -version=3.6.4 +version=3.6.5 revision=1 build_style=qmake configure_args=clipgrab.pro @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://www.clipgrab.org" distfiles="https://download.clipgrab.org/clipgrab-${version}.tar.gz" -checksum=bda87df48861341a5eb70574ab8b4b8ae35319b678b4db864191cf0c5d345680 +checksum=cc13512f2ca731b27d177d8f31780147d912ac8fc68a341748d53182811daade do_install() { vbin clipgrab From 6d3146c2a24fa82a767e69d592e8d2f6795b6862 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 May 2017 09:11:09 +0200 Subject: [PATCH 0487/1145] babl: update to 0.1.26. --- srcpkgs/babl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index 33d14d2f83..edc4353303 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,6 +1,6 @@ # Template build file for 'babl'. pkgname=babl -version=0.1.24 +version=0.1.26 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config vala-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://gegl.org/babl/" license="LGPL-3" distfiles="https://ftp.gimp.org/pub/babl/${version%.*}/babl-$version.tar.bz2" -checksum=472bf1acdde5bf076e6d86f3004eea4e9b007b1377ab305ebddec99994f29d0b +checksum=fd80e165f1534c64457a8cce7a8aa90559ab28ecd32beb9e3948c5b8cd373d34 pre_configure() { autoreconf -fi From 0732f63bf76ed610a15daf7f84462043e7d2de3d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 May 2017 09:19:23 +0200 Subject: [PATCH 0488/1145] chromium: update to 58.0.3029.110. --- srcpkgs/chromium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 7a46b3f241..546c59eaa9 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,14 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=58.0.3029.81 +version=58.0.3029.110 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb +checksum=f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff only_for_archs="i686 x86_64 x86_64-musl" lib32disabled=yes From 2a9ee7f287874224dc4dd887aa5884f3e3054274 Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 15 May 2017 10:48:11 +0200 Subject: [PATCH 0489/1145] xfce4-terminal: update to 0.8.5.1 --- srcpkgs/xfce4-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index a6da8b5422..7cfc09c8c6 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-terminal' pkgname=xfce4-terminal -version=0.8.4 +version=0.8.5.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" @@ -11,4 +11,4 @@ maintainer="Juan RP " homepage="http://www.xfce.org" license="GPL-2" distfiles="http://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=c5c1163b30e7a43d56ff92a25193bf9f29ce60e6cf43e5988530df79c84cfdc8 +checksum=8a34568f78abf669957984602c54cd938f19c9343ee2691c2b787446629be064 From a0aca8e30b9f7585ec8bd5bd42265fc07d29a1b9 Mon Sep 17 00:00:00 2001 From: Bubble-be Date: Fri, 24 Mar 2017 20:49:21 +0100 Subject: [PATCH 0490/1145] kodi: update to 17.1 --- srcpkgs/kodi/patches/fix-fileemu.patch | 264 ++-- srcpkgs/kodi/patches/fix-gcc6-min_max.patch | 1432 ------------------- srcpkgs/kodi/patches/fix-musl-x86.patch | 19 - srcpkgs/kodi/patches/fix-musl.patch | 115 +- srcpkgs/kodi/patches/kodi-16-ffmpeg3.patch | 641 --------- srcpkgs/kodi/patches/versioncheck.patch | 10 + srcpkgs/kodi/template | 8 +- 7 files changed, 227 insertions(+), 2262 deletions(-) delete mode 100644 srcpkgs/kodi/patches/fix-gcc6-min_max.patch delete mode 100644 srcpkgs/kodi/patches/fix-musl-x86.patch delete mode 100644 srcpkgs/kodi/patches/kodi-16-ffmpeg3.patch create mode 100644 srcpkgs/kodi/patches/versioncheck.patch diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch index acb0c71ce8..4cc74c166c 100644 --- a/srcpkgs/kodi/patches/fix-fileemu.patch +++ b/srcpkgs/kodi/patches/fix-fileemu.patch @@ -1,16 +1,16 @@ diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp -index ae7ccb5..d8fd7fc 100644 +index ab14942..cf9d73d 100644 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp -@@ -49,6 +49,7 @@ +@@ -51,6 +51,7 @@ #include #include #include +#include #ifdef TARGET_POSIX #include "PlatformDefs.h" // for __stat64 - #endif -@@ -466,13 +467,10 @@ extern "C" + #include "XFileUtils.h" +@@ -476,13 +477,10 @@ extern "C" EmuFileObject* o = g_emuFileWrapper.GetFileObjectByDescriptor(fd); if (o) { @@ -25,7 +25,7 @@ index ae7ccb5..d8fd7fc 100644 } else if (!IS_STD_DESCRIPTOR(fd)) { -@@ -535,7 +533,7 @@ extern "C" +@@ -545,7 +543,7 @@ extern "C" return -1; } object->mode = iMode; @@ -34,7 +34,7 @@ index ae7ccb5..d8fd7fc 100644 } delete pFile; return -1; -@@ -1181,8 +1179,8 @@ extern "C" +@@ -1214,8 +1212,8 @@ extern "C" { FILE* file = NULL; #if defined(TARGET_LINUX) && !defined(TARGET_ANDROID) @@ -45,7 +45,7 @@ index ae7ccb5..d8fd7fc 100644 { CLog::Log(LOGINFO, "%s - something opened the mount file, let's hope it knows what it's doing", __FUNCTION__); return fopen(filename, mode); -@@ -1572,7 +1570,7 @@ extern "C" +@@ -1622,7 +1620,7 @@ extern "C" int ret; ret = dll_fgetpos64(stream, &tmpPos); @@ -54,7 +54,7 @@ index ae7ccb5..d8fd7fc 100644 *pos = (fpos_t)tmpPos; #else pos->__pos = (off_t)tmpPos.__pos; -@@ -1585,8 +1583,9 @@ extern "C" +@@ -1635,8 +1633,9 @@ extern "C" CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream); if (pFile != NULL) { @@ -66,7 +66,7 @@ index ae7ccb5..d8fd7fc 100644 #else pos->__pos = pFile->GetPosition(); #endif -@@ -1607,8 +1606,9 @@ extern "C" +@@ -1657,8 +1656,9 @@ extern "C" int fd = g_emuFileWrapper.GetDescriptorByStream(stream); if (fd >= 0) { @@ -78,7 +78,7 @@ index ae7ccb5..d8fd7fc 100644 #else if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0) #endif -@@ -1624,7 +1624,7 @@ extern "C" +@@ -1674,7 +1674,7 @@ extern "C" { // it might be something else than a file, or the file is not emulated // let the operating system handle it @@ -87,7 +87,7 @@ index ae7ccb5..d8fd7fc 100644 return fsetpos(stream, pos); #else return fsetpos64(stream, pos); -@@ -1640,7 +1640,7 @@ extern "C" +@@ -1690,7 +1690,7 @@ extern "C" if (fd >= 0) { fpos64_t tmpPos; @@ -97,10 +97,10 @@ index ae7ccb5..d8fd7fc 100644 #else tmpPos.__pos = (off64_t)(pos->__pos); diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h -index ae9b1c4..3b19122 100644 +index 3294d9a..3ce8b24 100644 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h -@@ -26,7 +26,7 @@ +@@ -24,7 +24,7 @@ #define _onexit_t void* #endif @@ -110,10 +110,10 @@ index ae9b1c4..3b19122 100644 typedef int64_t off64_t; typedef off64_t __off64_t; diff --git a/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp -index cf8a060..9110312 100644 +index 8927d41..0e78707 100644 --- a/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp +++ b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp -@@ -27,12 +27,7 @@ CEmuFileWrapper g_emuFileWrapper; +@@ -53,15 +53,7 @@ constexpr bool isValidFilePtr(FILE* f) CEmuFileWrapper::CEmuFileWrapper() { // since we always use dlls we might just initialize it directly @@ -121,13 +121,16 @@ index cf8a060..9110312 100644 - { - memset(&m_files[i], 0, sizeof(EmuFileObject)); - m_files[i].used = false; -- m_files[i].file_emu._file = -1; +-#if defined(TARGET_WINDOWS) && (_MSC_VER >= 1900) +- m_files[i].file_emu._Placeholder = new kodi_iobuf(); +-#endif +- FileDescriptor(m_files[i].file_emu)->_file = -1; - } + memset(m_files, 0, sizeof(m_files)); } CEmuFileWrapper::~CEmuFileWrapper() -@@ -43,22 +38,7 @@ void CEmuFileWrapper::CleanUp() +@@ -73,29 +65,7 @@ void CEmuFileWrapper::CleanUp() { CSingleLock lock(m_criticalSection); for (int i = 0; i < MAX_EMULATED_FILES; i++) @@ -140,18 +143,25 @@ index cf8a060..9110312 100644 - if (m_files[i].file_lock) - { - delete m_files[i].file_lock; -- m_files[i].file_lock = NULL; +- m_files[i].file_lock = nullptr; - } +-#if !defined(TARGET_WINDOWS) +- //Don't memset on Windows as it overwrites our pointer - memset(&m_files[i], 0, sizeof(EmuFileObject)); +-#endif - m_files[i].used = false; -- m_files[i].file_emu._file = -1; +- FileDescriptor(m_files[i].file_emu)->_file = -1; - } +-#if defined(TARGET_WINDOWS) && (_MSC_VER >= 1900) +- delete static_cast(m_files[i].file_emu._Placeholder); +- m_files[i].file_emu._Placeholder = nullptr; +-#endif - } + UnRegisterFileObject(&m_files[i], true); } EmuFileObject* CEmuFileWrapper::RegisterFileObject(XFILE::CFile* pFile) -@@ -69,13 +49,11 @@ EmuFileObject* CEmuFileWrapper::RegisterFileObject(XFILE::CFile* pFile) +@@ -106,13 +76,11 @@ EmuFileObject* CEmuFileWrapper::RegisterFileObject(XFILE::CFile* pFile) for (int i = 0; i < MAX_EMULATED_FILES; i++) { @@ -162,11 +172,11 @@ index cf8a060..9110312 100644 object = &m_files[i]; - object->used = true; object->file_xbmc = pFile; -- object->file_emu._file = (i + FILE_WRAPPER_OFFSET); +- FileDescriptor(object->file_emu)->_file = (i + FILE_WRAPPER_OFFSET); object->file_lock = new CCriticalSection(); break; } -@@ -84,82 +62,71 @@ EmuFileObject* CEmuFileWrapper::RegisterFileObject(XFILE::CFile* pFile) +@@ -121,82 +89,70 @@ EmuFileObject* CEmuFileWrapper::RegisterFileObject(XFILE::CFile* pFile) return object; } @@ -174,49 +184,49 @@ index cf8a060..9110312 100644 +void CEmuFileWrapper::UnRegisterFileObject(EmuFileObject *object, bool free_file) { - int i = fd - FILE_WRAPPER_OFFSET; -- if (i >= 0 && i < MAX_EMULATED_FILES) -+ if (object && object->file_xbmc) - { -- if (m_files[i].used) -+ if (object->file_xbmc && free_file) - { -- CSingleLock lock(m_criticalSection); -- -- // we assume the emulated function alreay deleted the CFile object -- if (m_files[i].used) -- { -- if (m_files[i].file_lock) -- { -- delete m_files[i].file_lock; -- m_files[i].file_lock = NULL; -- } -- memset(&m_files[i], 0, sizeof(EmuFileObject)); -- m_files[i].used = false; -- m_files[i].file_emu._file = -1; -- } -+ object->file_xbmc->Close(); -+ delete object->file_xbmc; - } -+ if (object->file_lock) -+ { -+ delete object->file_lock; -+ } -+ -+ memset(object, 0, sizeof(*object)); - } - } +- if (! (i >= 0 && i < MAX_EMULATED_FILES)) ++ if (! (object && object->file_xbmc)) + return; +- if (!m_files[i].used) +- return; +- +- CSingleLock lock(m_criticalSection); +- +- // we assume the emulated function alreay deleted the CFile object +- if (m_files[i].file_lock) ++ if (object->file_xbmc && free_file) + { +- delete m_files[i].file_lock; +- m_files[i].file_lock = nullptr; ++ CSingleLock lock(m_criticalSection); ++ ++ object->file_xbmc->Close(); ++ delete object->file_xbmc; + } +-#if !defined(TARGET_WINDOWS) +- //Don't memset on Windows as it overwrites our pointer +- memset(&m_files[i], 0, sizeof(EmuFileObject)); +-#endif +- m_files[i].used = false; +- FileDescriptor(m_files[i].file_emu)->_file = -1; ++ if (object->file_lock) ++ delete object->file_lock; ++ ++ memset(object, 0, sizeof(*object)); ++} ++ +void CEmuFileWrapper::UnRegisterFileObjectByDescriptor(int fd) +{ + CSingleLock lock(m_criticalSection); + UnRegisterFileObject(GetFileObjectByDescriptor(fd), false); -+} -+ + } + void CEmuFileWrapper::UnRegisterFileObjectByStream(FILE* stream) { -- if (stream != NULL) +- if (isValidFilePtr(stream)) - { -- return UnRegisterFileObjectByDescriptor(stream->_file); +- return UnRegisterFileObjectByDescriptor(FileDescriptor(*stream)->_file); - } + CSingleLock lock(m_criticalSection); + UnRegisterFileObject(GetFileObjectByStream(stream), false); @@ -238,37 +248,32 @@ index cf8a060..9110312 100644 } bool CEmuFileWrapper::TryLockFileObjectByDescriptor(int fd) --{ -- int i = fd - FILE_WRAPPER_OFFSET; + { +- int i = fd - FILE_WRAPPER_OFFSET; - if (i >= 0 && i < MAX_EMULATED_FILES) -- { -- if (m_files[i].used) -- { -- return m_files[i].file_lock->try_lock(); -- } -+{ + EmuFileObject* object = GetFileObjectByDescriptor(fd); + if (object && object->file_xbmc) -+ { + { +- if (m_files[i].used) +- { +- return m_files[i].file_lock->try_lock(); +- } + return object->file_lock->try_lock(); } -+ return false; } void CEmuFileWrapper::UnlockFileObjectByDescriptor(int fd) --{ -- int i = fd - FILE_WRAPPER_OFFSET; + { +- int i = fd - FILE_WRAPPER_OFFSET; - if (i >= 0 && i < MAX_EMULATED_FILES) -- { -- if (m_files[i].used) -- { -- m_files[i].file_lock->unlock(); -- } -+{ + EmuFileObject* object = GetFileObjectByDescriptor(fd); + if (object && object->file_xbmc) -+ { + { +- if (m_files[i].used) +- { +- m_files[i].file_lock->unlock(); +- } + object->file_lock->unlock(); } } @@ -284,18 +289,18 @@ index cf8a060..9110312 100644 { return &m_files[i]; } -@@ -167,20 +134,38 @@ EmuFileObject* CEmuFileWrapper::GetFileObjectByDescriptor(int fd) - return NULL; +@@ -204,20 +160,38 @@ EmuFileObject* CEmuFileWrapper::GetFileObjectByDescriptor(int fd) + return nullptr; } -EmuFileObject* CEmuFileWrapper::GetFileObjectByStream(FILE* stream) +int CEmuFileWrapper::GetDescriptorByFileObject(EmuFileObject *object) { -- if (stream != NULL) +- if (isValidFilePtr(stream)) + int i = object - m_files; + if (i >= 0 && i < MAX_EMULATED_FILES) { -- return GetFileObjectByDescriptor(stream->_file); +- return GetFileObjectByDescriptor(FileDescriptor(*stream)->_file); + return 0x7000000 + i; } + return -1; @@ -311,7 +316,7 @@ index cf8a060..9110312 100644 + return object; + } + } - return NULL; + return nullptr; } +FILE* CEmuFileWrapper::GetStreamByFileObject(EmuFileObject *object) @@ -321,33 +326,33 @@ index cf8a060..9110312 100644 + XFILE::CFile* CEmuFileWrapper::GetFileXbmcByDescriptor(int fd) { - EmuFileObject* object = GetFileObjectByDescriptor(fd); -- if (object != NULL && object->used) -+ if (object != NULL) + auto object = GetFileObjectByDescriptor(fd); +- if (object != nullptr && object->used) ++ if (object != nullptr) { return object->file_xbmc; } -@@ -191,8 +176,8 @@ XFILE::CFile* CEmuFileWrapper::GetFileXbmcByStream(FILE* stream) +@@ -228,8 +202,8 @@ XFILE::CFile* CEmuFileWrapper::GetFileXbmcByStream(FILE* stream) { - if (stream != NULL) + if (isValidFilePtr(stream)) { -- EmuFileObject* object = GetFileObjectByDescriptor(stream->_file); -- if (object != NULL && object->used) -+ EmuFileObject* object = GetFileObjectByStream(stream); -+ if (object != NULL) +- auto object = GetFileObjectByDescriptor(FileDescriptor(*stream)->_file); +- if (object != nullptr && object->used) ++ auto object = GetFileObjectByStream(stream); ++ if (object != nullptr) { return object->file_xbmc; } -@@ -202,42 +187,20 @@ XFILE::CFile* CEmuFileWrapper::GetFileXbmcByStream(FILE* stream) +@@ -239,32 +213,25 @@ XFILE::CFile* CEmuFileWrapper::GetFileXbmcByStream(FILE* stream) int CEmuFileWrapper::GetDescriptorByStream(FILE* stream) { -- if (stream != NULL) +- if (isValidFilePtr(stream)) - { -- int i = stream->_file - FILE_WRAPPER_OFFSET; +- int i = FileDescriptor(*stream)->_file - FILE_WRAPPER_OFFSET; - if (i >= 0 && i < MAX_EMULATED_FILES) - { -- return stream->_file; +- return i + FILE_WRAPPER_OFFSET; - } - } - return -1; @@ -356,40 +361,35 @@ index cf8a060..9110312 100644 FILE* CEmuFileWrapper::GetStreamByDescriptor(int fd) { -- EmuFileObject* object = GetFileObjectByDescriptor(fd); -- if (object != NULL && object->used) +- auto object = GetFileObjectByDescriptor(fd); +- if (object != nullptr && object->used) - { - return &object->file_emu; - } -- return NULL; +- return nullptr; + return GetStreamByFileObject(GetFileObjectByDescriptor(fd)); } - bool CEmuFileWrapper::DescriptorIsEmulatedFile(int fd) - { -- int i = fd - FILE_WRAPPER_OFFSET; -- if (i >= 0 && i < MAX_EMULATED_FILES) -- { -- return true; -- } -- return false; -+ return GetFileObjectByDescriptor(fd) != NULL; - } - bool CEmuFileWrapper::StreamIsEmulatedFile(FILE* stream) { -- if (stream != NULL) -- { -- return DescriptorIsEmulatedFile(stream->_file); -- } -- return false; -+ return GetFileObjectByStream(stream) != NULL; + if (isValidFilePtr(stream)) + { +- return DescriptorIsEmulatedFile(FileDescriptor(*stream)->_file); ++ return DescriptorIsEmulatedFile(GetDescriptorByStream(stream)); + } + return false; } ++ ++bool CEmuFileWrapper::DescriptorIsEmulatedFile(int fd) ++{ ++ return GetFileObjectByDescriptor(fd) != NULL; ++} ++ diff --git a/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h -index 3d79c7a..1b3e62f 100644 +index 786fa85..311a5cf 100644 --- a/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h +++ b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h -@@ -27,14 +27,14 @@ +@@ -25,14 +25,14 @@ #include "system.h" #include "threads/CriticalSection.h" @@ -405,28 +405,27 @@ index 3d79c7a..1b3e62f 100644 +//#endif #define MAX_EMULATED_FILES 50 --#define FILE_WRAPPER_OFFSET 0x00000100 -+//#define FILE_WRAPPER_OFFSET 0x00000100 +-#define FILE_WRAPPER_OFFSET 0x00000200 ++//#define FILE_WRAPPER_OFFSET 0x00000200 namespace XFILE { -@@ -43,11 +43,9 @@ namespace XFILE +@@ -47,12 +47,9 @@ struct kodi_iobuf { typedef struct stEmuFileObject { -- bool used; - FILE file_emu; -- XFILE::CFile* file_xbmc; -+ XFILE::CFile* file_xbmc; + XFILE::CFile* file_xbmc; CCriticalSection *file_lock; -- int mode; -+ int mode; + int mode; +- //Stick this last to avoid 3-7 bytes of padding +- bool used; } EmuFileObject; class CEmuFileWrapper -@@ -62,19 +60,22 @@ public: +@@ -67,22 +64,22 @@ public: void CleanUp(); - + EmuFileObject* RegisterFileObject(XFILE::CFile* pFile); + void UnRegisterFileObject(EmuFileObject*, bool free_file); void UnRegisterFileObjectByDescriptor(int fd); @@ -434,18 +433,19 @@ index 3d79c7a..1b3e62f 100644 void LockFileObjectByDescriptor(int fd); bool TryLockFileObjectByDescriptor(int fd); void UnlockFileObjectByDescriptor(int fd); -- EmuFileObject* GetFileObjectByDescriptor(int fd); -- EmuFileObject* GetFileObjectByStream(FILE* stream); -+ EmuFileObject* GetFileObjectByDescriptor(int fd); + EmuFileObject* GetFileObjectByDescriptor(int fd); + int GetDescriptorByFileObject(EmuFileObject*); -+ EmuFileObject* GetFileObjectByStream(FILE* stream); + EmuFileObject* GetFileObjectByStream(FILE* stream); + FILE* GetStreamByFileObject(EmuFileObject*); XFILE::CFile* GetFileXbmcByDescriptor(int fd); XFILE::CFile* GetFileXbmcByStream(FILE* stream); - static int GetDescriptorByStream(FILE* stream); + int GetDescriptorByStream(FILE* stream); FILE* GetStreamByDescriptor(int fd); -- static bool DescriptorIsEmulatedFile(int fd); +- static constexpr bool DescriptorIsEmulatedFile(int fd) +- { +- return fd >= FILE_WRAPPER_OFFSET && fd < FILE_WRAPPER_OFFSET + MAX_EMULATED_FILES; +- } - static bool StreamIsEmulatedFile(FILE* stream); + bool DescriptorIsEmulatedFile(int fd); + bool StreamIsEmulatedFile(FILE* stream); @@ -453,7 +453,7 @@ index 3d79c7a..1b3e62f 100644 EmuFileObject m_files[MAX_EMULATED_FILES]; CCriticalSection m_criticalSection; diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c -index a9225e5..355da1c 100644 +index e363662..4498c27 100644 --- a/xbmc/cores/DllLoader/exports/wrapper.c +++ b/xbmc/cores/DllLoader/exports/wrapper.c @@ -39,7 +39,7 @@ diff --git a/srcpkgs/kodi/patches/fix-gcc6-min_max.patch b/srcpkgs/kodi/patches/fix-gcc6-min_max.patch deleted file mode 100644 index 9c96dfa2a1..0000000000 --- a/srcpkgs/kodi/patches/fix-gcc6-min_max.patch +++ /dev/null @@ -1,1432 +0,0 @@ -From 8f82e51563f0e1bc9b7a8adf669ad2b66e7ce3e5 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 28 Apr 2016 17:17:40 +0200 -Subject: [PATCH] lib/cximage-6.0: fix compilation with gcc6 - -For a quick fix I renamed min() to cxmin() and max() to cxmax() to -prevent the conflict with the gcc definition. - -Forum thread for reference: -http://forum.kodi.tv/showthread.php?tid=263884 ---- - lib/cximage-6.0/CxImage/ximabmp.cpp | 6 +- - lib/cximage-6.0/CxImage/ximadef.h | 8 +- - lib/cximage-6.0/CxImage/ximadsp.cpp | 182 +++++++++++++++++------------------ - lib/cximage-6.0/CxImage/ximage.cpp | 4 +- - lib/cximage-6.0/CxImage/ximagif.cpp | 6 +- - lib/cximage-6.0/CxImage/ximahist.cpp | 12 +-- - lib/cximage-6.0/CxImage/ximaint.cpp | 8 +- - lib/cximage-6.0/CxImage/ximaiter.h | 4 +- - lib/cximage-6.0/CxImage/ximajbg.cpp | 2 +- - lib/cximage-6.0/CxImage/ximapal.cpp | 14 +-- - lib/cximage-6.0/CxImage/ximapng.cpp | 12 +-- - lib/cximage-6.0/CxImage/ximaraw.cpp | 4 +- - lib/cximage-6.0/CxImage/ximasel.cpp | 50 +++++----- - lib/cximage-6.0/CxImage/ximath.cpp | 8 +- - lib/cximage-6.0/CxImage/ximatif.cpp | 6 +- - lib/cximage-6.0/CxImage/ximatran.cpp | 138 +++++++++++++------------- - lib/cximage-6.0/CxImage/ximawnd.cpp | 16 +-- - 17 files changed, 236 insertions(+), 244 deletions(-) - -diff --git a/lib/cximage-6.0/CxImage/ximabmp.cpp b/lib/cximage-6.0/CxImage/ximabmp.cpp -index 726ff91..55842b1 100644 ---- a/lib/cximage-6.0/CxImage/ximabmp.cpp -+++ b/lib/cximage-6.0/CxImage/ximabmp.cpp -@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile) - bihtoh(&infohdr); - - // Write the file header -- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1); -+ hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1); - hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1); - //and DIB+ALPHA interlaced - BYTE *srcalpha = AlphaGetPointer(); -@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile) - #endif //CXIMAGE_SUPPORT_ALPHA - { - // Write the file header -- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1); -+ hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1); - //copy attributes - memcpy(pDib,&head,sizeof(BITMAPINFOHEADER)); - bihtoh((BITMAPINFOHEADER*)pDib); -@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile) - BITMAPFILEHEADER bf; - DWORD off = hFile->Tell(); // - cx_try { -- if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP"); -+ if (hFile->Read(&bf,cxmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP"); - - bf.bfSize = my_ntohl(bf.bfSize); - bf.bfOffBits = my_ntohl(bf.bfOffBits); -diff --git a/lib/cximage-6.0/CxImage/ximadef.h b/lib/cximage-6.0/CxImage/ximadef.h -index fe383bf..53ea452 100644 ---- a/lib/cximage-6.0/CxImage/ximadef.h -+++ b/lib/cximage-6.0/CxImage/ximadef.h -@@ -53,12 +53,8 @@ - #define CXIMAGE_SUPPORT_WINDOWS 0 - #endif - --#ifndef min --#define min(a,b) (((a)<(b))?(a):(b)) --#endif --#ifndef max --#define max(a,b) (((a)>(b))?(a):(b)) --#endif -+#define cxmin(a,b) (((a)<(b))?(a):(b)) -+#define cxmax(a,b) (((a)>(b))?(a):(b)) - - #ifndef PI - #define PI 3.141592653589793f -diff --git a/lib/cximage-6.0/CxImage/ximadsp.cpp b/lib/cximage-6.0/CxImage/ximadsp.cpp -index 8425bb2..813253b 100644 ---- a/lib/cximage-6.0/CxImage/ximadsp.cpp -+++ b/lib/cximage-6.0/CxImage/ximadsp.cpp -@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBColor) - G = lRGBColor.rgbGreen; - B = lRGBColor.rgbBlue; - -- cMax = max( max(R,G), B); /* calculate lightness */ -- cMin = min( min(R,G), B); -+ cMax = cxmax( cxmax(R,G), B); /* calculate lightness */ -+ cMin = cxmin( cxmin(R,G), B); - L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX)); - - if (cMax==cMin){ /* r=g=b --> achromatic case */ -@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVColor) - G = (int)( Y - 0.344f * U - 0.714f * V); - B = (int)( Y + 1.770f * U); - -- R= min(255,max(0,R)); -- G= min(255,max(0,G)); -- B= min(255,max(0,B)); -+ R= cxmin(255,cxmax(0,R)); -+ G= cxmin(255,cxmax(0,G)); -+ B= cxmin(255,cxmax(0,B)); - RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; - return rgb; - } -@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBColor) - U = (int)((B-Y) * 0.565f + 128); - V = (int)((R-Y) * 0.713f + 128); - -- Y= min(255,max(0,Y)); -- U= min(255,max(0,U)); -- V= min(255,max(0,V)); -+ Y= cxmin(255,cxmax(0,Y)); -+ U= cxmin(255,cxmax(0,U)); -+ V= cxmin(255,cxmax(0,V)); - RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0}; - return yuv; - } -@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQColor) - G = (int)( Y - 0.273f * I - 0.647f * Q); - B = (int)( Y - 1.104f * I + 1.701f * Q); - -- R= min(255,max(0,R)); -- G= min(255,max(0,G)); -- B= min(255,max(0,B)); -+ R= cxmin(255,cxmax(0,R)); -+ G= cxmin(255,cxmax(0,G)); -+ B= cxmin(255,cxmax(0,B)); - RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; - return rgb; - } -@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBColor) - I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128); - Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128); - -- Y= min(255,max(0,Y)); -- I= min(255,max(0,I)); -- Q= min(255,max(0,Q)); -+ Y= cxmin(255,cxmax(0,Y)); -+ I= cxmin(255,cxmax(0,I)); -+ Q= cxmin(255,cxmax(0,Q)); - RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0}; - return yiq; - } -@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZColor) - G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k); - B = (int)( 0.055648f * X - 0.204043f * Y + 1.057311f * Z * k); - -- R= min(255,max(0,R)); -- G= min(255,max(0,G)); -- B= min(255,max(0,B)); -+ R= cxmin(255,cxmax(0,R)); -+ G= cxmin(255,cxmax(0,G)); -+ B= cxmin(255,cxmax(0,B)); - RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; - return rgb; - } -@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBColor) - Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B); - Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f); - -- //X= min(255,max(0,X)); -- //Y= min(255,max(0,Y)); -- //Z= min(255,max(0,Z)); -+ //X= cxmin(255,cxmax(0,X)); -+ //Y= cxmin(255,cxmax(0,Y)); -+ //Z= cxmin(255,cxmax(0,Z)); - RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0}; - return xyz; - } -@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, long contrast) - - BYTE cTable[256]; // - for (int i=0;i<256;i++) { -- cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f))); -+ cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)((i-128)*c + brightness + 0.5f))); - } - - return Lut(cTable); -@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset) - } - } - if (Kfactor==0 || ksumcur==0){ -- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b + Koffset))); -+ cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset))); - } else if (ksumtot == ksumcur) { -- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset))); -+ cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset))); - } else { -- cPtr2[iY1] = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); - } - } - } -@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset) - } - } - if (Kfactor==0 || ksumcur==0){ -- c.rgbRed = (BYTE)min(255, max(0,(int)(r + Koffset))); -- c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset))); -- c.rgbBlue = (BYTE)min(255, max(0,(int)(b + Koffset))); -+ c.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(r + Koffset))); -+ c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g + Koffset))); -+ c.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset))); - } else if (ksumtot == ksumcur) { -- c.rgbRed = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset))); -- c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset))); -- c.rgbBlue = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset))); -+ c.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(r/Kfactor + Koffset))); -+ c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g/Kfactor + Koffset))); -+ c.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset))); - } else { -- c.rgbRed = (BYTE)min(255, max(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset))); -- c.rgbGreen = (BYTE)min(255, max(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset))); -- c.rgbBlue = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ c.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ c.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); - } - tmp.BlindSetPixelColor(x,y,c); - } -@@ -1078,8 +1078,8 @@ bool CxImage::Edge(long Ksize) - // - void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffset, bool bMixAlpha) - { -- long lWide = min(GetWidth(),imgsrc2.GetWidth()-lXOffset); -- long lHeight = min(GetHeight(),imgsrc2.GetHeight()-lYOffset); -+ long lWide = cxmin(GetWidth(),imgsrc2.GetWidth()-lXOffset); -+ long lHeight = cxmin(GetHeight(),imgsrc2.GetHeight()-lYOffset); - - bool bEditAlpha = imgsrc2.AlphaIsValid() & bMixAlpha; - -@@ -1112,16 +1112,16 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse - if (bEditAlpha) rgbDest.rgbReserved = (BYTE)((rgb1.rgbReserved+rgb2.rgbReserved)/2); - break; - case OpAdd: -- rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue+rgb2.rgbBlue)); -- rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen+rgb2.rgbGreen)); -- rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed+rgb2.rgbRed)); -- if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved+rgb2.rgbReserved)); -+ rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue+rgb2.rgbBlue)); -+ rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen+rgb2.rgbGreen)); -+ rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed+rgb2.rgbRed)); -+ if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved+rgb2.rgbReserved)); - break; - case OpSub: -- rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue-rgb2.rgbBlue)); -- rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen-rgb2.rgbGreen)); -- rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed-rgb2.rgbRed)); -- if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved-rgb2.rgbReserved)); -+ rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue-rgb2.rgbBlue)); -+ rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen-rgb2.rgbGreen)); -+ rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed-rgb2.rgbRed)); -+ if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved-rgb2.rgbReserved)); - break; - case OpAnd: - rgbDest.rgbBlue = (BYTE)(rgb1.rgbBlue&rgb2.rgbBlue); -@@ -1202,11 +1202,11 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse - double dSmallAmt = dSmall*((double)rgb2.rgbBlue); - - if( lAverage < lThresh+1){ -- rgbDest.rgbBlue = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbBlue) + -+ rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbBlue) + - dSmallAmt))); -- rgbDest.rgbGreen = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbGreen) + -+ rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbGreen) + - dSmallAmt))); -- rgbDest.rgbRed = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbRed) + -+ rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbRed) + - dSmallAmt))); - } - else -@@ -1274,9 +1274,9 @@ bool CxImage::ShiftRGB(long r, long g, long b) - #endif //CXIMAGE_SUPPORT_SELECTION - { - color = BlindGetPixelColor(x,y); -- color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r))); -- color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g))); -- color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b))); -+ color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + r))); -+ color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + g))); -+ color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + b))); - BlindSetPixelColor(x,y,color); - } - } -@@ -1284,9 +1284,9 @@ bool CxImage::ShiftRGB(long r, long g, long b) - } else { - for(DWORD j=0; j - for (int i=0;i<256;i++) { -- cTable[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - return Lut(cTable); -@@ -1337,21 +1337,21 @@ bool CxImage::GammaRGB(float gammaR, float gammaG, float gammaB) - dMax = pow(255.0, dinvgamma) / 255.0; - BYTE cTableR[256]; - for (i=0;i<256;i++) { -- cTableR[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTableR[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - dinvgamma = 1/gammaG; - dMax = pow(255.0, dinvgamma) / 255.0; - BYTE cTableG[256]; - for (i=0;i<256;i++) { -- cTableG[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTableG[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - dinvgamma = 1/gammaB; - dMax = pow(255.0, dinvgamma) / 255.0; - BYTE cTableB[256]; - for (i=0;i<256;i++) { -- cTableB[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTableB[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - return Lut(cTableR, cTableG, cTableB); -@@ -1442,11 +1442,11 @@ bool CxImage::Noise(long level) - { - color = BlindGetPixelColor(x,y); - n=(long)((rand()/(float)RAND_MAX - 0.5)*level); -- color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + n))); -+ color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + n))); - n=(long)((rand()/(float)RAND_MAX - 0.5)*level); -- color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + n))); -+ color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + n))); - n=(long)((rand()/(float)RAND_MAX - 0.5)*level); -- color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + n))); -+ color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + n))); - BlindSetPixelColor(x,y,color); - } - } -@@ -1561,8 +1561,8 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage - - //DFT buffers - double *real2,*imag2; -- real2 = (double*)malloc(max(w,h) * sizeof(double)); -- imag2 = (double*)malloc(max(w,h) * sizeof(double)); -+ real2 = (double*)malloc(cxmax(w,h) * sizeof(double)); -+ imag2 = (double*)malloc(cxmax(w,h) * sizeof(double)); - - /* Transform the rows */ - real = (double *)malloc(w * sizeof(double)); -@@ -1617,7 +1617,7 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage - - /* converting from double to byte, there is a HUGE loss in the dynamics - "nn" tries to keep an acceptable SNR, but 8bit=48dB: don't ask more */ -- double nn=pow((double)2,(double)log((double)max(w,h))/(double)log((double)2)-4); -+ double nn=pow((double)2,(double)log((double)cxmax(w,h))/(double)log((double)2)-4); - //reversed gain for reversed transform - if (direction==-1) nn=1/nn; - //bMagnitude : just to see it on the screen -@@ -1626,15 +1626,15 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage - for (j=0;jSetPixelIndex(k,j,(BYTE)max(0,min(255,(nn*(3+log(_cabs(grid[k][j]))))))); -+ tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(nn*(3+log(_cabs(grid[k][j]))))))); - if (grid[k][j].x==0){ -- tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/0.0000000001)*nn))))); -+ tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/0.0000000001)*nn))))); - } else { -- tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn))))); -+ tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn))))); - } - } else { -- tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].x*nn)))); -- tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].y*nn)))); -+ tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].x*nn)))); -+ tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].y*nn)))); - } - } - } -@@ -1922,7 +1922,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius) - - correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy); - -- tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5)))); -+ tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5)))); - } - } - -@@ -1943,7 +1943,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius) - - correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy); - -- tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5)))); -+ tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5)))); - } - } - for (x=0;x<=w;x+=w){ -@@ -1963,7 +1963,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius) - - correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy); - -- tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5)))); -+ tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5)))); - } - } - -@@ -2621,8 +2621,8 @@ bool CxImage::SelectiveBlur(float radius, BYTE threshold, CxImage* iDst) - } - - //build the difference mask -- BYTE thresh_dw = (BYTE)max( 0 ,(int)(128 - threshold)); -- BYTE thresh_up = (BYTE)min(255,(int)(128 + threshold)); -+ BYTE thresh_dw = (BYTE)cxmax( 0 ,(int)(128 - threshold)); -+ BYTE thresh_up = (BYTE)cxmin(255,(int)(128 + threshold)); - long kernel[]={-100,-100,-100,-100,801,-100,-100,-100,-100}; - if (!Tmp.Filter(kernel,3,800,128)){ - delete [] pPalette; -@@ -2755,7 +2755,7 @@ bool CxImage::UnsharpMask(float radius /*= 5.0*/, float amount /*= 0.5*/, int th - if (abs(diff) < threshold){ - dest_row[z] = cur_row[z]; - } else { -- dest_row[z] = (BYTE)min(255, max(0,(int)(cur_row[z] + amount * diff))); -+ dest_row[z] = (BYTE)cxmin(255, cxmax(0,(int)(cur_row[z] + amount * diff))); - } - } - } -@@ -2952,7 +2952,7 @@ bool CxImage::RedEyeRemove(float strength) - float a = 1.0f-5.0f*((float)((x-0.5f*(xmax+xmin))*(x-0.5f*(xmax+xmin))+(y-0.5f*(ymax+ymin))*(y-0.5f*(ymax+ymin))))/((float)((xmax-xmin)*(ymax-ymin))); - if (a<0) a=0; - color = BlindGetPixelColor(x,y); -- color.rgbRed = (BYTE)(a*min(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed); -+ color.rgbRed = (BYTE)(a*cxmin(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed); - BlindSetPixelColor(x,y,color); - } - } -@@ -2990,7 +2990,7 @@ bool CxImage::Saturate(const long saturation, const long colorspace) - case 1: - { - for (int i=0;i<256;i++) { -- cTable[i] = (BYTE)max(0,min(255,(int)(i + saturation))); -+ cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)(i + saturation))); - } - for(long y=ymin; yleft,0); -- xmax = min(pBox->right,head.biWidth); -- ymin = max(pBox->bottom,0); -- ymax = min(pBox->top,head.biHeight); -+ xmin = cxmax(pBox->left,0); -+ xmax = cxmin(pBox->right,head.biWidth); -+ ymin = cxmax(pBox->bottom,0); -+ ymax = cxmin(pBox->top,head.biHeight); - } else { - xmin = ymin = 0; - xmax = head.biWidth; ymax=head.biHeight; -@@ -3463,7 +3463,7 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa - r.top = r.bottom + nBoxSize; - int threshold = OptimalThreshold(method, &r, pContrastMask); - if (threshold <0) return false; -- mask.SetPixelIndex(x,y,(BYTE)max(0,min(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold)))); -+ mask.SetPixelIndex(x,y,(BYTE)cxmax(0,cxmin(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold)))); - } - } - -@@ -3490,10 +3490,6 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa - * Note: nOpacity=0 && bSelectFilledArea=true act as a "magic wand" - * \return true if everything is ok - */ --#if defined(XBMC) && !defined(_WIN32) --int max(int a, int b) { return a > b ? a : b; } --int min(int a, int b) { return a < b ? a : b; } --#endif - - bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFillColor, const BYTE nTolerance, - BYTE nOpacity, const bool bSelectFilledArea, const BYTE nSelectionLevel) -@@ -3538,8 +3534,8 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil - if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance - BYTE idxRef = GetPixelIndex(xStart,yStart); - BYTE idxFill = GetNearestIndex(cFillColor); -- BYTE idxMin = (BYTE)min(255, max(0,(int)(idxRef - nTolerance))); -- BYTE idxMax = (BYTE)min(255, max(0,(int)(idxRef + nTolerance))); -+ BYTE idxMin = (BYTE)cxmin(255, cxmax(0,(int)(idxRef - nTolerance))); -+ BYTE idxMax = (BYTE)cxmin(255, cxmax(0,(int)(idxRef + nTolerance))); - - while(!q.empty()) - { -@@ -3575,12 +3571,12 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil - } else { //--- RGB image - RGBQUAD cRef = GetPixelColor(xStart,yStart); - RGBQUAD cRefMin, cRefMax; -- cRefMin.rgbRed = (BYTE)min(255, max(0,(int)(cRef.rgbRed - nTolerance))); -- cRefMin.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen - nTolerance))); -- cRefMin.rgbBlue = (BYTE)min(255, max(0,(int)(cRef.rgbBlue - nTolerance))); -- cRefMax.rgbRed = (BYTE)min(255, max(0,(int)(cRef.rgbRed + nTolerance))); -- cRefMax.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen + nTolerance))); -- cRefMax.rgbBlue = (BYTE)min(255, max(0,(int)(cRef.rgbBlue + nTolerance))); -+ cRefMin.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed - nTolerance))); -+ cRefMin.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen - nTolerance))); -+ cRefMin.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue - nTolerance))); -+ cRefMax.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed + nTolerance))); -+ cRefMax.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen + nTolerance))); -+ cRefMax.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue + nTolerance))); - - while(!q.empty()) - { -diff --git a/lib/cximage-6.0/CxImage/ximage.cpp b/lib/cximage-6.0/CxImage/ximage.cpp -index e81d3c6..26c6993 100644 ---- a/lib/cximage-6.0/CxImage/ximage.cpp -+++ b/lib/cximage-6.0/CxImage/ximage.cpp -@@ -460,7 +460,7 @@ bool CxImage::CreateFromArray(BYTE* pArray,DWORD dwWidth,DWORD dwHeight,DWORD dw - src+=4; - } - } else { -- memcpy(dst,src,min(info.dwEffWidth,dwBytesperline)); -+ memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline)); - } - } - return true; -@@ -500,7 +500,7 @@ bool CxImage::CreateFromMatrix(BYTE** ppMatrix,DWORD dwWidth,DWORD dwHeight,DWOR - src+=4; - } - } else { -- memcpy(dst,src,min(info.dwEffWidth,dwBytesperline)); -+ memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline)); - } - } - } -diff --git a/lib/cximage-6.0/CxImage/ximagif.cpp b/lib/cximage-6.0/CxImage/ximagif.cpp -index b89e061..64b1ccc 100644 ---- a/lib/cximage-6.0/CxImage/ximagif.cpp -+++ b/lib/cximage-6.0/CxImage/ximagif.cpp -@@ -478,7 +478,7 @@ bool CxImageGIF::Encode(CxFile * fp, CxImage ** pImages, int pagecount, bool bLo - ghost.EncodeHeader(fp); - - if (m_loops!=1){ -- ghost.SetLoops(max(0,m_loops-1)); -+ ghost.SetLoops(cxmax(0,m_loops-1)); - ghost.EncodeLoopExtension(fp); - } - -@@ -1340,10 +1340,10 @@ void CxImageGIF::GetComment(char* sz_comment_out) - //////////////////////////////////////////////////////////////////////////////// - void CxImageGIF::GifMix(CxImage & imgsrc2, struct_image & imgdesc) - { -- long ymin = max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h)); -+ long ymin = cxmax(0,(long)(GetHeight()-imgdesc.t - imgdesc.h)); - long ymax = GetHeight()-imgdesc.t; - long xmin = imgdesc.l; -- long xmax = min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w)); -+ long xmax = cxmin(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w)); - - long ibg2= imgsrc2.GetTransIndex(); - BYTE i2; -diff --git a/lib/cximage-6.0/CxImage/ximahist.cpp b/lib/cximage-6.0/CxImage/ximahist.cpp -index a2aed03..5391107 100644 ---- a/lib/cximage-6.0/CxImage/ximahist.cpp -+++ b/lib/cximage-6.0/CxImage/ximahist.cpp -@@ -110,7 +110,7 @@ bool CxImage::HistogramStretch(long method, double threshold) - // calculate LUT - BYTE lut[256]; - for (x = 0; x <256; x++){ -- lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc)))); -+ lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc)))); - } - - for (y=0; yGetEffWidth(); -- else n = min(n,(int)ima->GetEffWidth()); -+ else n = cxmin(n,(int)ima->GetEffWidth()); - - if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) memcpy(IterImage,buf,n); - } -@@ -148,7 +148,7 @@ inline void CImageIterator::SetRow(BYTE *buf, int n) - inline void CImageIterator::GetRow(BYTE *buf, int n) - { - if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) -- memcpy(buf,IterImage,min(n,(int)ima->GetEffWidth())); -+ memcpy(buf,IterImage,cxmin(n,(int)ima->GetEffWidth())); - } - ///////////////////////////////////////////////////////////////////// - inline BYTE* CImageIterator::GetRow() -diff --git a/lib/cximage-6.0/CxImage/ximajbg.cpp b/lib/cximage-6.0/CxImage/ximajbg.cpp -index 06fb9bf..8a01e28 100644 ---- a/lib/cximage-6.0/CxImage/ximajbg.cpp -+++ b/lib/cximage-6.0/CxImage/ximajbg.cpp -@@ -145,7 +145,7 @@ bool CxImageJBG::Encode(CxFile * hFile) - jbg_enc_init(&jbig_state, w, h, planes, &buffer, jbig_data_out, hFile); - - //jbg_enc_layers(&jbig_state, 2); -- //jbg_enc_lrlmax(&jbig_state, 800, 600); -+ //jbg_enc_lrlcxmax(&jbig_state, 800, 600); - - // Specify a few other options (each is ignored if negative) - int dl = -1, dh = -1, d = -1, l0 = -1, mx = -1; -diff --git a/lib/cximage-6.0/CxImage/ximapal.cpp b/lib/cximage-6.0/CxImage/ximapal.cpp -index b3bd3da..3788c98 100644 ---- a/lib/cximage-6.0/CxImage/ximapal.cpp -+++ b/lib/cximage-6.0/CxImage/ximapal.cpp -@@ -398,8 +398,8 @@ void CxImage::RGBtoBGR(BYTE *buffer, int length) - { - if (buffer && (head.biClrUsed==0)){ - BYTE temp; -- length = min(length,(int)info.dwEffWidth); -- length = min(length,(int)(3*head.biWidth)); -+ length = cxmin(length,(int)info.dwEffWidth); -+ length = cxmin(length,(int)(3*head.biWidth)); - for (int i=0;i needed for grayscale PNGs - - #ifdef USE_NEW_LIBPNG_API -- int nshift = max(0,(_bit_depth>>3)-1)<<3; -+ int nshift = cxmax(0,(_bit_depth>>3)-1)<<3; - #else -- int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3; -+ int nshift = cxmax(0,(info_ptr->bit_depth>>3)-1)<<3; - #endif - - #ifdef USE_NEW_LIBPNG_API -@@ -255,10 +255,10 @@ bool CxImagePNG::Decode(CxFile *hFile) - if (pal){ - DWORD ip; - #ifdef USE_NEW_LIBPNG_API -- for (ip=0;ipnum_trans);ip++) -+ for (ip=0;ipnum_trans);ip++) - #if PNG_LIBPNG_VER > 10399 - pal[ip].rgbReserved=info_ptr->trans_alpha[ip]; - #else -@@ -737,9 +737,9 @@ bool CxImagePNG::Encode(CxFile *hFile) - #endif // CXIMAGE_SUPPORT_ALPHA // - - #ifdef USE_NEW_LIBPNG_API -- int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8)); -+ int row_size = cxmax(info.dwEffWidth, (_width * _channels * _bit_depth / 8)); - #else -- int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8)); -+ int row_size = cxmax(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8)); - info_ptr->rowbytes = row_size; - #endif - BYTE *row_pointers = new BYTE[row_size]; -diff --git a/lib/cximage-6.0/CxImage/ximaraw.cpp b/lib/cximage-6.0/CxImage/ximaraw.cpp -index fd86f96..52d964d 100644 ---- a/lib/cximage-6.0/CxImage/ximaraw.cpp -+++ b/lib/cximage-6.0/CxImage/ximaraw.cpp -@@ -216,7 +216,7 @@ bool CxImageRAW::Decode(CxFile *hFile) - - DWORD size = dcr.width * (dcr.colors*dcr.opt.output_bps/8); - RGBtoBGR(ppm,size); -- memcpy(GetBits(dcr.height - 1 - row), ppm, min(size,GetEffWidth())); -+ memcpy(GetBits(dcr.height - 1 - row), ppm, cxmin(size,GetEffWidth())); - } - free (ppm); - -@@ -298,7 +298,7 @@ bool CxImageRAW::GetExifThumbnail(const char *filename, const char *outname, int - // Resizing. - if (image.GetWidth() > 256 || image.GetHeight() > 256) - { -- float amount = 256.0f / max(image.GetWidth(), image.GetHeight()); -+ float amount = 256.0f / cxmax(image.GetWidth(), image.GetHeight()); - image.Resample((long)(image.GetWidth() * amount), (long)(image.GetHeight() * amount), 0); - } - -diff --git a/lib/cximage-6.0/CxImage/ximasel.cpp b/lib/cximage-6.0/CxImage/ximasel.cpp -index 3a7c9a1..37cd10f 100644 ---- a/lib/cximage-6.0/CxImage/ximasel.cpp -+++ b/lib/cximage-6.0/CxImage/ximasel.cpp -@@ -113,15 +113,15 @@ bool CxImage::SelectionAddRect(RECT r, BYTE level) - if (r.left r2.left) info.rSelectionBox.left = max(0L,min(head.biWidth,r2.left)); -- if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = max(0L,min(head.biWidth,r2.right+1)); -- if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = max(0L,min(head.biHeight,r2.bottom)); -+ if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,r2.top+1)); -+ if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,r2.left)); -+ if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,r2.right+1)); -+ if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,r2.bottom)); - -- long ymin = max(0L,min(head.biHeight,r2.bottom)); -- long ymax = max(0L,min(head.biHeight,r2.top+1)); -- long xmin = max(0L,min(head.biWidth,r2.left)); -- long xmax = max(0L,min(head.biWidth,r2.right+1)); -+ long ymin = cxmax(0L,cxmin(head.biHeight,r2.bottom)); -+ long ymax = cxmax(0L,cxmin(head.biHeight,r2.top+1)); -+ long xmin = cxmax(0L,cxmin(head.biWidth,r2.left)); -+ long xmax = cxmax(0L,cxmin(head.biWidth,r2.right+1)); - - for (long y=ymin; y (xcenter - xradius)) info.rSelectionBox.left = max(0L,min(head.biWidth,(xcenter - xradius))); -- if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = max(0L,min(head.biWidth,(xcenter + xradius + 1))); -- if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = max(0L,min(head.biHeight,(ycenter - yradius))); -- if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = max(0L,min(head.biHeight,(ycenter + yradius + 1))); -+ if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,(xcenter - xradius))); -+ if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,(xcenter + xradius + 1))); -+ if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,(ycenter - yradius))); -+ if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,(ycenter + yradius + 1))); - -- long xmin = max(0L,min(head.biWidth,xcenter - xradius)); -- long xmax = max(0L,min(head.biWidth,xcenter + xradius + 1)); -- long ymin = max(0L,min(head.biHeight,ycenter - yradius)); -- long ymax = max(0L,min(head.biHeight,ycenter + yradius + 1)); -+ long xmin = cxmax(0L,cxmin(head.biWidth,xcenter - xradius)); -+ long xmax = cxmax(0L,cxmin(head.biWidth,xcenter + xradius + 1)); -+ long ymin = cxmax(0L,cxmin(head.biHeight,ycenter - yradius)); -+ long ymax = cxmax(0L,cxmin(head.biHeight,ycenter + yradius + 1)); - - long y,yo; -- for (y=ymin; yx < next->x) {r2.left=current->x; r2.right=next->x; } else {r2.left=next->x ; r2.right=current->x; } - if (current->y < next->y) {r2.bottom=current->y; r2.top=next->y; } else {r2.bottom=next->y ; r2.top=current->y; } -- if (localbox.top < r2.top) localbox.top = max(0L,min(head.biHeight-1,r2.top+1)); -- if (localbox.left > r2.left) localbox.left = max(0L,min(head.biWidth-1,r2.left-1)); -- if (localbox.right < r2.right) localbox.right = max(0L,min(head.biWidth-1,r2.right+1)); -- if (localbox.bottom > r2.bottom) localbox.bottom = max(0L,min(head.biHeight-1,r2.bottom-1)); -+ if (localbox.top < r2.top) localbox.top = cxmax(0L,cxmin(head.biHeight-1,r2.top+1)); -+ if (localbox.left > r2.left) localbox.left = cxmax(0L,cxmin(head.biWidth-1,r2.left-1)); -+ if (localbox.right < r2.right) localbox.right = cxmax(0L,cxmin(head.biWidth-1,r2.right+1)); -+ if (localbox.bottom > r2.bottom) localbox.bottom = cxmax(0L,cxmin(head.biHeight-1,r2.bottom-1)); - - i++; - } -@@ -385,10 +385,10 @@ bool CxImage::SelectionAddPolygon(POINT *points, long npoints, BYTE level) - for (x=localbox.left; x<=localbox.right; x++) - if (plocal[x + yoffset]!=1) pSelection[x + yoffset]=level; - } -- if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = min(head.biHeight,localbox.top + 1); -- if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = min(head.biWidth,localbox.left); -- if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = min(head.biWidth,localbox.right + 1); -- if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = min(head.biHeight,localbox.bottom); -+ if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = cxmin(head.biHeight,localbox.top + 1); -+ if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = cxmin(head.biWidth,localbox.left); -+ if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = cxmin(head.biWidth,localbox.right + 1); -+ if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = cxmin(head.biHeight,localbox.bottom); - - free(plocal); - free(pix); -diff --git a/lib/cximage-6.0/CxImage/ximath.cpp b/lib/cximage-6.0/CxImage/ximath.cpp -index 37533e2..f84eb72 100644 ---- a/lib/cximage-6.0/CxImage/ximath.cpp -+++ b/lib/cximage-6.0/CxImage/ximath.cpp -@@ -64,10 +64,10 @@ CxRect2 CxRect2::CrossSection(CxRect2 const &r2) const - */ - { - CxRect2 cs; -- cs.botLeft.x=max(botLeft.x, r2.botLeft.x); -- cs.botLeft.y=max(botLeft.y, r2.botLeft.y); -- cs.topRight.x=min(topRight.x, r2.topRight.x); -- cs.topRight.y=min(topRight.y, r2.topRight.y); -+ cs.botLeft.x=cxmax(botLeft.x, r2.botLeft.x); -+ cs.botLeft.y=cxmax(botLeft.y, r2.botLeft.y); -+ cs.topRight.x=cxmin(topRight.x, r2.topRight.x); -+ cs.topRight.y=cxmin(topRight.y, r2.topRight.y); - if (cs.botLeft.x<=cs.topRight.x && cs.botLeft.y<=cs.topRight.y) { - return cs; - } else { -diff --git a/lib/cximage-6.0/CxImage/ximatif.cpp b/lib/cximage-6.0/CxImage/ximatif.cpp -index 658392a..002766c 100644 ---- a/lib/cximage-6.0/CxImage/ximatif.cpp -+++ b/lib/cximage-6.0/CxImage/ximatif.cpp -@@ -470,9 +470,9 @@ bool CxImageTIF::Decode(CxFile * hFile) - if ( cb > 0.00304 ) cb = 1.055 * pow(cb,0.41667) - 0.055; - else cb = 12.92 * cb; - -- c.rgbRed =(BYTE)max(0,min(255,(int)(cr*255))); -- c.rgbGreen=(BYTE)max(0,min(255,(int)(cg*255))); -- c.rgbBlue =(BYTE)max(0,min(255,(int)(cb*255))); -+ c.rgbRed =(BYTE)cxmax(0,cxmin(255,(int)(cr*255))); -+ c.rgbGreen=(BYTE)cxmax(0,cxmin(255,(int)(cg*255))); -+ c.rgbBlue =(BYTE)cxmax(0,cxmin(255,(int)(cb*255))); - - SetPixelColor(xi,yi,c); - #if CXIMAGE_SUPPORT_ALPHA -diff --git a/lib/cximage-6.0/CxImage/ximatran.cpp b/lib/cximage-6.0/CxImage/ximatran.cpp -index 64a71e7..84d5e03 100644 ---- a/lib/cximage-6.0/CxImage/ximatran.cpp -+++ b/lib/cximage-6.0/CxImage/ximatran.cpp -@@ -302,12 +302,12 @@ bool CxImage::RotateLeft(CxImage* iDst) - for (ys = 0; ys < newHeight; ys+=RBLOCK) { - if (head.biBitCount==24) { - //RGB24 optimized pixel access: -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ //do rotation -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ //do rotation - info.nProgress = (long)(100*x/newWidth); - x2=newWidth-x-1; - dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(x,ys); - srcPtr = (BYTE*) BlindGetPixelPointer(ys, x2); -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - //imgDest.SetPixelColor(x, y, GetPixelColor(y, x2)); - *(dstPtr) = *(srcPtr); - *(dstPtr+1) = *(srcPtr+1); -@@ -318,19 +318,19 @@ bool CxImage::RotateLeft(CxImage* iDst) - }//for x - } else { - //anything else than 24bpp (and 1bpp): palette -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - info.nProgress = (long)(100*x/newWidth); // - x2=newWidth-x-1; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y, x2)); - }//for y - }//for x - }//if (version selection) - #if CXIMAGE_SUPPORT_ALPHA - if (AlphaIsValid()) { -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - x2=newWidth-x-1; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - imgDest.AlphaSet(x,y,BlindAlphaGet(y, x2)); - }//for y - }//for x -@@ -343,9 +343,9 @@ bool CxImage::RotateLeft(CxImage* iDst) - imgDest.info.rSelectionBox.right = newWidth-info.rSelectionBox.bottom; - imgDest.info.rSelectionBox.bottom = info.rSelectionBox.left; - imgDest.info.rSelectionBox.top = info.rSelectionBox.right; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - x2=newWidth-x-1; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - imgDest.SelectionSet(x,y,BlindSelectionGet(y, x2)); - }//for y - }//for x -@@ -447,12 +447,12 @@ bool CxImage::RotateRight(CxImage* iDst) - for (ys = 0; ys < newHeight; ys+=RBLOCK) { - if (head.biBitCount==24) { - //RGB24 optimized pixel access: -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - info.nProgress = (long)(100*y/newHeight); // - y2=newHeight-y-1; - dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(xs,y); - srcPtr = (BYTE*) BlindGetPixelPointer(y2, xs); -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - //imgDest.SetPixelColor(x, y, GetPixelColor(y2, x)); - *(dstPtr) = *(srcPtr); - *(dstPtr+1) = *(srcPtr+1); -@@ -463,19 +463,19 @@ bool CxImage::RotateRight(CxImage* iDst) - }//for y - } else { - //anything else than BW & RGB24: palette -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - info.nProgress = (long)(100*y/newHeight); // - y2=newHeight-y-1; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y2, x)); - }//for x - }//for y - }//if - #if CXIMAGE_SUPPORT_ALPHA - if (AlphaIsValid()){ -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - y2=newHeight-y-1; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - imgDest.AlphaSet(x,y,BlindAlphaGet(y2, x)); - }//for x - }//for y -@@ -488,9 +488,9 @@ bool CxImage::RotateRight(CxImage* iDst) - imgDest.info.rSelectionBox.right = info.rSelectionBox.top; - imgDest.info.rSelectionBox.bottom = newHeight-info.rSelectionBox.right; - imgDest.info.rSelectionBox.top = newHeight-info.rSelectionBox.left; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - y2=newHeight-y-1; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - imgDest.SelectionSet(x,y,BlindSelectionGet(y2, x)); - }//for x - }//for y -@@ -608,10 +608,10 @@ bool CxImage::Rotate(float angle, CxImage* iDst) - newP4.x = (float)(p4.x*cos_angle - p4.y*sin_angle); - newP4.y = (float)(p4.x*sin_angle + p4.y*cos_angle); - -- leftTop.x = min(min(newP1.x,newP2.x),min(newP3.x,newP4.x)); -- leftTop.y = min(min(newP1.y,newP2.y),min(newP3.y,newP4.y)); -- rightBottom.x = max(max(newP1.x,newP2.x),max(newP3.x,newP4.x)); -- rightBottom.y = max(max(newP1.y,newP2.y),max(newP3.y,newP4.y)); -+ leftTop.x = cxmin(cxmin(newP1.x,newP2.x),cxmin(newP3.x,newP4.x)); -+ leftTop.y = cxmin(cxmin(newP1.y,newP2.y),cxmin(newP3.y,newP4.y)); -+ rightBottom.x = cxmax(cxmax(newP1.x,newP2.x),cxmax(newP3.x,newP4.x)); -+ rightBottom.y = cxmax(cxmax(newP1.y,newP2.y),cxmax(newP3.y,newP4.y)); - leftBottom.x = leftTop.x; - leftBottom.y = rightBottom.y; - rightTop.x = rightBottom.x; -@@ -740,10 +740,10 @@ bool CxImage::Rotate2(float angle, - }//if - - //(read new dimensions from location of corners) -- float minx = (float) min(min(newp[0].x,newp[1].x),min(newp[2].x,newp[3].x)); -- float miny = (float) min(min(newp[0].y,newp[1].y),min(newp[2].y,newp[3].y)); -- float maxx = (float) max(max(newp[0].x,newp[1].x),max(newp[2].x,newp[3].x)); -- float maxy = (float) max(max(newp[0].y,newp[1].y),max(newp[2].y,newp[3].y)); -+ float minx = (float) cxmin(cxmin(newp[0].x,newp[1].x),cxmin(newp[2].x,newp[3].x)); -+ float miny = (float) cxmin(cxmin(newp[0].y,newp[1].y),cxmin(newp[2].y,newp[3].y)); -+ float maxx = (float) cxmax(cxmax(newp[0].x,newp[1].x),cxmax(newp[2].x,newp[3].x)); -+ float maxy = (float) cxmax(cxmax(newp[0].y,newp[1].y),cxmax(newp[2].y,newp[3].y)); - int newWidth = (int) floor(maxx-minx+0.5f); - int newHeight= (int) floor(maxy-miny+0.5f); - float ssx=((maxx+minx)- ((float) newWidth-1))/2.0f; //start for x -@@ -1003,12 +1003,12 @@ bool CxImage::Resample(long newx, long newy, int mode, CxImage* iDst) - if (info.nEscape) break; - fY = y * yScale; - ifY = (int)fY; -- ifY1 = min(ymax, ifY+1); -+ ifY1 = cxmin(ymax, ifY+1); - dy = fY - ifY; - for(long x=0; x 1 && fy > 1) { -@@ -813,7 +813,7 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b - - for(yy=0;yy>8); diff --git a/srcpkgs/kodi/patches/fix-musl-x86.patch b/srcpkgs/kodi/patches/fix-musl-x86.patch deleted file mode 100644 index 00e36e361f..0000000000 --- a/srcpkgs/kodi/patches/fix-musl-x86.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/xbmc/cores/DllLoader/ldt_keeper.c.orig 2016-03-25 17:39:06.790371676 +0100 -+++ b/xbmc/cores/DllLoader/ldt_keeper.c 2016-03-25 17:38:24.376370166 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include "mmap_anon.h" - #if defined( __linux__ ) && !defined(__powerpc__) - #include -@@ -202,7 +203,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) - array.limit_in_pages = 0; - #ifdef __linux__ - /* ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s)); */ -- ret = modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s)); -+ ret = syscall(SYS_modify_ldt, 0x1, &array, sizeof(struct modify_ldt_ldt_s)); - if (ret < 0) - { - perror("install_fs"); diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch index e44e5a280c..a5a9d92141 100644 --- a/srcpkgs/kodi/patches/fix-musl.patch +++ b/srcpkgs/kodi/patches/fix-musl.patch @@ -1,55 +1,56 @@ -diff -upr xbmc-16.0-Jarvis.orig/configure.ac xbmc-16.0-Jarvis/configure.ac ---- xbmc-16.0-Jarvis.orig/configure.ac 2016-03-19 07:28:05.389703445 +0100 -+++ xbmc-16.0-Jarvis/configure.ac 2016-03-19 07:35:44.771669064 +0100 -@@ -564,7 +564,7 @@ case $host in +diff --git a/configure.ac b/configure.ac +index 9bd8d6e..205acfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -526,7 +526,7 @@ case $host in use_x11=no - build_shared_lib=yes + build_shared_lib=yes ;; - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*) ++ i*86*-linux-*) target_platform=target_linux + CORE_SYSTEM_NAME=linux ARCH="i486-linux" - if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then -@@ -586,7 +586,7 @@ case $host in +@@ -549,7 +549,7 @@ case $host in fi fi ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) -+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) ++ x86_64-*-linux-*) target_platform=target_linux + CORE_SYSTEM_NAME=linux ARCH="x86_64-linux" - if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then -@@ -645,7 +645,7 @@ case $host in - powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) - ARCH="powerpc64-linux" - ;; -- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) -+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*) - target_platform=target_linux - ARCH="arm" - use_arch="arm" -diff -upr xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 xbmc-16.0-Jarvis/m4/xbmc_arch.m4 ---- xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 2016-02-20 16:21:19.000000000 +0100 -+++ xbmc-16.0-Jarvis/m4/xbmc_arch.m4 2016-03-19 07:37:37.070660659 +0100 +diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4 +index d28f263..6fb6210 100644 +--- a/m4/xbmc_arch.m4 ++++ b/m4/xbmc_arch.m4 @@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[ # build detection and setup - this is the native arch case $build in - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-linux-musl*) ++ i*86*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) -+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) ++ x86_64-*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; i386-*-freebsd*) -@@ -23,7 +23,7 @@ case $build in - powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) +@@ -17,13 +17,13 @@ case $build in + *86*-apple-darwin*) + AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX") + ;; +- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*) ++ powerpc-*-linux-*) + AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC") + ;; +- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ++ powerpc64-*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64") ;; - arm*-*-linux-gnu*|arm*-*-linux-uclibc*) -+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*) ++ arm*-*-linux-*) AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; *) @@ -58,20 +59,66 @@ diff -upr xbmc-16.0-Jarvis.orig/m4/xbmc_arch.m4 xbmc-16.0-Jarvis/m4/xbmc_arch.m4 # host detection and setup - this is the target arch case $host in - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) -+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|*i*86*-linux-musl*) ++ i*86*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) -+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*) ++ x86_64-*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; i386-*-freebsd*) -@@ -60,7 +60,7 @@ case $host in - powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) +@@ -54,16 +54,16 @@ case $host in + powerpc-apple-darwin*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX") + ;; +- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*) ++ powerpc-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC") + ;; +- powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*) ++ powerpc64*-*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64") ;; -- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) -+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-linux-musl*) +- arm*-*-linux-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*) ++ arm*-*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; - mips*-*-linux-gnu*|mips*-*-linux-uclibc*) +- mips*-*-linux-gnu*|mips*-*-linux-uclibc*) ++ mips*-*-linux-*) + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") + ;; + *-*linux-android*) +diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac +index 3626ea5..f178f7a 100644 +--- a/tools/depends/configure.ac ++++ b/tools/depends/configure.ac +@@ -120,13 +120,13 @@ platform_cc=gcc + platform_cxx=g++ + + case $build in +- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) ++ arm*-*-linux-*) + build_os="linux" + ;; +- *i686*-linux-gnu*|i*86*-*-linux-uclibc*) ++ i*86*-*-linux-*) + build_os="linux" + ;; +- x86_64*-linux-gnu*|x86_64-*-linux-uclibc*) ++ x86_64*-linux-*) + build_os="linux" + ;; + *darwin*) +diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c +index 3fe6854..ca78612 100644 +--- a/xbmc/cores/DllLoader/ldt_keeper.c ++++ b/xbmc/cores/DllLoader/ldt_keeper.c +@@ -48,7 +48,7 @@ extern "C" { + #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)) + _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount ); + #else +-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt) ++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt) + #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c); + #else + int modify_ldt(int func, void *ptr, unsigned long bytecount); diff --git a/srcpkgs/kodi/patches/kodi-16-ffmpeg3.patch b/srcpkgs/kodi/patches/kodi-16-ffmpeg3.patch deleted file mode 100644 index 755af69f8f..0000000000 --- a/srcpkgs/kodi/patches/kodi-16-ffmpeg3.patch +++ /dev/null @@ -1,641 +0,0 @@ - -Changes from original commit are only in file paths & quilt refresh. - -commit c31b7d374062f87c7512d9872cbceac920465913 -Author: Philip Langdale -Date: Mon Sep 21 19:49:36 2015 -0700 - - ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master - - The deprecated PixelFormat and PIX_FMT_* names have been removed in - ffmpeg master. - -Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h -+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h -@@ -24,7 +24,6 @@ - #include "utils/CPUInfo.h" - - extern "C" { --#include "libswscale/swscale.h" - #include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - #include "libavutil/avutil.h" -@@ -33,23 +32,6 @@ extern "C" { - #include "libpostproc/postprocess.h" - } - --inline int SwScaleCPUFlags() --{ -- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); -- int flags = 0; -- -- if (cpuFeatures & CPU_FEATURE_MMX) -- flags |= SWS_CPU_CAPS_MMX; -- if (cpuFeatures & CPU_FEATURE_MMX2) -- flags |= SWS_CPU_CAPS_MMX2; -- if (cpuFeatures & CPU_FEATURE_3DNOW) -- flags |= SWS_CPU_CAPS_3DNOW; -- if (cpuFeatures & CPU_FEATURE_ALTIVEC) -- flags |= SWS_CPU_CAPS_ALTIVEC; -- -- return flags; --} -- - inline int PPCPUFlags() - { - unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -@@ -39,7 +39,7 @@ extern "C" { - #include "libswscale/swscale.h" - } - --// allocate a new picture (PIX_FMT_YUV420P) -+// allocate a new picture (AV_PIX_FMT_YUV420P) - DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight) - { - DVDVideoPicture* pPicture = new DVDVideoPicture; -@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert - - int dstformat; - if (format == RENDER_FMT_UYVY422) -- dstformat = PIX_FMT_UYVY422; -+ dstformat = AV_PIX_FMT_UYVY422; - else -- dstformat = PIX_FMT_YUYV422; -+ dstformat = AV_PIX_FMT_YUYV422; - -- struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P, -+ struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P, - pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat, -- SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ SWS_BILINEAR, NULL, NULL, NULL); - sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride); - sws_freeContext(ctx); - } -@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur - } - - struct EFormatMap { -- PixelFormat pix_fmt; -+ AVPixelFormat pix_fmt; - ERenderFormat format; - }; - - static const EFormatMap g_format_map[] = { -- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P } --, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } --, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } --, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } --, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } --, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } --, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } --, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } --, { PIX_FMT_NONE , RENDER_FMT_NONE } -+ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P } -+, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } -+, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } -+, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } -+, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } -+, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } -+, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } -+, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } -+, { AV_PIX_FMT_NONE , RENDER_FMT_NONE } - }; - - ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt) - { -- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) -+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) - { - if(p->pix_fmt == fmt) - return p->format; -@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro - - int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt) - { -- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) -+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) - { - if(p->format == fmt) - return p->pix_fmt; - } -- return PIX_FMT_NONE; -+ return AV_PIX_FMT_NONE; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -77,8 +77,8 @@ enum DecoderState - STATE_SW_MULTI - }; - --enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx -- , const PixelFormat * fmt ) -+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx -+ , const AVPixelFormat * fmt ) - { - CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque; - -@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G - avctx->hwaccel_context = 0; - } - -- const PixelFormat * cur = fmt; -- while(*cur != PIX_FMT_NONE) -+ const AVPixelFormat * cur = fmt; -+ while(*cur != AV_PIX_FMT_NONE) - { - #ifdef HAVE_LIBVDPAU - if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU)) -@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G - #endif - #ifdef HAVE_LIBVA - // mpeg4 vaapi decoding is disabled -- if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) -+ if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) - { - VAAPI::CDecoder* dec = new VAAPI::CDecoder(); - if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true) -@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre - - for(std::vector::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it) - { -- m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); -+ m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); - if(*it == RENDER_FMT_YUV420P) -- m_formats.push_back(PIX_FMT_YUVJ420P); -+ m_formats.push_back(AV_PIX_FMT_YUVJ420P); - } -- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ -+ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ - - pCodec = avcodec_find_decoder(hints.codec); - -@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom - pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc; - pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace; - if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG -- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P) -+ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P) - pDvdVideoPicture->color_range = 1; - else - pDvdVideoPicture->color_range = 0; -@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV - pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED; - pDvdVideoPicture->extended_format = 0; - -- PixelFormat pix_fmt; -- pix_fmt = (PixelFormat)m_pFrame->format; -+ AVPixelFormat pix_fmt; -+ pix_fmt = (AVPixelFormat)m_pFrame->format; - - pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt); - return true; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -@@ -46,7 +46,7 @@ public: - public: - IHardwareDecoder() {} - virtual ~IHardwareDecoder() {}; -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0; -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0; - virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0; - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0; - virtual int Check (AVCodecContext* avctx) = 0; -@@ -77,7 +77,7 @@ public: - void SetHardware(IHardwareDecoder* hardware); - - protected: -- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt); -+ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt); - - int FilterOpen(const std::string& filters, bool scale); - void FilterClose(); -@@ -119,7 +119,7 @@ protected: - int m_iLastKeyframe; - double m_dts; - bool m_started; -- std::vector m_formats; -+ std::vector m_formats; - double m_decoderPts; - int m_skippedDeint; - bool m_requestSkipDeint; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop( - - void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture) - { -- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P. -+ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P. - struct SwsContext *swcontext = sws_getContext( -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422, -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - if (swcontext) - { - uint8_t *src[] = { yuv422_ptr, 0, 0, 0 }; -@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42 - - void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture) - { -- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P. -+ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P. - struct SwsContext *swcontext = sws_getContext( -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA, -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - if (swcontext) - { - uint8_t *src[] = { bgra_ptr, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo - return true; - } - --bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) - { - if (!CheckCompatibility(avctx)) - return false; -@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder() - return true; - } - --bool CDecoder::Supports(enum PixelFormat fmt) -+bool CDecoder::Supports(enum AVPixelFormat fmt) - { -- if(fmt == PIX_FMT_DXVA2_VLD) -+ if(fmt == AV_PIX_FMT_DXVA2_VLD) - return true; - return false; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -@@ -141,7 +141,7 @@ class CDecoder - public: - CDecoder(); - ~CDecoder(); -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual int Check (AVCodecContext* avctx); -@@ -154,7 +154,7 @@ public: - int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); - void RelBuffer(uint8_t *data); - -- static bool Supports(enum PixelFormat fmt); -+ static bool Supports(enum AVPixelFormat fmt); - - void CloseDXVADecoder(); - -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -@@ -479,7 +479,7 @@ CDecoder::~CDecoder() - Close(); - } - --bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) - { - // don't support broken wrappers by default - // nvidia cards with a vaapi to vdpau wrapper -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -@@ -406,7 +406,7 @@ public: - CDecoder(); - virtual ~CDecoder(); - -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual void Reset(); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -@@ -186,7 +186,7 @@ void CDecoder::Close() - m_bitstream = NULL; - } - --bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) - { - Close(); - -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -@@ -35,7 +35,7 @@ class CDecoder - public: - CDecoder(); - ~CDecoder(); -- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode(AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual int Check(AVCodecContext* avctx); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_ - m_vdpauConfig.context = 0; - } - --bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) - { - // check if user wants to decode this format with VDPAU - std::string gpuvendor = g_Windowing.GetRenderVendor(); -@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct - return 0; - } - --bool CDecoder::IsVDPAUFormat(PixelFormat format) -+bool CDecoder::IsVDPAUFormat(AVPixelFormat format) - { - if (format == AV_PIX_FMT_VDPAU) - return true; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -@@ -556,7 +556,7 @@ public: - CDecoder(); - virtual ~CDecoder(); - -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual void Reset(); -@@ -571,7 +571,7 @@ public: - bool Supports(VdpVideoMixerFeature feature); - bool Supports(EINTERLACEMETHOD method); - EINTERLACEMETHOD AutoInterlaceMethod(); -- static bool IsVDPAUFormat(PixelFormat fmt); -+ static bool IsVDPAUFormat(AVPixelFormat fmt); - - static void FFReleaseBuffer(void *opaque, uint8_t *data); - static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack - - // for video we need a decoder to get desired information into codec context - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata && -- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) -+ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE)) - { - // open a decoder, it will be cleared down by ffmpeg on closing the stream - if (!st->codec->codec) -@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() - st = m_pFormatContext->streams[idx]; - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { -- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) -+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) - return true; - hasVideo = true; - } -@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() - st = m_pFormatContext->streams[i]; - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { -- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) -+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) - return true; - hasVideo = true; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp -@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st - - uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4]; - struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight, -- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); - - if (context) - { -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - } - else if (m_format == RENDER_FMT_NV12) - { -- srcFormat = PIX_FMT_NV12; -+ srcFormat = AV_PIX_FMT_NV12; - for (int i = 0; i < 2; i++) - { - src[i] = im->plane[i]; -@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - } - else if (m_format == RENDER_FMT_YUYV422) - { -- srcFormat = PIX_FMT_YUYV422; -+ srcFormat = AV_PIX_FMT_YUYV422; - src[0] = im->plane[0]; - srcStride[0] = im->stride[0]; - } - else if (m_format == RENDER_FMT_UYVY422) - { -- srcFormat = PIX_FMT_UYVY422; -+ srcFormat = AV_PIX_FMT_UYVY422; - src[0] = im->plane[0]; - srcStride[0] = im->stride[0]; - } -@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - - m_context = sws_getCachedContext(m_context, - im->width, im->height, (AVPixelFormat)srcFormat, -- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - - uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 }; - int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; -@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - - if (m_format == RENDER_FMT_YUV420P) - { -- srcFormat = PIX_FMT_YUV420P; -+ srcFormat = AV_PIX_FMT_YUV420P; - for (int i = 0; i < 3; i++) - { - srcTop[i] = im->plane[i]; -@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_NV12) - { -- srcFormat = PIX_FMT_NV12; -+ srcFormat = AV_PIX_FMT_NV12; - for (int i = 0; i < 2; i++) - { - srcTop[i] = im->plane[i]; -@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_YUYV422) - { -- srcFormat = PIX_FMT_YUYV422; -+ srcFormat = AV_PIX_FMT_YUYV422; - srcTop[0] = im->plane[0]; - srcStrideTop[0] = im->stride[0] * 2; - srcBot[0] = im->plane[0] + im->stride[0]; -@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_UYVY422) - { -- srcFormat = PIX_FMT_UYVY422; -+ srcFormat = AV_PIX_FMT_UYVY422; - srcTop[0] = im->plane[0]; - srcStrideTop[0] = im->stride[0] * 2; - srcBot[0] = im->plane[0] + im->stride[0]; -@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I - - m_context = sws_getCachedContext(m_context, - im->width, im->height >> 1, (AVPixelFormat)srcFormat, -- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 }; - uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 }; - int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu - #endif - { - m_sw_context = sws_getCachedContext(m_sw_context, -- im->width, im->height, PIX_FMT_YUV420P, -- im->width, im->height, PIX_FMT_RGBA, -+ im->width, im->height, AV_PIX_FMT_YUV420P, -+ im->width, im->height, AV_PIX_FMT_RGBA, - SWS_FAST_BILINEAR, NULL, NULL, NULL); - - uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp -@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer() - UnInit(); - } - --static enum PixelFormat PixelFormatFromFormat(ERenderFormat format) -+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format) - { -- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12; -- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P; -- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10; -- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16; -- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12; -- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422; -- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422; -- return PIX_FMT_NONE; -+ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12; -+ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P; -+ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10; -+ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16; -+ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12; -+ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422; -+ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422; -+ return AV_PIX_FMT_NONE; - } - - void CWinRenderer::ManageTextures() -@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags) - - void CWinRenderer::RenderSW() - { -- enum PixelFormat format = PixelFormatFromFormat(m_format); -+ enum AVPixelFormat format = PixelFormatFromFormat(m_format); - - // 1. convert yuv to rgb - m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx, - m_sourceWidth, m_sourceHeight, format, -- m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - - YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer]; - -Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp -+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp -@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi - uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch, - CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */) - { -- struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA, -- out_width, out_height, PIX_FMT_BGRA, -- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL); -+ struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA, -+ out_width, out_height, AV_PIX_FMT_BGRA, -+ CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL); - - uint8_t *src[] = { in_pixels, 0, 0, 0 }; - int srcStride[] = { (int)in_pitch, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp -+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp -@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas - return false; - - // Due to a bug in swsscale we need to allocate one extra line of data -- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) -+ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) - return false; - } - -@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas - - // We got the video frame, render it into the picture buffer - struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt, -- m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); -+ m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); - - sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height, - m_pFrameRGB->data, m_pFrameRGB->linesize ); diff --git a/srcpkgs/kodi/patches/versioncheck.patch b/srcpkgs/kodi/patches/versioncheck.patch new file mode 100644 index 0000000000..0b2f24b25a --- /dev/null +++ b/srcpkgs/kodi/patches/versioncheck.patch @@ -0,0 +1,10 @@ +--- a/system/addon-manifest.xml.orig ++++ b/system/addon-manifest.xml +@@ -28,7 +28,6 @@ + screensaver.xbmc.builtin.black + screensaver.xbmc.builtin.dim + script.module.pil +- service.xbmc.versioncheck + skin.estuary + skin.estouchy + webinterface.default \ No newline at end of file diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index a753c337b8..dfef8d77c5 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,16 +1,16 @@ # Template file for 'kodi' pkgname=kodi -version=16.1 -revision=7 +version=17.1 +revision=1 patch_args="-Np1" -_codename="Jarvis" +_codename="Krypton" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media" maintainer="Juan RP " homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 +checksum=303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" From 48c635a5386d9ce72cd070158bf583bad24b36ea Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Mon, 15 May 2017 11:07:37 +0200 Subject: [PATCH 0491/1145] lutris: update to 0.4.9. (#6369) --- srcpkgs/lutris/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 8043c020ff..92d213a059 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'Lutris' pkgname=lutris -version=0.4.8 +version=0.4.9 revision=1 build_style=python3-module wrksrc="${pkgname}" @@ -12,4 +12,4 @@ maintainer="Jan Wey. " license="GPL-3" homepage="https://lutris.net" distfiles="${homepage}/releases/${pkgname}_${version}.tar.xz" -checksum=5e25d9d07269042abed8b18be83764bbd51541322d448bc372e8b25248b8a1b0 +checksum=635e1b34084d9b2419575fd25097e36689e0f59c50bff89a4a3494e644fa4be9 From 9306049667d6aee75898386c7ae147ae0f3b2e25 Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 15 May 2017 11:11:33 +0200 Subject: [PATCH 0492/1145] xfce4-terminal: path fixed --- srcpkgs/xfce4-terminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index 7cfc09c8c6..d58443fcef 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -10,5 +10,5 @@ short_desc="A modern terminal emulator primarly for the Xfce desktop environment maintainer="Juan RP " homepage="http://www.xfce.org" license="GPL-2" -distfiles="http://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" +distfiles="http://archive.xfce.org/src/apps/${pkgname}/0.8/${pkgname}-${version}.tar.bz2" checksum=8a34568f78abf669957984602c54cd938f19c9343ee2691c2b787446629be064 From 936c51727022e2563786143a83afeed03aa3f22f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 15 May 2017 13:16:48 +0200 Subject: [PATCH 0493/1145] sysstat: update to 11.5.6. --- srcpkgs/sysstat/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template index a82d9bc259..4c8fcbf47d 100644 --- a/srcpkgs/sysstat/template +++ b/srcpkgs/sysstat/template @@ -1,9 +1,9 @@ # Template file for 'sysstat' pkgname=sysstat -version=11.5.5 +version=11.5.6 revision=1 build_style=gnu-configure -configure_args="--enable-install-isag --enable-copy-only --disable-file-attr +configure_args="--enable-copy-only --disable-file-attr --with-systemdsystemunitdir= --enable-install-cron" make_dirs="/var/log/sa 0755 root root" conf_files="/etc/default/sysstat /etc/default/sysstat.ioconf" @@ -14,7 +14,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://pagesperso-orange.fr/sebastien.godard/" distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.gz" -checksum=49ffe8c5809c5f0c283f16235776d364dcd9aa755dcde48a69a209c1916a6b39 +checksum=868d35ae4899c2b2e813cf33510fb383777a63e3649f850505b2798a69b69e27 post_extract() { sed -i 's/lib64/lib/' configure @@ -26,3 +26,7 @@ pre_configure() { vmkdir etc/cron.daily vmkdir etc/cron.hourly } +post_install() { + vbin contrib/isag/isag + vman contrib/isag/isag.1 +} From 48a8596e9b317e4c91e181c17169fd394922cd5c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 15 May 2017 14:05:55 +0200 Subject: [PATCH 0494/1145] New package: mei-amt-check-0.0.20170514 --- srcpkgs/mei-amt-check/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/mei-amt-check/template diff --git a/srcpkgs/mei-amt-check/template b/srcpkgs/mei-amt-check/template new file mode 100644 index 0000000000..07df6d86cb --- /dev/null +++ b/srcpkgs/mei-amt-check/template @@ -0,0 +1,22 @@ +# Template file for 'mei-amt-check' +pkgname=mei-amt-check +version=0.0.20170514 +revision=1 +_githash="a4d8fca4d18e1ae896b0305a53e152b568596bc1" +wrksrc="${pkgname}-${_githash}" +only_for_archs="i686 x86_64 i686-musl x86_64-musl" +build_style=gnu-makefile +short_desc="Check whether AMT is enabled and provisioned under Linux" +maintainer="Leah Neukirchen " +license="GPL-2" +homepage="https://github.com/mjg59/mei-amt-check" +distfiles="https://github.com/mjg59/mei-amt-check/archive/${_githash}.tar.gz" +checksum=c51e633b0e174578afead03ae7fa2aaae32e20400655bc744ce1597bfc640567 + +post_extract() { + sed -i '//d' mei-amt-check.c +} +do_install() { + vbin mei-amt-check + vdoc README.md +} From 3e1f52e3492ffabef9b0a31847ec7d7931e1466d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 15 May 2017 15:04:39 +0200 Subject: [PATCH 0495/1145] mdoclint: update to 1.51. --- srcpkgs/mdoclint/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mdoclint/template b/srcpkgs/mdoclint/template index 18c75111f4..d4e08118a8 100644 --- a/srcpkgs/mdoclint/template +++ b/srcpkgs/mdoclint/template @@ -1,6 +1,6 @@ # Template file for 'mdoclint' pkgname=mdoclint -version=1.46 +version=1.51 revision=1 create_wrksrc=yes build_style=fetch @@ -9,9 +9,9 @@ short_desc="Verify man page correctness" maintainer="Leah Neukirchen " license="2-clause-BSD" homepage="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/textproc/mdoclint/" -distfiles="http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint?rev=1.65&content-type=text/plain>mdoclint - http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint.1?rev=1.13&content-type=text/plain>mdoclint.1" -checksum="053b27c01dd2066410dc7d68db1f6bbbf28fdc9326e846a97a27309796672ba5 +distfiles="http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint?rev=1.70&content-type=text/plain>mdoclint + http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint.1?rev=1.17&content-type=text/plain>mdoclint.1" +checksum="886f424702632a5bbf817e5cd424572bd75c3d7e99a9df1ed537435a1d2f7848 c392be588b9a5d6c98732925b2ddad625dbb56cc112cbff7e902a34419d641b0" noarch=yes From fb5520ee04e17c5837cc4d9f55db04359f3cc0f9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 15 May 2017 13:21:58 +0000 Subject: [PATCH 0496/1145] blender: rebuild against opencollada-1.6.47 Fixes #6394 --- srcpkgs/blender/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index b8f492bba7..12c01abad3 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.78c -revision=3 +revision=4 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel From ff0b8a95b94f510a93d71970a987a7ed10617c2a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 06:11:21 +0000 Subject: [PATCH 0497/1145] tor: update to 0.3.0.7. --- srcpkgs/tor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index 239893d388..7aa75924c6 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,6 +1,6 @@ # Template file for 'tor' pkgname=tor -version=0.3.0.6 +version=0.3.0.7 revision=1 build_style=gnu-configure makedepends="zlib-devel libressl-devel libevent-devel libseccomp-devel" @@ -14,7 +14,7 @@ maintainer="Juan RP " license="BSD" homepage="https://www.torproject.org/" distfiles="https://www.torproject.org/dist/tor-$version.tar.gz" -checksum=a3e512e93cb555601fd207d914d7c5fe981d66d6ebb5821ecdf5dea738c2fb14 +checksum=9640c4448ef3cad7237c68ed6984e705db8fb2b9d6bb74c8815d01bb06527d02 case "$XBPS_TARGET_MACHINE" in aarch64*) configure_args="--disable-seccomp";; From 4852d5e8e27eec40048ce6a54a09dbb75ef86629 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 06:11:32 +0000 Subject: [PATCH 0498/1145] mpd: update to 0.20.7. --- srcpkgs/mpd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 740c1305d4..915a3d53cb 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.20.6 -revision=4 +version=0.20.7 +revision=1 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins --enable-soundcloud --enable-pipe-output --disable-twolame-encoder @@ -27,7 +27,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.musicpd.org/" distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 +checksum=005ac663b39a76701ba043cce4caef82ac6b0c2f16aae12fdc28e1b3b5b6c780 # Package build options build_options="jack lame mpcdec pulseaudio libao wavpack" From 0e89d02d89a6250487a154e0ee04ec019c64046e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 06:15:51 +0000 Subject: [PATCH 0499/1145] geoip: update to 1.6.11. --- srcpkgs/geoip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template index 57f61b1334..608e359a74 100644 --- a/srcpkgs/geoip/template +++ b/srcpkgs/geoip/template @@ -1,6 +1,6 @@ # Template file for 'geoip' pkgname=geoip -version=1.6.10 +version=1.6.11 revision=1 wrksrc="GeoIP-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://www.maxmind.com/app/c" license="GPL-2" distfiles="https://github.com/maxmind/geoip-api-c/releases/download/v$version/GeoIP-$version.tar.gz" -checksum=cb44e0d0dbc45efe2e399e695864e58237ce00026fba8a74b31d85888c89c67a +checksum=b0e5a92200b5ab540d118983f7b7191caf4faf1ae879c44afa3ff2a2abcdb0f5 pre_configure() { autoreconf -fi From a493e2ad7686c4fe72f042341022b5b4714071c8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 06:15:54 +0000 Subject: [PATCH 0500/1145] gnupg2: update to 2.1.21. --- srcpkgs/gnupg2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template index 0d83b6d908..76f04898b3 100644 --- a/srcpkgs/gnupg2/template +++ b/srcpkgs/gnupg2/template @@ -1,7 +1,7 @@ # Template file for 'gnupg2' pkgname=gnupg2 -version=2.1.20 -revision=2 +version=2.1.21 +revision=1 wrksrc="gnupg-${version}" build_style=gnu-configure configure_args=" @@ -20,7 +20,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.gnupg.org/" distfiles="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${version}.tar.bz2" -checksum=24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d +checksum=7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd pre_configure() { sed -i '/^CFLAGS_orig=/d;/^CFLAGS=$/d' configure From 48e6bdfba6ccbe2ff785380fe28496f8e6d6f73e Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Sun, 14 May 2017 11:04:49 +0200 Subject: [PATCH 0501/1145] snapper: add mkdir etc/snapper/configs/ Closes: #6391 [via git-merge-pr] --- srcpkgs/snapper/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 2528022d75..f0d774ef6a 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper version=0.5.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d --sbindir=/usr/bin" @@ -9,6 +9,7 @@ hostmakedepends="pkg-config automake libtool libxml2-devel libxslt docbook-xsl" makedepends="zlib-devel boost-devel dbus-devel libxml2-devel pam-devel acl-devel libmount-devel libbtrfs-devel e2fsprogs-devel " conf_files="/etc/conf.d/snapper" +make_dirs="/etc/snapper/configs 0755 root root" short_desc="Tool for Linux filesystem snapshot management" maintainer="Juan RP " license="GPL-2" From f009649b5fbcb9a5321b8a034f4cce4054108d72 Mon Sep 17 00:00:00 2001 From: cr6git Date: Mon, 15 May 2017 21:45:26 +0200 Subject: [PATCH 0502/1145] albert: update to 0.11.2 Closes: #6403 [via git-merge-pr] --- srcpkgs/albert/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/albert/template b/srcpkgs/albert/template index 5eeccb7057..7d48257826 100644 --- a/srcpkgs/albert/template +++ b/srcpkgs/albert/template @@ -1,6 +1,6 @@ # Template file for 'albert' pkgname=albert -version=0.11.1 +version=0.11.2 revision=1 build_style=cmake makedepends="muparser-devel qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql @@ -11,7 +11,7 @@ maintainer="Nemh " license="GPL-3" homepage="https://github.com/ManuelSchneid3r/albert" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=d214b73bf154bef59d36a4b128493b5dd9ecc7ba059a606f9b4659b57741f390 +checksum=991088cef2c4b7dc27b01e703bb7cb13f7f2dac928f0f9c235b2bd52d362a4e7 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-svg-devel qt5-x11extras-devel" From 2cabf2469e63c7043f5710b5f2a9047e28643537 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 6 Nov 2016 12:03:47 +0100 Subject: [PATCH 0503/1145] gnome-mplayer: drop libmusicbrainz support --- srcpkgs/gnome-mplayer/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template index 60256ee497..d89fe3e8cb 100644 --- a/srcpkgs/gnome-mplayer/template +++ b/srcpkgs/gnome-mplayer/template @@ -1,15 +1,14 @@ # Template file for 'gnome-mplayer' pkgname=gnome-mplayer version=1.0.9 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-schemas-install" hostmakedepends="pkg-config intltool glib-devel" # XXX missing libgpod makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel - libgda-devel libmusicbrainz-devel desktop-file-utils - hicolor-icon-theme mplayer" + libgda-devel desktop-file-utils hicolor-icon-theme mplayer" depends="mplayer desktop-file-utils hicolor-icon-theme" short_desc="A simple MPlayer GUI for GNOME" maintainer="Juan RP " From 13f7cc1f5e48b927f2d843f0838242924eba3f96 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 6 Nov 2016 12:04:53 +0100 Subject: [PATCH 0504/1145] libmusicbrainz: remove Deprecated since 2011. Closes: #5131 [via git-merge-pr] --- common/shlibs | 1 - srcpkgs/libmusicbrainz-devel | 1 - srcpkgs/libmusicbrainz/template | 22 ---------------------- srcpkgs/libmusicbrainz/update | 1 - 4 files changed, 25 deletions(-) delete mode 120000 srcpkgs/libmusicbrainz-devel delete mode 100644 srcpkgs/libmusicbrainz/template delete mode 100644 srcpkgs/libmusicbrainz/update diff --git a/common/shlibs b/common/shlibs index 36181bf080..2e649a1b74 100644 --- a/common/shlibs +++ b/common/shlibs @@ -882,7 +882,6 @@ libfm-extra.so.4 libfm-extra-1.2.3_3 libunique-1.0.so.0 libunique1-1.1.6_1 libxnoise.so.0 libxnoise-0.1.29_1 libdiscid.so.0 libdiscid-0.2.2_1 -libmusicbrainz3.so.6 libmusicbrainz-3.0.3_1 librhythmbox-core.so.10 librhythmbox-3.4.1_1 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1 libgexiv2.so.2 libgexiv2-0.6.1_1 diff --git a/srcpkgs/libmusicbrainz-devel b/srcpkgs/libmusicbrainz-devel deleted file mode 120000 index a7103db274..0000000000 --- a/srcpkgs/libmusicbrainz-devel +++ /dev/null @@ -1 +0,0 @@ -libmusicbrainz \ No newline at end of file diff --git a/srcpkgs/libmusicbrainz/template b/srcpkgs/libmusicbrainz/template deleted file mode 100644 index fe8db2c041..0000000000 --- a/srcpkgs/libmusicbrainz/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'libmusicbrainz' -pkgname=libmusicbrainz -version=3.0.3 -revision=4 -build_style=cmake -makedepends="neon-devel libdiscid-devel" -short_desc="Library That Provides Access to the MusicBrainz Server" -maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://musicbrainz.org/" -distfiles="ftp://ftp.musicbrainz.org/pub/musicbrainz/$pkgname-$version.tar.gz" -checksum=7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5 - -libmusicbrainz-devel_package() { - depends="libcurl-devel neon-devel libdiscid-devel ${sourcepkg}-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/libmusicbrainz/update b/srcpkgs/libmusicbrainz/update deleted file mode 100644 index 125db71da8..0000000000 --- a/srcpkgs/libmusicbrainz/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*beta*" From f7c1a8da106ba25b1b5d18b292f895a51cba6bf1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:44:33 +0000 Subject: [PATCH 0505/1145] libnice: fix -devel depends --- srcpkgs/libnice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template index ca5cbec23f..11ff50c021 100644 --- a/srcpkgs/libnice/template +++ b/srcpkgs/libnice/template @@ -1,7 +1,7 @@ # Template file for 'libnice' pkgname=libnice version=0.1.14 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool gtk-doc gettext-devel pkg-config intltool" @@ -18,7 +18,7 @@ pre_configure() { } libnice-devel_package() { - depends="libglib-devel ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" pkg_install() { vmove usr/include From 38124af610804446b4d9dee344f6e289f58cd57d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 16 May 2017 12:59:42 +0200 Subject: [PATCH 0506/1145] halibut: update to 1.2. --- srcpkgs/halibut/patches/pie.patch | 11 +++++++++++ srcpkgs/halibut/template | 15 +++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/halibut/patches/pie.patch diff --git a/srcpkgs/halibut/patches/pie.patch b/srcpkgs/halibut/patches/pie.patch new file mode 100644 index 0000000000..59e4ac9858 --- /dev/null +++ b/srcpkgs/halibut/patches/pie.patch @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -110,7 +110,7 @@ + $(CC) $(CFLAGS) -MD -c $< + + version.o: FORCE +- $(CC) $(VDEF) -MD -c $(SRC)version.c ++ $(CC) $(CFLAGS) $(VDEF) -MD -c $(SRC)version.c + + spotless:: clean + rm -f *.d diff --git a/srcpkgs/halibut/template b/srcpkgs/halibut/template index c123092597..5d33d6d520 100644 --- a/srcpkgs/halibut/template +++ b/srcpkgs/halibut/template @@ -1,21 +1,20 @@ # Template file for 'halibut' pkgname=halibut -version=1.1 -revision=5 +version=1.2 +revision=1 build_style=gnu-makefile -CFLAGS='-I../charset -I../build' -disable_parallel_build=yes hostmakedepends="perl" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" halibut" fi short_desc="Yet another free document preparation system" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="MIT" homepage="http://www.chiark.greenend.org.uk/~sgtatham/halibut/" -distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b964950d11ed09d3af28ac095da539613f6e50d650f01fe72b4ae752724c80a0 -nopie=yes # segfaults on x86_64-musl +distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" +checksum=1aedfb6240f27190c36a390fcac9ce732edbdbaa31c85ee675b994e2b083163f + +CFLAGS='-I../charset -I../build' pre_build() { export LIBS="$LDFLAGS" From 3d4df7571d627e5f16d1acd1b1cca5ee3e8ec13c Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 16:51:27 +0200 Subject: [PATCH 0507/1145] FeedReader: fix build with vala>=0.36 (#6408) --- ...c5a27e9d5883b726fb767daba994bae6662c.patch | 21 +++++++++++++++++++ srcpkgs/FeedReader/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch diff --git a/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch b/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch new file mode 100644 index 0000000000..4683e5a19e --- /dev/null +++ b/srcpkgs/FeedReader/patches/eb2dc5a27e9d5883b726fb767daba994bae6662c.patch @@ -0,0 +1,21 @@ +https://github.com/jangernert/FeedReader/issues/410 + +--- Constants.vala.in.orig ++++ Constants.vala.in +@@ -43,11 +43,11 @@ namespace FeedReader { + } + + public class MediaButton : GLib.Object { +- public const string PLAY = N_("Play"); +- public const string PAUSE = N_("Pause"); +- public const string MUTE = N_("Mute"); +- public const string UNMUTE = N_("Unmute"); +- public const string CLOSE = N_("Close"); ++ public const string PLAY = "Play"; ++ public const string PAUSE = "Pause"; ++ public const string MUTE = "Mute"; ++ public const string UNMUTE = "Unmute"; ++ public const string CLOSE = "Close"; + } + + public class Constants : GLib.Object { diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template index 4e380c886e..f7cd946b15 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -1,7 +1,7 @@ # Template file for 'FeedReader' pkgname=FeedReader version=2.0.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config intltool itstool glib-devel vala $(vopt_if gir gobject-introspection)" From 397c436763000de80a5c54f1e5f8c273702aceaf Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 16:51:44 +0200 Subject: [PATCH 0508/1145] FeedReader: remove obsolete gstreamer-devel bdep It already depends on Gstreamer 1.x --- srcpkgs/FeedReader/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template index f7cd946b15..955ca7ecb0 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -7,8 +7,8 @@ hostmakedepends="pkg-config intltool itstool glib-devel vala $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel vala-devel json-glib-devel libgee08-devel libsoup-devel sqlite-devel libsecret-devel libnotify-devel libxml2-devel rest-devel - webkit2gtk-devel gstreamer-devel libpeas-devel libcurl-devel - gnome-online-accounts-devel gst-plugins-base1-devel" + webkit2gtk-devel libpeas-devel libcurl-devel gnome-online-accounts-devel + gst-plugins-base1-devel" short_desc="Modern desktop RSS desktop client" maintainer="Enno Boland " license="GPL-3" From a2eb678e6316ee0ad33266fb2c6d2a91160785e3 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 16:52:45 +0200 Subject: [PATCH 0509/1145] farstream: remove obsolete bdeps --- srcpkgs/farstream/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template index 7d33958c75..f32fd9847f 100644 --- a/srcpkgs/farstream/template +++ b/srcpkgs/farstream/template @@ -1,13 +1,12 @@ # Template file for 'farstream' pkgname=farstream version=0.2.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-valgrind --disable-static $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool python-devel glib-devel $(vopt_if gir gobject-introspection)" -makedepends="python-devel gupnp-igd-devel libnice-devel - gst-plugins-base1-devel gst-python-devel python-gobject2-devel" -depends="gst-python pygtk gst-plugins-good1 gst-plugins-bad1" +makedepends="python-devel gupnp-igd-devel libnice-devel gst-plugins-base1-devel" +depends="gst-plugins-good1 gst-plugins-bad1" short_desc="GStreamer modules and libraries for videoconferencing" maintainer="Juan RP " license="LGPL-2.1" From 026b4577636806a5220e5e9a2146367ba69f41cc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 16:53:34 +0200 Subject: [PATCH 0510/1145] telepathy-farstream: remove obsolete bdeps --- srcpkgs/telepathy-farstream/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template index f7b176f054..996b0df5af 100644 --- a/srcpkgs/telepathy-farstream/template +++ b/srcpkgs/telepathy-farstream/template @@ -1,13 +1,12 @@ # Template file for 'telepathy-farstream' pkgname=telepathy-farstream version=0.6.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool libxslt $(vopt_if gir gobject-introspection)" -makedepends=" - dbus-glib-devel telepathy-glib-devel farstream-devel - python-devel python-gobject2-devel gst-python-devel vala-devel" +makedepends="dbus-glib-devel telepathy-glib-devel farstream-devel + python-devel vala-devel" replaces="telepathy-farsight>=0" short_desc="Telepathy library that uses Farstream to handle Call channels" maintainer="Juan RP " From d2bceabf79370b399160cd9729becb4912c6cb57 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 17:08:10 +0200 Subject: [PATCH 0511/1145] FeedReader: x86_64-musl broken for now --- srcpkgs/FeedReader/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template index 955ca7ecb0..8004c3c2df 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -17,6 +17,10 @@ distfiles="https://github.com/jangernert/$pkgname/archive/v$version.tar.gz" checksum=949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261 make_build_args="VERBOSE=1" +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2615/steps/shell_3/logs/stdio";; +esac + pre_build() { : sed '/\/usr\/bin\/valac/s#--pkg=goa-#--pkg=Goa-#' \ -i $(find build -name build.make) From 7839eb0a467c6400bff96dd21e0ad7df1eb66fd2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 16 May 2017 17:36:08 +0200 Subject: [PATCH 0512/1145] syncthing: update to 0.14.28. --- srcpkgs/syncthing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 54e806c335..54fa8fd208 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=0.14.27 +version=0.14.28 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="MPLv2" homepage="http://syncthing.net/" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=27051df042b73df7cbee590a56a75931a63e228dcd5c044d0950e14b46730d64 +checksum=ef0a9916f82cf99e31deb5ae75127b8440abcb3b293c30c0c72d3a4ffb3d3d20 pre_build() { GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go From 1da371b6d9c836c4739ce92498a6c2518b7cef13 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 16 May 2017 17:43:55 +0200 Subject: [PATCH 0513/1145] elixir: update to 1.4.4. --- srcpkgs/elixir/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template index 271690dca2..4545eb84b8 100644 --- a/srcpkgs/elixir/template +++ b/srcpkgs/elixir/template @@ -1,6 +1,6 @@ # Template file for 'elixir' pkgname=elixir -version=1.4.2 +version=1.4.4 revision=1 build_style=gnu-makefile hostmakedepends="erlang" @@ -10,4 +10,4 @@ maintainer="Duncaen " license="Apache-2.0" homepage="http://elixir-lang.org/" distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz" -checksum=cb4e2ec4d68b3c8b800179b7ae5779e2999aa3375f74bd188d7d6703497f553f +checksum=2d9d5faee079949f780c8f6a1ccba015d64ecf859ed87384ae4239d69be60142 From afaab1ddec2446fc1ef23619e6564aa508968e56 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:04:44 +0200 Subject: [PATCH 0514/1145] python-requests: update to 2.14.2 --- srcpkgs/python-requests/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template index aed86124b2..b2d3b6ea45 100644 --- a/srcpkgs/python-requests/template +++ b/srcpkgs/python-requests/template @@ -1,6 +1,6 @@ # Template file for 'python-requests' pkgname=python-requests -version=2.13.0 +version=2.14.2 revision=1 noarch=yes wrksrc="requests-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://python-requests.org/" license="Apache-2.0" distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz" -checksum=5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8 +checksum=a274abba399a23e8713ffd2b5706535ae280ebe2b8069ee6a941cb089440d153 post_install() { # replace bundled copy of cacert, chardet, urllib3, and idna From 1ee23c5c4936bdc7d25a1fc9af77450496102a37 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:05:56 +0200 Subject: [PATCH 0515/1145] python-Sphinx: update to 1.5.6 --- srcpkgs/python-Sphinx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template index dbbe1803b6..42e574f96d 100644 --- a/srcpkgs/python-Sphinx/template +++ b/srcpkgs/python-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python-Sphinx' pkgname=python-Sphinx -version=1.5.5 +version=1.5.6 revision=1 noarch=yes wrksrc="Sphinx-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="http://sphinx-doc.org/" license="2-clause-BSD" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=4064ea6c56feeb268838cb8fbbee507d0c3d5d92fa63a7df935a916b52c9e2f5 +checksum=565a72dd39dd6ea2e8c548d34c127c981e4bcaead69a2c456a6e33ef69151ace alternatives=" sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2 From 0f12410b8f8954b9a08c01daca401ef2f3466d2c Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:07:54 +0200 Subject: [PATCH 0516/1145] python-backports.functools_lru_cache: update to 1.4 --- srcpkgs/python-backports.functools_lru_cache/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-backports.functools_lru_cache/template b/srcpkgs/python-backports.functools_lru_cache/template index c0923cf5c7..9b8a5fca65 100644 --- a/srcpkgs/python-backports.functools_lru_cache/template +++ b/srcpkgs/python-backports.functools_lru_cache/template @@ -1,6 +1,6 @@ # Template file for 'python-backports.functools_lru_cache' pkgname=python-backports.functools_lru_cache -version=1.3 +version=1.4 revision=1 noarch=yes wrksrc="backports.functools_lru_cache-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/jaraco/backports.functools_lru_cache" license="PSF" distfiles="${PYPI_SITE}/b/backports.functools_lru_cache/backports.functools_lru_cache-${version}.tar.gz" -checksum=444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95 +checksum=31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f pre_build() { sed -i setup.py \ From 00cdc62ab973ec0a51d7c515fd8ff7aeeb0c81cb Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:20:53 +0200 Subject: [PATCH 0517/1145] python-matplotlib: update to 2.0.2 --- srcpkgs/python-matplotlib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-matplotlib/template b/srcpkgs/python-matplotlib/template index e21139eb04..a647c3f521 100644 --- a/srcpkgs/python-matplotlib/template +++ b/srcpkgs/python-matplotlib/template @@ -1,6 +1,6 @@ # Template file for 'python-matplotlib' pkgname=python-matplotlib -version=2.0.1 +version=2.0.2 revision=1 wrksrc="matplotlib-${version}" build_style=python-module @@ -24,7 +24,7 @@ maintainer="Alessio Sergi " homepage="http://matplotlib.org/" license="matplotlib, BSD, MIT" distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz" -checksum=1422aa2bb4ce4da310f5d24097a48b171139a1007f1a6af3e9fd2c34d22e2bf8 +checksum=0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 export XDG_RUNTIME_DIR=/tmp From 73acc1f5c0db721ec372a84f0473ad881f12b895 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:20:58 +0200 Subject: [PATCH 0518/1145] python-pandas: update to 0.20.1 --- srcpkgs/python-pandas/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-pandas/template b/srcpkgs/python-pandas/template index 3ffadf18cb..e05263f88f 100644 --- a/srcpkgs/python-pandas/template +++ b/srcpkgs/python-pandas/template @@ -1,6 +1,6 @@ # Template file for 'python-pandas' pkgname=python-pandas -version=0.19.2 +version=0.20.1 revision=1 wrksrc="pandas-${version}" build_style=python-module @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="http://pandas.pydata.org/" license="3-clause-BSD" distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz" -checksum=af634dd6ed3ca1f8635183f41e7f7769108531ccca8213067d9627857461702e +checksum=d9f67bb17f334ad395e01b2339c3756f3e0d0240cb94c094ef711bbfc5c56c80 post_install() { vlicense LICENSE From bf43008530df0783140324ef0871ba695078e7a8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:22:51 +0200 Subject: [PATCH 0519/1145] python-Bottleneck: update to 1.2.1 --- srcpkgs/python-Bottleneck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Bottleneck/template b/srcpkgs/python-Bottleneck/template index 9e9876635c..883a136896 100644 --- a/srcpkgs/python-Bottleneck/template +++ b/srcpkgs/python-Bottleneck/template @@ -1,6 +1,6 @@ # Template file for 'python-Bottleneck' pkgname=python-Bottleneck -version=1.2.0 +version=1.2.1 revision=1 wrksrc="Bottleneck-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="http://berkeleyanalytics.com/bottleneck/" license="2-clause-BSD" distfiles="${PYPI_SITE}/B/Bottleneck/Bottleneck-${version}.tar.gz" -checksum=3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8 +checksum=6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36 post_install() { rm -f ${DESTDIR}/usr/lib/python*/site-packages/bottleneck/LICENSE From 4c48f4c6e222ecd5ab74952874f7fa0aed0e3321 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 16 May 2017 19:25:28 +0200 Subject: [PATCH 0520/1145] python-Werkzeug: update to 0.12.2 --- srcpkgs/python-Werkzeug/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Werkzeug/template b/srcpkgs/python-Werkzeug/template index 0e7eda62c8..328e296466 100644 --- a/srcpkgs/python-Werkzeug/template +++ b/srcpkgs/python-Werkzeug/template @@ -1,6 +1,6 @@ # Template file for 'python-Werkzeug' pkgname=python-Werkzeug -version=0.12.1 +version=0.12.2 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Markus Berger " homepage="http://werkzeug.pocoo.org" license="3-clause-BSD" distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz" -checksum=6716830febe9808bb7521fd26db3b398450cbed0886b2b4bea678b87340f534e +checksum=903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26 post_install() { vlicense LICENSE @@ -27,6 +27,7 @@ python3-Werkzeug_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } python3.4-Werkzeug_package() { From 1f70dc128339dbb73a654889582985e56b688cf6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 06:58:34 +0000 Subject: [PATCH 0521/1145] gnome-video-effects: switch to gstreamer1 --- srcpkgs/gnome-video-effects/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-video-effects/template b/srcpkgs/gnome-video-effects/template index 5a9a7f33c8..e37999dddc 100644 --- a/srcpkgs/gnome-video-effects/template +++ b/srcpkgs/gnome-video-effects/template @@ -1,11 +1,11 @@ # Template build file for 'gnome-video-effects'. pkgname=gnome-video-effects version=0.4.3 -revision=1 +revision=2 noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool" -makedepends="gstreamer-devel" +makedepends="gstreamer1-devel" short_desc="A collection of GStreamer effects for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" From 9e5d03e8e7793d11a07f12ffa17f3eedfd44cd0e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:13:47 +0000 Subject: [PATCH 0522/1145] snappy-player: switch to gstreamer1 --- srcpkgs/snappy-player/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/snappy-player/template b/srcpkgs/snappy-player/template index c61d12cd57..df7bcaa134 100644 --- a/srcpkgs/snappy-player/template +++ b/srcpkgs/snappy-player/template @@ -1,11 +1,11 @@ # Template file for 'snappy-player pkgname=snappy-player version=1.0 -revision=2 +revision=3 wrksrc="snappy-${version}" build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="clutter-gtk-devel clutter-gst-devel gst-plugins-base-devel" +makedepends="clutter-gtk-devel clutter-gst-devel gst-plugins-base1-devel" short_desc="Powerful media player with a minimalistic interface" maintainer="Juan RP " license="GPL-2" From 5848a3f400170846fdef5ed65f32e77681de88eb Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:19:54 +0000 Subject: [PATCH 0523/1145] pocketsphinx: drop gstreamer support --- srcpkgs/pocketsphinx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pocketsphinx/template b/srcpkgs/pocketsphinx/template index 944413281c..ce8d90ff44 100644 --- a/srcpkgs/pocketsphinx/template +++ b/srcpkgs/pocketsphinx/template @@ -1,7 +1,7 @@ # Template file for 'pocketsphinx' pkgname=pocketsphinx version=0.8 -revision=4 +revision=5 short_desc="Lightweight speech recognition system" maintainer="Martin Riese " license="GPL-2" @@ -11,7 +11,7 @@ checksum="874c4c083d91c8ff26a2aec250b689e537912ff728923c141c4dac48662cce7a" build_style=gnu-configure configure_args="--disable-static --without-python" hostmakedepends="pkg-config" -makedepends="sphinxbase-devel gst-plugins-base-devel pulseaudio-devel libsndfile-devel libsamplerate-devel" +makedepends="sphinxbase-devel pulseaudio-devel libsndfile-devel libsamplerate-devel" libpocketsphinx_package() { short_desc+=" - runtime libraries" From f39baf07407e31899d888896458a9bf9bce278c0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:23:17 +0000 Subject: [PATCH 0524/1145] xfburn: switch to gstreamer1 --- srcpkgs/xfburn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template index 161277ed92..8876defaa4 100644 --- a/srcpkgs/xfburn/template +++ b/srcpkgs/xfburn/template @@ -1,11 +1,11 @@ # Template file for 'xfburn' pkgname=xfburn version=0.5.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-gstreamer" hostmakedepends="intltool pkg-config" -makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base-devel" +makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="CD-burner application for the Xfce Desktop Environment" maintainer="Juan RP " From 2ef86257a67089cc431a1aabaa7bf262b05bc936 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 17:33:16 +0000 Subject: [PATCH 0525/1145] xfce4: remove xfce4-mixer --- srcpkgs/xfce4/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template index 8606e15eb9..86174c700a 100644 --- a/srcpkgs/xfce4/template +++ b/srcpkgs/xfce4/template @@ -1,11 +1,10 @@ # Template file for 'xfce4'. pkgname=xfce4 version=4.12.0 -revision=5 +revision=6 build_style=meta depends=" xfce4-appfinder>=${version} - xfce4-mixer>=4.11.0 xfce4-panel>=${version} xfce4-session>=${version} xfce4-settings>=${version} From e75c5c868996adb8c985865c8645a7879c88e999 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:21:03 +0000 Subject: [PATCH 0526/1145] xfce4-mixer: remove (deprecated/gstreamer 0.x) --- srcpkgs/xfce4-mixer/template | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 srcpkgs/xfce4-mixer/template diff --git a/srcpkgs/xfce4-mixer/template b/srcpkgs/xfce4-mixer/template deleted file mode 100644 index 4d0c1cf27f..0000000000 --- a/srcpkgs/xfce4-mixer/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'xfce4-mixer' -pkgname=xfce4-mixer -version=4.11.0 -revision=2 -build_style=gnu-configure -hostmakedepends="pkg-config intltool" -makedepends="gst-plugins-base-devel libxfce4ui-devel xfce4-panel-devel - libunique1-devel libkeybinder2-devel" -short_desc="Sound mixer for the Xfce Desktop Environment" -depends="desktop-file-utils hicolor-icon-theme" -maintainer="Juan RP " -homepage="http://www.xfce.org/" -license="GPL-2" -distfiles="http://archive.xfce.org/src/apps/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2 From 8fc01e325f4dc184590446adbd1bba0e715fe212 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Tue, 16 May 2017 10:44:30 -0700 Subject: [PATCH 0527/1145] speech-dispatcher: update to 0.8.7. Closes: #6413 [via git-merge-pr] --- .../speech-dispatcher/patches/spdconfig.patch | 23 ------------------- srcpkgs/speech-dispatcher/template | 6 ++--- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/speech-dispatcher/patches/spdconfig.patch diff --git a/srcpkgs/speech-dispatcher/patches/spdconfig.patch b/srcpkgs/speech-dispatcher/patches/spdconfig.patch deleted file mode 100644 index 39dec79a54..0000000000 --- a/srcpkgs/speech-dispatcher/patches/spdconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch pulled from upstream repo, author Samuel Thibault. -Goes away with 0.8.7 or whatever their next version is. -diff --git src/api/python/speechd_config/config.py.in src/api/python/speechd_config/config.py.in -index a59ef79a..e9b2ae53 100644 ---- src/api/python/speechd_config/config.py.in -+++ src/api/python/speechd_config/config.py.in -@@ -156,6 +156,7 @@ def setup_argparse(): - parser.add_argument('-D', '--debug', dest='debug', - action="store_true", default=False, - help=_("Debug a problem and generate a report")) -+ return parser - - class Tests: - """Tests of functionality of Speech Dispatcher and its dependencies -@@ -750,7 +751,7 @@ you have to start it manually to continue.""")) - - def main(): - options = setup_argparse() -- options.parse() -+ options = options.parse_args() - test = Tests() - configure = Configure(test) # that should possibly be refactored, test should not be passed - diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template index cf89fb6eda..a35f87bff5 100644 --- a/srcpkgs/speech-dispatcher/template +++ b/srcpkgs/speech-dispatcher/template @@ -1,7 +1,7 @@ # Template build file for 'speech-dispatcher'. pkgname=speech-dispatcher -version=0.8.6 -revision=3 +version=0.8.7 +revision=1 build_style=gnu-configure configure_args="--disable-static" short_desc="High-level device independent layer for speech synthesis interface" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1, GFDL-1.2" homepage="http://devel.freebsoft.org/speechd" distfiles="http://devel.freebsoft.org/pub/projects/speechd/${pkgname}-${version}.tar.gz" -checksum=c233dc3757c1f0d3676480d1052d42d88d18d29ab0cb0c8b5ce8edc3e7386ff8 +checksum=200be1adb054dd14bfbc46e798ac6a7c0d4abaa13343fb987312c5265e4cb134 pycompile_module='speechd speechd_config' hostmakedepends="pkg-config intltool python3-devel" From ef9153335336a9098ae8a28b642ee6f32bb02fc2 Mon Sep 17 00:00:00 2001 From: cr6git Date: Tue, 16 May 2017 02:08:15 +0200 Subject: [PATCH 0528/1145] ardour: update to 5.9 Closes: #6406 [via git-merge-pr] --- srcpkgs/ardour/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index b5eaa92d1e..2808052b45 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -1,6 +1,6 @@ # Template file for 'ardour' pkgname=ardour -version=5.8 +version=5.9 revision=1 build_style=waf configure_args="--with-backends=jack,alsa --libjack=weak --optimize --docs" From 8757a02beb5da21ac5a0c5c6cf8d5e62caebdbe9 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 16 May 2017 22:00:41 +0200 Subject: [PATCH 0529/1145] rkt: update to 1.26.0. --- srcpkgs/rkt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template index ae2f8bde53..d1cb5de736 100644 --- a/srcpkgs/rkt/template +++ b/srcpkgs/rkt/template @@ -1,6 +1,6 @@ # Template file for 'rkt' pkgname=rkt -version=1.25.0 +version=1.26.0 revision=1 build_style=gnu-configure hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/coreos/rkt" distfiles="$homepage/archive/v$version.tar.gz" -checksum=090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359 +checksum=35dbecd8ff76bf538465fd783a7690519f32185330d9f4610f762ab19d956b3c patch_args="-Np1" nopie=yes From 9c903aa554821c54b5ac300ea187f27cc0cad9d5 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 16 May 2017 22:10:54 +0200 Subject: [PATCH 0530/1145] vagrant: update to 1.9.5. --- srcpkgs/vagrant/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index 046db9871c..9371d0116e 100644 --- a/srcpkgs/vagrant/template +++ b/srcpkgs/vagrant/template @@ -1,6 +1,6 @@ # Template file for 'vagrant' pkgname=vagrant -version=1.9.4 +version=1.9.5 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=23358ad5d1a37d3d856709da55d8696c6eef30fcf88abd27ffe4b8441cfada7f +checksum=69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a nocross=yes patch_args="-p1" @@ -45,11 +45,11 @@ do_install() { find ${DESTDIR} -type f -name LICENSE -delete find ${DESTDIR} -type f -name .\* -delete find ${DESTDIR} -type f -name \*.rdoc -delete - find ${DESTDIR} -type d -name ext -print0|xargs -0 rm -r -- - find ${DESTDIR} -type d -name test -print0|xargs -0 rm -r -- - find ${DESTDIR} -type d -name examples -print0|xargs -0 rm -r -- - find ${DESTDIR} -type d -name doc -print0|xargs -0 rm -r -- - find ${DESTDIR} -type d -name ports -print0|xargs -0 rm -r -- + find ${DESTDIR} -type d -name ext -print0|xargs -0 rm -rf -- + find ${DESTDIR} -type d -name test -print0|xargs -0 rm -rf -- + find ${DESTDIR} -type d -name examples -print0|xargs -0 rm -rf -- + find ${DESTDIR} -type d -name doc -print0|xargs -0 rm -rf -- + find ${DESTDIR} -type d -name ports -print0|xargs -0 rm -rf -- rm -r ${DESTDIR}/usr/lib/$pkgname/cache vmkdir usr/bin From 43f88866b783121be5130f1159a79fd63c75813f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 21:49:56 +0000 Subject: [PATCH 0531/1145] alsa-lib: update to 1.1.4. --- srcpkgs/alsa-lib/patches/musl.patch | 10 ---------- srcpkgs/alsa-lib/template | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/alsa-lib/patches/musl.patch diff --git a/srcpkgs/alsa-lib/patches/musl.patch b/srcpkgs/alsa-lib/patches/musl.patch deleted file mode 100644 index 5dd759c5ff..0000000000 --- a/srcpkgs/alsa-lib/patches/musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ucm/parser.c.orig 2016-12-20 14:43:20.000000000 +0000 -+++ src/ucm/parser.c 2016-12-21 20:59:58.460736188 +0000 -@@ -32,6 +32,7 @@ - - #include "ucm_local.h" - #include -+#include - - /** The name of the environment variable containing the UCM directory */ - #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 251e23ad3f..4dc826b7cf 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -1,6 +1,6 @@ # Template build file for 'alsa-lib'. pkgname=alsa-lib -version=1.1.3 +version=1.1.4 revision=1 build_style=gnu-configure configure_args="--with-pythonlibs=-lpython2.7 --with-pythonincludes=-I${XBPS_CROSS_BASE}/usr/include/python2.7" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.alsa-project.org" distfiles="ftp://ftp.alsa-project.org/pub/lib/$pkgname-$version.tar.bz2" -checksum=71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c +checksum=82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 pre_configure() { autoreconf -fi From ee3d0e3138eb452b396c14b0aaeffe9a947883de Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 21:50:02 +0000 Subject: [PATCH 0532/1145] alsa-utils: update to 1.1.4. --- srcpkgs/alsa-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template index 39c03e0b90..6c8c61fb94 100644 --- a/srcpkgs/alsa-utils/template +++ b/srcpkgs/alsa-utils/template @@ -1,6 +1,6 @@ # Template build file for 'alsa-utils'. pkgname=alsa-utils -version=1.1.3 +version=1.1.4 revision=1 build_style=gnu-configure configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d --disable-alsaconf @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.alsa-project.org" license="GPL-2" distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2" -checksum=127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c +checksum=a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d post_install() { # Install required udev rules file. From be9af05daf8071f0e2eaa662c2366968d21577ff Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 21:50:05 +0000 Subject: [PATCH 0533/1145] alsa-plugins: update to 1.1.4. --- srcpkgs/alsa-plugins/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 97990fe2e6..085c8cbcb8 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.1 -revision=2 +version=1.1.4 +revision=1 build_style=gnu-configure configure_args="--disable-maemo-plugin" hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.alsa-project.org" distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2" -checksum=8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1 +checksum=530d1c3bdaeb058f2a03607a33b9e16ee5369bfd30a96bc09bd2c69b4ddd1a8a alsa-plugins-jack_package() { short_desc+=" - Jack output plugin" From c7d79777e36ae61c3c353c93588283a59ea7480e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 21:56:49 +0000 Subject: [PATCH 0534/1145] rsyslog: update to 8.27.0. --- srcpkgs/rsyslog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 1b7159b49b..c9ce0e2bcf 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,6 +1,6 @@ # Template file for 'rsyslog' pkgname=rsyslog -version=8.26.0 +version=8.27.0 revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" -checksum=637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 +checksum=02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd lib32disabled=yes disable_parallel_build=yes From c2ced9e7171d011bb54cba293f4fbf6c7987934e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 16 May 2017 23:55:16 +0200 Subject: [PATCH 0535/1145] xlbiff: add international support (from upstream). --- srcpkgs/xlbiff/patches/intl.patch | 20 ++++++++++++++++++++ srcpkgs/xlbiff/template | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/xlbiff/patches/intl.patch diff --git a/srcpkgs/xlbiff/patches/intl.patch b/srcpkgs/xlbiff/patches/intl.patch new file mode 100644 index 0000000000..398a45251b --- /dev/null +++ b/srcpkgs/xlbiff/patches/intl.patch @@ -0,0 +1,20 @@ +diff --git xlbiff.c xlbiff.c +index 23669f3..001e36b 100644 +--- xlbiff.c ++++ xlbiff.c +@@ -235,6 +235,7 @@ main( int argc, char *argv[] ) + { + progname = argv[0]; + ++ XtSetLanguageProc (NULL, NULL, NULL); + topLevel = XtVaAppInitialize(&app_context, + "XLbiff", + optionDescList, XtNumber(optionDescList), +@@ -317,6 +318,7 @@ main( int argc, char *argv[] ) + textBox = XtVaCreateManagedWidget("text", + commandWidgetClass, + topLevel, ++ "international", True, + NULL); + + XtAddCallback(textBox, XtNcallback, Popdown, textBox); diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template index f35757dbf9..aeb4c34031 100644 --- a/srcpkgs/xlbiff/template +++ b/srcpkgs/xlbiff/template @@ -1,10 +1,10 @@ # Template file for 'xlbiff' pkgname=xlbiff version=4.1 -revision=5 +revision=6 makedepends="libX11-devel libXaw-devel" short_desc="X Literate Biff, a mail notifier" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" homepage="http://www.edsantiago.com/xlbiff/" distfiles="http://www.edsantiago.com/xlbiff/${pkgname}-${version}.tar.gz" From 5c311e26850d01c0fa33dc95dd6994094cfcca44 Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 17 May 2017 00:44:38 +0200 Subject: [PATCH 0536/1145] vivaldi: update to 1.9.818.50 (#6416) --- srcpkgs/vivaldi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index 2f405badad..113d0ac23e 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=1.9.818.44 +version=1.9.818.50 revision=1 _release=1 only_for_archs="i686 x86_64" @@ -14,10 +14,10 @@ nopie=yes if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then _debarch=amd64 - checksum=7821b002c975a46ad29d367b89e22dab9a6f8f99f5d36bcf99a55194dae3f32a + checksum=701ceb20f6f802c4a7162c08a528b679e6ae0215c49b5e78ca12191c3d2fe3c6 else _debarch=i386 - checksum=ddd50af0ad4fa25cfd9ce4c77ccf083b38d9e4694bbf6cf61dab7ecbc207ce77 + checksum=4ca0306a9336124a4ab23049be8e16f2aa5c9f48ce614b4cb551477843e952ce fi distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb" From 77d5442baf4ef73e6da9930c03319778e1f80d1c Mon Sep 17 00:00:00 2001 From: Sir-Boops Date: Tue, 16 May 2017 16:44:47 -0600 Subject: [PATCH 0537/1145] wine: update to 2.8 (#6412) --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index cafcb6bf73..09f8fd8585 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=2.7 +version=2.8 revision=1 build_style=gnu-configure configure_args="--without-gstreamer" @@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-2.1" homepage="http://www.winehq.org/" distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${version}.tar.xz" -checksum=e55a43088e313c45f7ab49272b7cb441c06f5659fb4220b2325dc060db0ee14c +checksum=83e9607af66d86020dc27a368ebba28fa7e8ffecfdf8f149da06b3531ac3e579 CC="gcc" CFLAGS="-O2 -pipe" @@ -46,7 +46,7 @@ fi if [ ${build_option_staging} ]; then makedepends+=" libva-devel gtk+3-devel" distfiles+=" https://github.com/wine-compholio/wine-staging/archive/v${version}.tar.gz" - checksum+=" 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d" + checksum+=" 8680614be6c3b01c7c577eb6924fc05cc3de92394384939dd5b2e12e08235fff" fi post_extract() { From 77aaab5aa84518449a8551f67f74b2a79c6f896d Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 17 May 2017 00:45:14 +0200 Subject: [PATCH 0538/1145] opera: update to 45.0.2552.812 (#6402) --- srcpkgs/opera/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index e4da4f9e6d..2b9719b55c 100644 --- a/srcpkgs/opera/template +++ b/srcpkgs/opera/template @@ -1,6 +1,6 @@ # Template file for 'opera' pkgname=opera -version=45.0.2552.635 +version=45.0.2552.812 revision=1 only_for_archs="i686 x86_64" hostmakedepends="freetype-devel" @@ -14,10 +14,10 @@ nopie=yes if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then _debarch=amd64 - checksum=187f27469e30ea7e631b9f977915143a9b92f7ebd7fc859f6a258ef87c5d468b + checksum=39ba2340cfc5752db90ed1118681cdfc07657df061eaace49ac0a1b91492c175 else _debarch=i386 - checksum=2bb437b81799c0e8936ea843800b7939330bc6a2942674725fe359f8078c8c07 + checksum=82566f9fd4e76c0adf765c4d6ba194ae670298ab77ca7bcf6f0aed21393f1062 fi distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_${_debarch}.deb" From 93b4b68bcb26405936bea34b60d8ad6b275c371b Mon Sep 17 00:00:00 2001 From: Pavel Kiselev Date: Wed, 17 May 2017 01:46:16 +0300 Subject: [PATCH 0539/1145] Newsbeuter: remove transliteration to fix musl (#6392) --- srcpkgs/newsbeuter/patches/no_translit.patch | 55 ++++++++++++++++++++ srcpkgs/newsbeuter/template | 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/newsbeuter/patches/no_translit.patch diff --git a/srcpkgs/newsbeuter/patches/no_translit.patch b/srcpkgs/newsbeuter/patches/no_translit.patch new file mode 100644 index 0000000000..d33e4db8e8 --- /dev/null +++ b/srcpkgs/newsbeuter/patches/no_translit.patch @@ -0,0 +1,55 @@ +From 12551d798f145d5dc5b4f910914f95f2c0492428 Mon Sep 17 00:00:00 2001 +From: "V.Krishn" +Date: Fri, 10 Apr 2015 04:00:33 +0530 +Subject: [PATCH] Remove iconv translit references + +--- + src/stflpp.cpp | 4 ++-- + src/utils.cpp | 3 +-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/stflpp.cpp b/src/stflpp.cpp +index fb6dcae..7893679 100644 +--- src/stflpp.cpp ++++ src/stflpp.cpp +@@ -16,7 +16,7 @@ namespace newsbeuter { + */ + + stfl::form::form(const std::string& text) : f(0) { +- ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str()); ++ ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET))).c_str()); + if (!ipool) { + throw exception(errno); + } +@@ -82,7 +82,7 @@ static std::mutex quote_mtx; + + std::string stfl::quote(const std::string& text) { + std::lock_guard lock(quote_mtx); +- stfl_ipool * ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str()); ++ stfl_ipool * ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET))).c_str()); + std::string retval = stfl_ipool_fromwc(ipool,stfl_quote(stfl_ipool_towc(ipool,text.c_str()))); + stfl_ipool_destroy(ipool); + return retval; +diff --git a/src/utils.cpp b/src/utils.cpp +index ce4b36b..67d780c 100644 +--- src/utils.cpp ++++ src/utils.cpp +@@ -262,7 +262,7 @@ std::string utils::convert_text(const std::string& text, const std::string& toco + if (strcasecmp(tocode.c_str(), fromcode.c_str())==0) + return text; + +- iconv_t cd = ::iconv_open((tocode + "//TRANSLIT").c_str(), fromcode.c_str()); ++ iconv_t cd = ::iconv_open((tocode).c_str(), fromcode.c_str()); + + if (cd == reinterpret_cast(-1)) + return result; +@@ -498,7 +498,6 @@ std::wstring utils::str2wstr(const std::string& str) { + + std::string utils::wstr2str(const std::wstring& wstr) { + std::string codeset = nl_langinfo(CODESET); +- codeset.append("//TRANSLIT"); + struct stfl_ipool * ipool = stfl_ipool_create(codeset.c_str()); + std::string result = stfl_ipool_fromwc(ipool, wstr.c_str()); + stfl_ipool_destroy(ipool); +-- +1.7.10.4 diff --git a/srcpkgs/newsbeuter/template b/srcpkgs/newsbeuter/template index 383c17479a..683de25afb 100644 --- a/srcpkgs/newsbeuter/template +++ b/srcpkgs/newsbeuter/template @@ -1,7 +1,7 @@ # Template file for 'newsbeuter' pkgname=newsbeuter version=r2.9 -revision=8 +revision=9 hostmakedepends="pkg-config perl" makedepends="stfl-devel json-c-devel libxml2-devel libcurl-devel sqlite-devel libressl-devel" short_desc="Newsbeuter is the Mutt of RSS feed readers" @@ -19,4 +19,5 @@ do_build() { } do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install + vlicense LICENSE } From d9a77cd9ee9f6af6504d34f46d38aa594f0266bf Mon Sep 17 00:00:00 2001 From: cr6git Date: Wed, 17 May 2017 00:46:38 +0200 Subject: [PATCH 0540/1145] claws-mail: update to 3.15.0 (#6378) --- srcpkgs/claws-mail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index 6be7cd603e..e9e4b4fe9d 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -1,6 +1,6 @@ # Template file for 'claws-mail' pkgname=claws-mail -version=3.14.1 +version=3.15.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin" @@ -14,7 +14,7 @@ maintainer="Jakub Skrzypnik " license="GPL-3" homepage="http://claws-mail.org" distfiles="http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.gz" -checksum=b195f87a3b6eca6ee60afb74b3253c18713c34315f133fc46171add80ccabf23 +checksum=662b64356d78083ac69cd7fe83f0cda27d60509bd45696689fda5774bea70761 nocross=yes # TODO(dominikh): claws-mail is a mess. If we don't have python From 653d4d459c3c458500d923b2d9e364c9b9d39400 Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Tue, 16 May 2017 21:53:35 -0300 Subject: [PATCH 0541/1145] mbuffer: update to 20170515 Closes: #6417 [via git-merge-pr] --- srcpkgs/mbuffer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template index 877ae0c743..024ebc34ba 100644 --- a/srcpkgs/mbuffer/template +++ b/srcpkgs/mbuffer/template @@ -1,11 +1,11 @@ # Template file for 'mbuffer' pkgname=mbuffer -version=20161115 +version=20170515 revision=1 build_style=gnu-configure -short_desc="A raplacement for buffer with additional functionality" +short_desc="A replacement for buffer with additional functionality" maintainer="Diogo Leal " license="GPL-3" homepage="http://www.maier-komor.de/mbuffer.html" distfiles="http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz" -checksum=ef087b9d8af4227937633ed74af44041fd528d405258f359e4fc823e6c7f9550 +checksum=154fa0836777b21032b2e4f738fb0aa4dea218551b7cade93cf1b7245aca5e4f From 9c74d1f66e6067b443a41c5d06183c2cfdca4b84 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Mon, 15 May 2017 17:17:05 -0600 Subject: [PATCH 0542/1145] mu: revbump for musl repo Closes: #6404 [via git-merge-pr] --- srcpkgs/mu/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template index 63d9723cab..a7e6443862 100644 --- a/srcpkgs/mu/template +++ b/srcpkgs/mu/template @@ -1,12 +1,12 @@ # Template build file for 'mu'. pkgname=mu version=0.9.18 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config emacs texinfo" makedepends="xapian-core-devel gmime-devel libuuid-devel" short_desc="A tool for dealing with e-mail messages stored in the Maildir-format" -maintainer="Lukas Braun " +maintainer="Benjamin Slade " homepage="http://www.djcbsoftware.nl/code/mu/" license="GPL-3" distfiles="https://github.com/djcb/mu/archive/${version}.tar.gz" From 0e66a343a7975918b35406a7cb557f2f2070dd82 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 09:24:15 +0200 Subject: [PATCH 0543/1145] engrampa: update to 1.18.2. --- srcpkgs/engrampa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template index 81098dc3ce..6ea2cf5e1b 100644 --- a/srcpkgs/engrampa/template +++ b/srcpkgs/engrampa/template @@ -1,6 +1,6 @@ # Template file for 'engrampa' pkgname=engrampa -version=1.18.1 +version=1.18.2 revision=1 build_style=gnu-configure configure_args="--enable-magic --disable-schemas-compile --disable-packagekit" @@ -12,4 +12,4 @@ maintainer="Juan RP " license="GPL-2" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=be7218078f13d715e35580d231c0b5090fac1210b9de83f93311079f39b8aabc +checksum=286dcb75540db41f0c363663c1019311d64e409b2505e058b70d1f8631fc2835 From cfeaa9ae185cd1856a4bbcda393c7a7cbee888d3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 09:29:17 +0200 Subject: [PATCH 0544/1145] flex: update to 2.6.4. --- srcpkgs/flex/patches/078b46c6.patch | 82 -------------------------- srcpkgs/flex/patches/no-help2man.patch | 18 ++---- srcpkgs/flex/template | 6 +- 3 files changed, 8 insertions(+), 98 deletions(-) delete mode 100644 srcpkgs/flex/patches/078b46c6.patch diff --git a/srcpkgs/flex/patches/078b46c6.patch b/srcpkgs/flex/patches/078b46c6.patch deleted file mode 100644 index 014daabc29..0000000000 --- a/srcpkgs/flex/patches/078b46c6.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sun, 22 Jan 2017 18:34:30 +0100 -Subject: [PATCH] Add more defines in the non-reentrant part. - -Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks -code that does #ifndef yywrap .. ---- - src/flex.skl | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/src/flex.skl b/src/flex.skl -index 190700f..6a7cde4 100644 ---- src/flex.skl -+++ src/flex.skl -@@ -61,11 +61,17 @@ m4_changequote([[, ]]) - m4_ifelse(M4_YY_PREFIX,yy,, - #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] - #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] --#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] -+#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] -+#define yy_scan_string M4_YY_PREFIX[[_scan_string]] -+#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] - #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] - #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] - #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] - #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] -+#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] -+#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] -+#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] -+#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] - #define yyin M4_YY_PREFIX[[in]] - #define yyleng M4_YY_PREFIX[[leng]] - #define yylex M4_YY_PREFIX[[lex]] -@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) - - m4preproc_define(`M4_GEN_PREFIX', - ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] --m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') -+%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') - - %if-c++-only - /* The c++ scanner is a mess. The FlexLexer.h header file relies on the -@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') - %endif - - %if-c-only -+m4_ifelse(M4_YY_PREFIX,yy,, - M4_GEN_PREFIX(`_create_buffer') - M4_GEN_PREFIX(`_delete_buffer') - M4_GEN_PREFIX(`_scan_buffer') -@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') - M4_GEN_PREFIX(`set_column') - ]]) - M4_GEN_PREFIX(`wrap') -+) - %endif - - m4_ifdef( [[M4_YY_BISON_LVAL]], -@@ -170,11 +178,14 @@ m4_ifdef( [[]], - ]]) - - -+m4_ifelse(M4_YY_PREFIX,yy,, - M4_GEN_PREFIX(`alloc') - M4_GEN_PREFIX(`realloc') - M4_GEN_PREFIX(`free') -+) - - %if-c-only -+m4_ifelse(M4_YY_PREFIX,yy,, - m4_ifdef( [[M4_YY_NOT_REENTRANT]], - [[ - M4_GEN_PREFIX(`text') -@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], - M4_GEN_PREFIX(`_flex_debug') - M4_GEN_PREFIX(`lineno') - ]]) -+) - %endif - - diff --git a/srcpkgs/flex/patches/no-help2man.patch b/srcpkgs/flex/patches/no-help2man.patch index e5cfc88c10..5bcca3990d 100644 --- a/srcpkgs/flex/patches/no-help2man.patch +++ b/srcpkgs/flex/patches/no-help2man.patch @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig 2017-02-08 15:54:38.164525908 +0100 -+++ doc/Makefile.in 2017-02-08 15:57:04.101172972 +0100 -@@ -235,7 +235,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_V +--- doc/Makefile.in.orig 2017-05-17 09:26:34.592412829 +0200 ++++ doc/Makefile.in 2017-05-17 09:27:07.176392146 +0200 +@@ -241,7 +241,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_V GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -8,20 +8,12 @@ INDENT = @INDENT@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -@@ -351,7 +350,6 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --help2man = @HELP2MAN@ - FLEX = $(top_builddir)/src/flex$(EXEEXT) - info_TEXINFOS = flex.texi - dist_man_MANS = flex.1 -@@ -880,11 +878,8 @@ uninstall-man: uninstall-man1 +@@ -872,11 +871,8 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile -flex.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/flex.skl $(top_srcdir)/src/options.c $(top_srcdir)/src/options.h | $(FLEX) -- $(help2man) --name='$(PACKAGE_NAME)' --section=1 \ +- $(HELP2MAN) --name='$(PACKAGE_NAME)' --section=1 \ - --source='The Flex Project' --manual='Programming' \ - --output=$@ $(FLEX) \ - || rm -f $@ diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template index 6689e2fe2a..831298ba88 100644 --- a/srcpkgs/flex/template +++ b/srcpkgs/flex/template @@ -1,7 +1,7 @@ # Template file for 'flex' pkgname=flex -version=2.6.3 -revision=2 +version=2.6.4 +revision=1 build_style=gnu-configure configure_args="--disable-bootstrap --disable-shared" hostmakedepends="bison" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://flex.sourceforge.net" license="BSD" distfiles="https://github.com/westes/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa +checksum=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 post_install() { vlicense COPYING From 7307890b886c777677a01a7704f48ecef5ba9e70 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 09:34:45 +0200 Subject: [PATCH 0545/1145] cups-filters: update to 1.14.0. --- srcpkgs/cups-filters/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 793fd42d62..163a9ac856 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,6 +1,6 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.13.5 +version=1.14.0 revision=1 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1, MIT" homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" distfiles="http://www.openprinting.org/download/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=35db1c5821c9ff0e0fedcf87b3ae68a424ad951bd8af421a2a1aac5613e17b8d +checksum=7aa4274df6e6d9b5ff66e079d78dde8254570367c745025e58bc6194371fa5ec lib32disabled=yes disable_parallel_build=yes From 4eb330657228cf66415a746ecb4bb365fcf6e291 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 10:17:50 +0200 Subject: [PATCH 0546/1145] qtractor: update to 0.8.2. --- srcpkgs/qtractor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index 4ac7911dde..f3b57092ea 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -1,6 +1,6 @@ # Template file for 'qtractor' pkgname=qtractor -version=0.8.1 +version=0.8.2 revision=1 build_style=gnu-configure configure_args="--enable-debug" @@ -15,7 +15,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://qtractor.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=baf14db40d0ea5b6356482b2c5b9e53aeb5e58177f820b408a4cb9e94b4e7adf +checksum=030707a881861b8d8313761e0b08095fa252f8fe9dd082846def19916ccae76a do_build() { make LFLAGS="$LDFLAGS" ${make_build_args} ${makejobs} From ff9e6ffa047451c13ff49a906c617e8b9c4b4f07 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 10:27:04 +0200 Subject: [PATCH 0547/1145] rawtherapee: update to 5.1. --- srcpkgs/rawtherapee/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template index 124272b6c0..3ff6daf165 100644 --- a/srcpkgs/rawtherapee/template +++ b/srcpkgs/rawtherapee/template @@ -1,10 +1,10 @@ # Template file for 'rawtherapee' pkgname=rawtherapee -version=4.2 +version=5.1 revision=1 build_style=cmake hostmakedepends="pkg-config mercurial" -makedepends="fftw-devel libcanberra-devel libpng-devel gtkmm2-devel +makedepends="fftw-devel libcanberra-devel libpng-devel gtkmm-devel lcms2-devel libiptcdata-devel libgomp-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Free RAW converter and digital photo processing software" @@ -12,4 +12,4 @@ maintainer="Juan RP " homepage="http://rawtherapee.com/" license="GPL-3" distfiles="http://rawtherapee.com/shared/source/rawtherapee-${version}.tar.xz" -checksum=fa4c13e8842df096b19d2dabaed5a61f5f9d4547f7b4f0dc6b77f80bdec16479 +checksum=fb742065a6b2e1b89df67c70395e52ee1ebd537c86dfc473b41e7af171655b67 From 164d18a5a6ee43a4a3841845530cf3adb68aa095 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 12:03:05 +0200 Subject: [PATCH 0548/1145] lyx: update to 2.2.3. --- .../0001-Fix-compilation-with-Qt5.8dev.patch | 33 ------------------- srcpkgs/lyx/template | 6 ++-- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch diff --git a/srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch b/srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch deleted file mode 100644 index f79a03482f..0000000000 --- a/srcpkgs/lyx/patches/0001-Fix-compilation-with-Qt5.8dev.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d375ddeac49ac8c6340398c9797354edca3f5d1 Mon Sep 17 00:00:00 2001 -From: Guillaume Munch -Date: Tue, 20 Dec 2016 00:15:58 +0100 -Subject: [PATCH] Fix compilation with Qt5.8dev - ---- - src/frontends/qt4/GuiViewSource.cpp | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp -index 9c0ea1d707..fe593875e6 100644 ---- src/frontends/qt4/GuiViewSource.cpp -+++ src/frontends/qt4/GuiViewSource.cpp -@@ -218,14 +218,9 @@ void ViewSourceWidget::updateView(BufferView const * bv) - if (changed && !texrow_) { - // position-to-row is unavailable - // we jump to the first modification -- const QChar * oc = old.constData(); -- const QChar * nc = qcontent.constData(); -+ int length = min(old.length(), qcontent.length()); - int pos = 0; -- while (*oc != '\0' && *nc != '\0' && *oc == *nc) { -- ++oc; -- ++nc; -- ++pos; -- } -+ for (; pos < length && old.at(pos) == qcontent.at(pos); ++pos) {} - QTextCursor c = QTextCursor(viewSourceTV->document()); - //get some space below the cursor - c.setPosition(pos); --- -2.12.2 - diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template index c2dccdaa46..31f7dd6720 100644 --- a/srcpkgs/lyx/template +++ b/srcpkgs/lyx/template @@ -1,7 +1,7 @@ # Template file for 'lyx' pkgname=lyx -version=2.2.2 -revision=5 +version=2.2.3 +revision=1 build_style=gnu-configure configure_args="--enable-qt5 --without-included-mythes --without-included-boost" short_desc="The Document Processor WYSIWYM Editor & Latex frontend" @@ -12,4 +12,4 @@ makedepends="file-devel boost-devel mythes-devel enchant-devel qt5-svg-devel" depends="virtual?texlive GraphicsMagick" homepage="http://www.lyx.org/Home" distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.2.x/${pkgname}-${version}.tar.xz" -checksum=a85c3d7412c4069f8a1f5af4eb172948ae9a50394602f6318ab5c8e990aa5568 +checksum=4fcaeb7c202472d9ea21bf826fb30541015fef33e7217eda2be2b5d589c82b57 From 066460740f8ab15ce5114cf1c24e178aa2226d0c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 17 May 2017 12:03:44 +0200 Subject: [PATCH 0549/1145] npth: update to 1.4. --- srcpkgs/npth/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/npth/template b/srcpkgs/npth/template index 9aff9b5504..b9bb34ff32 100644 --- a/srcpkgs/npth/template +++ b/srcpkgs/npth/template @@ -1,14 +1,14 @@ # Template file for 'npth' pkgname=npth -version=1.3 +version=1.4 revision=1 build_style=gnu-configure short_desc="New portable threads library" -maintainer="Christian Neukirchen " -license="GPL-2,LGPL-3" +maintainer="Leah Neukirchen " +license="LGPL-2.1" homepage="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git" distfiles="ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a +checksum=8915141836a3169a502d65c1ebd785fcc6d406cae5ee84474272ebf2fa96f1f2 npth-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From d8d552c9b6ed78d5b4ba833f2903b3621533b58c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 17 May 2017 13:04:51 +0200 Subject: [PATCH 0550/1145] tab: update to 6.2.1. --- srcpkgs/tab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template index a353411bf9..a8b8163c1c 100644 --- a/srcpkgs/tab/template +++ b/srcpkgs/tab/template @@ -1,14 +1,14 @@ # Template file for 'tab' pkgname=tab -version=6.2 +version=6.2.1 revision=1 -wrksrc="tkatchev-tab-948c36918511" +wrksrc="tkatchev-tab-55d384458ecc" short_desc="Shell language for text/number manipulation" maintainer="Leah Neukirchen " license="Boost Software License 1.0" homepage="http://tkatchev.bitbucket.io/tab/" distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2" -checksum=5a456269def9bb6a5ce1fe49a2fb5d0b320b797eb33012e618b6437f5af17cad +checksum=374e1e8a6e4e6a90ab7faf54a5603c969fcbe64d2dc01f5da44990e1e25d715e do_build() { ${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm From 9d15c4a45f2c4596edc518ffa40a4846d31ef8a8 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 17 May 2017 14:23:12 +0200 Subject: [PATCH 0551/1145] xtools: update to 0.46. --- srcpkgs/xtools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template index 8dbc388e93..7b0c75516b 100644 --- a/srcpkgs/xtools/template +++ b/srcpkgs/xtools/template @@ -1,6 +1,6 @@ # Template file for 'xtools' pkgname=xtools -version=0.45 +version=0.46 revision=1 noarch=yes build_style=gnu-makefile @@ -10,4 +10,4 @@ maintainer="Leah Neukirchen " license="Public Domain" homepage="https://github.com/chneukirchen/xtools" distfiles="https://github.com/chneukirchen/xtools/archive/v${version}.tar.gz" -checksum=ffee29076b7a5d9a23b629c300096ae4c3008bac11751f5723ee3bc1af980d31 +checksum=da0a35b3671b9b21c4721438303851a61e243ff88dd660b430066966f39735b4 From 34240469cacde19430798a62031ec2ae69ce2710 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 15:17:18 +0200 Subject: [PATCH 0552/1145] mate-netbook: update to 1.18.1. --- srcpkgs/mate-netbook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-netbook/template b/srcpkgs/mate-netbook/template index b698c9bc4b..8e44962f9a 100644 --- a/srcpkgs/mate-netbook/template +++ b/srcpkgs/mate-netbook/template @@ -1,6 +1,6 @@ # Template file for 'mate-netbook' pkgname=mate-netbook -version=1.18.0 +version=1.18.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool glib-devel" @@ -10,4 +10,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca441a20b6afc340340520d45cfd84f36ecde2c665c4c0e178fc710e38cbe293 +checksum=ee0d946ac89b4b0bef8103f7eaf7c20bcd8442509bacdf7304bc211d71ea447e From 8ef693d72db018dbe284c5a0e90b05698776ab4d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 15:23:24 +0200 Subject: [PATCH 0553/1145] mednafen: update to 0.9.44.1. --- srcpkgs/mednafen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mednafen/template b/srcpkgs/mednafen/template index bd79c246ef..844024c4c5 100644 --- a/srcpkgs/mednafen/template +++ b/srcpkgs/mednafen/template @@ -1,6 +1,6 @@ # Template file for 'mednafen' pkgname=mednafen -version=0.9.43 +version=0.9.44.1 revision=1 wrksrc="$pkgname" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://mednafen.sourceforge.net/" distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz" -checksum=b8305914cdf297fe6483219fa10c3fa14116fff8eed02f61326a0e32dd350f4d +checksum=2427ab0718475c84c8f908894e74dcac2145992d23958d182a40eee122c95544 nopie=yes From 2389729d076a496634066c66f9e8787327b5ef0b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 17 May 2017 15:27:42 +0200 Subject: [PATCH 0554/1145] logrotate: update to 3.12.2. --- srcpkgs/logrotate/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template index 8dbbed6cd3..c90ab1cacb 100644 --- a/srcpkgs/logrotate/template +++ b/srcpkgs/logrotate/template @@ -1,6 +1,6 @@ # Template file for 'logrotate' pkgname=logrotate -version=3.11.0 +version=3.12.2 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://github.com/logrotate/logrotate" distfiles="${homepage}/releases/download/${version}/logrotate-${version}.tar.xz" -checksum=18ae0f2ec1f14d9550c9f6bd9a2b6a18440e6a0fd7d5923a6e3fcb7d45946261 +checksum=70c2037f654c5e2c6c3b386212049272a036b7dd37f36a486f01c7df20765551 pre_configure() { ./autogen.sh From dc88a6a1e7994606a34b895f73f1ad97b008ed5a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 12:45:10 +0200 Subject: [PATCH 0555/1145] gist: update to 4.6.1. --- srcpkgs/gist/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gist/template b/srcpkgs/gist/template index 3c86de89d9..6edf2f5d06 100644 --- a/srcpkgs/gist/template +++ b/srcpkgs/gist/template @@ -1,6 +1,6 @@ # Template file for 'gist' pkgname=gist -version=4.5.0 +version=4.6.1 revision=1 homepage="http://defunkt.io/gist/" distfiles="https://github.com/defunkt/$pkgname/archive/v${version}.tar.gz" @@ -9,7 +9,7 @@ hostmakedepends="ruby" short_desc="uploads content to gist.github.com" maintainer="Enno Boland " license="MIT" -checksum=f1060820a87bdc28b9e81f321d07e4b68604d3b84d6bf52a4422606fce34ed5f +checksum=8438793d39655405ee565d80d361553f9e485e684f361f74b6e199ac93ac2fed noarch=yes do_build() { From 68b79c38e88abfaea6f3e072706ce26279deed56 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 16:38:04 +0200 Subject: [PATCH 0556/1145] elogind: update to 228.3. --- srcpkgs/elogind/patches/fix-musl.patch | 26 ++++++++++++++++++++++++++ srcpkgs/elogind/template | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/elogind/patches/fix-musl.patch diff --git a/srcpkgs/elogind/patches/fix-musl.patch b/srcpkgs/elogind/patches/fix-musl.patch new file mode 100644 index 0000000000..34ce4c0617 --- /dev/null +++ b/srcpkgs/elogind/patches/fix-musl.patch @@ -0,0 +1,26 @@ +--- src/basic/stdio-util.h.orig 2017-05-16 08:19:59.761131676 +0200 ++++ src/basic/stdio-util.h 2017-05-16 08:19:49.802148925 +0200 +@@ -21,7 +21,9 @@ + along with systemd; If not, see . + ***/ + ++#ifdef __GLIBC__ + #include ++#endif + #include + #include + #include +--- src/basic/log.c.orig 2017-05-16 08:23:05.633809741 +0200 ++++ src/basic/log.c 2017-05-16 10:17:55.577021451 +0200 +@@ -21,7 +21,11 @@ + + #include + #include ++#ifdef __GLIBC__ + #include ++#else ++#include "parse-printf-format.h" ++#endif + #include + #include + #include diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 4213edf2f6..f3909ac416 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,6 +1,6 @@ # Template file for 'elogind' pkgname=elogind -version=227.4 +version=228.3 revision=1 build_style=gnu-configure hostmakedepends="automake libxslt intltool libtool pkg-config gperf docbook-xsl gettext-devel" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2, LGPL-2, MIT" homepage="https://github.com/elogind/elogind" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=44c26086b91a269de1457afd04416c874dd443ad5c3065ab974c2d9daf541892 +checksum=8bac23f97b73c8af24b351ed3062241704efa542de8fc44bfdb6783c5567ee60 conf_files="/etc/elogind/logind.conf" configure_args+=" --disable-kdbus --disable-lto" From 24aaf12b73bf88aae734c51adaeea9c4d53794f3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 16:39:18 +0200 Subject: [PATCH 0557/1145] thunderbird: update to 52.1.1. --- srcpkgs/thunderbird/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 358d73dd36..8a088d1674 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,13 +1,13 @@ # Template build file for 'thunderbird'. pkgname=thunderbird -version=52.1.0 -revision=2 +version=52.1.1 +revision=1 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" license="MPL-2.0, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=c33ca35b6acd1a0dc0d0f4b1df16745a33144c5d3d3715fe05454a5e9eefd48b +checksum=88211d0d57dfdae9232617244f9c5406520a538e9e7be6ceec79fdfed175ba84 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes From 15133a7dbc5f910fc82e12ae2b213a434229894c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 16:41:02 +0200 Subject: [PATCH 0558/1145] rrdtool: update to 1.7.0. --- srcpkgs/rrdtool/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template index 479417f369..17586520ca 100644 --- a/srcpkgs/rrdtool/template +++ b/srcpkgs/rrdtool/template @@ -1,7 +1,7 @@ # Template file for 'rrdtool' pkgname=rrdtool -version=1.6.0 -revision=3 +version=1.7.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config groff intltool" makedepends="libxml2-devel pango-devel python-devel ruby-devel LuaJIT-devel perl" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://oss.oetiker.ch/${pkgname}" distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz" -checksum=cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 +checksum=f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b configure_args="--enable-perl --enable-perl-site-install --with-perl-options=INSTALLDIRS=vendor --enable-ruby --enable-ruby-site-install --enable-python --enable-lua From 3efcd493a8fe832281d4f072717d496547e9d889 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 16:44:14 +0200 Subject: [PATCH 0559/1145] Revert "rrdtool: update to 1.7.0." This reverts commit 15133a7dbc5f910fc82e12ae2b213a434229894c. --- srcpkgs/rrdtool/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template index 17586520ca..479417f369 100644 --- a/srcpkgs/rrdtool/template +++ b/srcpkgs/rrdtool/template @@ -1,7 +1,7 @@ # Template file for 'rrdtool' pkgname=rrdtool -version=1.7.0 -revision=1 +version=1.6.0 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config groff intltool" makedepends="libxml2-devel pango-devel python-devel ruby-devel LuaJIT-devel perl" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://oss.oetiker.ch/${pkgname}" distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz" -checksum=f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b +checksum=cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 configure_args="--enable-perl --enable-perl-site-install --with-perl-options=INSTALLDIRS=vendor --enable-ruby --enable-ruby-site-install --enable-python --enable-lua From 0c3df83087cb7bb48cf17d13e7ace429f9276fef Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 16:45:58 +0200 Subject: [PATCH 0560/1145] elogind: remove upstreamed patch --- srcpkgs/elogind/patches/fix-musl.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 srcpkgs/elogind/patches/fix-musl.patch diff --git a/srcpkgs/elogind/patches/fix-musl.patch b/srcpkgs/elogind/patches/fix-musl.patch deleted file mode 100644 index 34ce4c0617..0000000000 --- a/srcpkgs/elogind/patches/fix-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/basic/stdio-util.h.orig 2017-05-16 08:19:59.761131676 +0200 -+++ src/basic/stdio-util.h 2017-05-16 08:19:49.802148925 +0200 -@@ -21,7 +21,9 @@ - along with systemd; If not, see . - ***/ - -+#ifdef __GLIBC__ - #include -+#endif - #include - #include - #include ---- src/basic/log.c.orig 2017-05-16 08:23:05.633809741 +0200 -+++ src/basic/log.c 2017-05-16 10:17:55.577021451 +0200 -@@ -21,7 +21,11 @@ - - #include - #include -+#ifdef __GLIBC__ - #include -+#else -+#include "parse-printf-format.h" -+#endif - #include - #include - #include From 24fda7846ffe590eb682e285c12e21c7f193b7cb Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 17 May 2017 18:04:08 +0200 Subject: [PATCH 0561/1145] sct: update to 0.4. --- srcpkgs/sct/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sct/template b/srcpkgs/sct/template index 1cc0454048..f70d83a0de 100644 --- a/srcpkgs/sct/template +++ b/srcpkgs/sct/template @@ -1,6 +1,6 @@ # Template file for 'sct' pkgname=sct -version=0.3 +version=0.4 revision=1 build_style=gnu-makefile makedepends="libXrandr-devel" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="ISC" homepage="http://www.tedunangst.com/flak/post/sct-set-color-temperature" distfiles="https://www.umaxx.net/dl/sct-${version}.tar.gz" -checksum=e8249e18cbc35fa106bfb90e715938b180f711d0e4f917636b340382ff2cf35c +checksum=9b36ea3342eaad3077077176ac43105dfc8260d940fbeeb8827d5f1467faa764 do_install() { vbin sct From 200698ef0ad9e1b402f272d225ce3d9315f211a9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 17 May 2017 18:26:29 +0200 Subject: [PATCH 0562/1145] firejail: update to 0.9.46. --- srcpkgs/firejail/patches/seccomp.patch | 53 ++++++++++++++++++++++++++ srcpkgs/firejail/template | 9 ++++- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/firejail/patches/seccomp.patch diff --git a/srcpkgs/firejail/patches/seccomp.patch b/srcpkgs/firejail/patches/seccomp.patch new file mode 100644 index 0000000000..2172d8ce74 --- /dev/null +++ b/srcpkgs/firejail/patches/seccomp.patch @@ -0,0 +1,53 @@ +--- Makefile.in.orig ++++ Makefile.in +@@ -16,6 +16,7 @@ + NAME=@PACKAGE_NAME@ + PACKAGE_TARNAME=@PACKAGE_TARNAME@ + DOCDIR=@docdir@ ++HAVE_SECCOMP=@HAVE_SECCOMP@ + HAVE_APPARMOR=@HAVE_APPARMOR@ + HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ + HAVE_GIT_INSTALL=@HAVE_GIT_INSTALL@ +@@ -39,10 +40,12 @@ + man: $(MANPAGES) + + filters: src/fseccomp ++ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) + src/fseccomp/fseccomp default seccomp + src/fseccomp/fseccomp default seccomp.debug allow-debuggers + src/fseccomp/fseccomp secondary 32 seccomp.i386 + src/fseccomp/fseccomp secondary 64 seccomp.amd64 ++endif + + clean: + for dir in $(APPS) $(MYLIBS); do \ +@@ -87,15 +90,18 @@ + install -c -m 0755 src/fgit/fgit-install.sh $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0755 src/fgit/fgit-uninstall.sh $(DESTDIR)/$(libdir)/firejail/. + endif ++ + install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0755 src/faudit/faudit $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0755 src/fnet/fnet $(DESTDIR)/$(libdir)/firejail/. +- install -c -m 0755 src/fseccomp/fseccomp $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0755 src/fcopy/fcopy $(DESTDIR)/$(libdir)/firejail/. ++ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) ++ install -c -m 0755 src/fseccomp/fseccomp $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0644 seccomp $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0644 seccomp.debug $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0644 seccomp.i386 $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0644 seccomp.amd64 $(DESTDIR)/$(libdir)/firejail/. ++endif + ifeq ($(HAVE_CONTRIB_INSTALL),yes) + install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/. + install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/. +@@ -240,7 +246,9 @@ + cd test/environment; ./environment.sh | grep TESTING + + test-filters: ++ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP) + cd test/filters; ./filters.sh | grep TESTING ++endif + + test-arguments: + cd test/arguments; ./arguments.sh | grep TESTING diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index 2e5284b82e..cd95f0f662 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -1,16 +1,21 @@ # Template file for 'firejail' pkgname=firejail -version=0.9.44.10 +version=0.9.46 revision=1 build_style=gnu-configure +hostmakedepends="automake" conf_files="/etc/firejail/*" short_desc="SUID security sandbox program" maintainer="Duncaen " license="GPL-2" homepage="https://firejail.wordpress.com" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" -checksum=eccb6f8ace71142253a1ed0e6902bbb3dd560d34bb4785ff1e7d01f0263ade34 +checksum=691225b5717b6e9540cdfe2a036f6e81bc27fc42abf438400732fc0459bdd005 case "$XBPS_TARGET_MACHINE" in arm*) configure_args+=" --disable-seccomp" ;; esac + +pre_configure() { + autoreconf -fi +} From fb264f9fd4442a8db32241bb4eaa20be0f9754a9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 17 May 2017 18:30:26 +0200 Subject: [PATCH 0563/1145] firejail: disable seccomp for aarch64 for now --- srcpkgs/firejail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index cd95f0f662..705fa7e720 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -13,7 +13,7 @@ distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" checksum=691225b5717b6e9540cdfe2a036f6e81bc27fc42abf438400732fc0459bdd005 case "$XBPS_TARGET_MACHINE" in -arm*) configure_args+=" --disable-seccomp" ;; +arm*|aarch64*) configure_args+=" --disable-seccomp" ;; esac pre_configure() { From 2b901c6e74067673a3710dde8fe68344d284e390 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 18:36:18 +0200 Subject: [PATCH 0564/1145] thunderbird: fix rust build --- srcpkgs/thunderbird/fix-python-foo.patch | 23 -------------- .../thunderbird/patches/fix-cheddar-dep.patch | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/thunderbird/fix-python-foo.patch create mode 100644 srcpkgs/thunderbird/patches/fix-cheddar-dep.patch diff --git a/srcpkgs/thunderbird/fix-python-foo.patch b/srcpkgs/thunderbird/fix-python-foo.patch deleted file mode 100644 index cf05f73046..0000000000 --- a/srcpkgs/thunderbird/fix-python-foo.patch +++ /dev/null @@ -1,23 +0,0 @@ -reverted from https://hg.mozilla.org/mozilla-central/rev/aa63a2a40325 ---- mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py.orig -+++ mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py -@@ -16,7 +16,7 @@ - return " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs), - propName) - def generate(output, idlFilename, preprocessorHeader): -- cpp = list(buildconfig.substs['CPP']) -+ cpp = shellutil.split(buildconfig.substs['CPP']) - cpp += shellutil.split(buildconfig.substs['ACDEFINES']) - cpp.append(preprocessorHeader) - preprocessed = subprocess.check_output(cpp) ---- mozilla/layout/style/GenerateCSSPropsGenerated.py.orig -+++ mozilla/layout/style/GenerateCSSPropsGenerated.py -@@ -10,7 +10,7 @@ - from mozbuild import shellutil - - def get_properties(preprocessorHeader): -- cpp = list(buildconfig.substs['CPP']) -+ cpp = shellutil.split(buildconfig.substs['CPP']) - cpp += shellutil.split(buildconfig.substs['ACDEFINES']) - cpp.append(preprocessorHeader) - preprocessed = subprocess.check_output(cpp) diff --git a/srcpkgs/thunderbird/patches/fix-cheddar-dep.patch b/srcpkgs/thunderbird/patches/fix-cheddar-dep.patch new file mode 100644 index 0000000000..c2cf58f716 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-cheddar-dep.patch @@ -0,0 +1,30 @@ +See Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1338655 +--- mozilla/media/libstagefright/binding/mp4parse-cargo.patch.orig 2017-05-17 18:28:48.627377816 +0200 ++++ mozilla/media/libstagefright/binding/mp4parse-cargo.patch 2017-05-17 18:30:27.349873737 +0200 +@@ -25,12 +25,14 @@ diff --git a/media/libstagefright/bindin + index aeeebc65..5c0836a 100644 + --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml + +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml +-@@ -18,17 +18,9 @@ exclude = [ ++@@ -18,17 +18,11 @@ exclude = [ + "*.mp4", + ] + + -build = "build.rs" + - +++build = false +++ + [dependencies] + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} + +--- mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml.orig 2017-05-17 18:30:58.571714318 +0200 ++++ mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml 2017-05-17 18:31:02.624693622 +0200 +@@ -18,6 +18,8 @@ exclude = [ + "*.mp4", + ] + ++build = false ++ + [dependencies] + "mp4parse" = {version = "0.6.0", path = "../mp4parse"} + From 750b97e7ed9e506c6e3c6ca5860e3b9c1256273c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Wed, 17 May 2017 19:14:59 +0200 Subject: [PATCH 0565/1145] dhcpcd: rebuild to fix -dbg --- srcpkgs/dhcpcd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index f5c562d759..d50319c8c1 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,7 @@ # Template file for 'dhcpcd' pkgname=dhcpcd version=6.11.5 -revision=2 +revision=3 lib32disabled=yes build_style=configure configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" From 9bb128bf68b26bada734138d04f44c7dea5a1fbf Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 17 May 2017 21:44:02 +0200 Subject: [PATCH 0566/1145] wireguard: update to 0.0.20170517. --- srcpkgs/wireguard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index 652a71566b..f92db20306 100644 --- a/srcpkgs/wireguard/template +++ b/srcpkgs/wireguard/template @@ -1,6 +1,6 @@ # Template file for 'wireguard' pkgname=wireguard -version=0.0.20170421 +version=0.0.20170517 revision=1 wrksrc="WireGuard-${version}" build_wrksrc="src/tools" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="https://www.wireguard.io/" distfiles="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz" -checksum=03c82af774224cd171d000ee4a519b5e474cc6842ac04967773cf77b26750000 +checksum=7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908 triggers="dkms" dkms_modules="wireguard ${version}" From 0ad4173aa140536dddcd3c42dff487affd78950c Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 17 May 2017 21:03:50 +0200 Subject: [PATCH 0567/1145] atom: update to 1.17.0. --- srcpkgs/atom/template | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template index 57faf541ef..bcc13f62bd 100644 --- a/srcpkgs/atom/template +++ b/srcpkgs/atom/template @@ -1,23 +1,28 @@ # Template file for 'atom' pkgname=atom -version=1.11.2 +version=1.17.0 revision=1 nocross=yes nostrip=yes -hostmakedepends="git pkg-config python-devel nodejs git-perl" -makedepends="python-devel GConf-devel libgnome-keyring-devel" +hostmakedepends="git pkg-config python-devel nodejs curl" +makedepends="python-devel GConf-devel libgnome-keyring-devel libX11-devel libxkbfile-devel" short_desc="Chrome-based text editor from Github" maintainer="Andrea Brancaleoni " license="MIT" homepage="https://atom.io" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=b7c09d03d950b0a6aca82225f072d9005d5681887e3a7c466b0504bf64d7c5cd +checksum=f9ccf2aa45b82bbf42a6a7fbbe5a3b7fdda99d76e77af8dee949fbcc419e94c6 only_for_archs="i686 x86_64" pre_build() { - sed -i -e "/exception-reporting/d" \ - -e "/metrics/d" package.json + local NVM_VERSION=0.33.2 + local NODE_VERSION=6 + curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash + source $HOME/.nvm/nvm.sh + nvm install $NODE_VERSION + nvm use $NODE_VERSION + sed -e "s/<%= description %>/$pkgdesc/" \ -e "s|<%= appName %>|Atom|"\ -e "s|<%= installDir %>/share/<%= appFileName %>|/usr/bin|"\ From fcbb0889b356c3105bbffe1032b616a95f1360a0 Mon Sep 17 00:00:00 2001 From: pulux Date: Wed, 17 May 2017 22:08:41 +0200 Subject: [PATCH 0568/1145] python-Flask: update to 0.12.2 --- srcpkgs/python-Flask/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-Flask/template b/srcpkgs/python-Flask/template index 5232e4fca2..df259ef100 100644 --- a/srcpkgs/python-Flask/template +++ b/srcpkgs/python-Flask/template @@ -1,6 +1,6 @@ # Template file for 'python-Flask' pkgname=python-Flask -version=0.12.1 +version=0.12.2 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Markus Berger " homepage="http://flask.pocoo.org" license="3-clause-BSD" distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz" -checksum=9dce4b6bfbb5b062181d3f7da8f727ff70c1156cbb4024351eafd426deb5fb88 +checksum=49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1 alternatives="flask:flask:/usr/bin/flask2" post_install() { From ee4f5659075378d01925c1af6f67fd779391a305 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 17 May 2017 22:03:13 +0200 Subject: [PATCH 0569/1145] Adapta: update to 3.90.1.21. --- srcpkgs/Adapta/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index 78949ffb83..a74cfc7080 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,17 +1,17 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.90.0.139 +version=3.90.1.21 revision=1 build_style=gnu-configure wrksrc="adapta-gtk-theme-$version" makedepends="gdk-pixbuf-devel glib-devel librsvg-devel" -hostmakedepends="automake inkscape parallel pkg-config sassc glib-devel" +hostmakedepends="automake inkscape parallel pkg-config sassc glib-devel procps-ng" short_desc="An adaptive Gtk+ theme based on Material Design Guidelines" maintainer="demiaster " license="GPL-2" homepage="https://github.com/tista500/$pkgname" distfiles="$homepage/archive/$version.tar.gz" -checksum=60ce70061c4c09312dd8e41022dd91bd9ae6e0c500f1df7fa5e0c20f6691fc5c +checksum=01fb1a0c4255a0b4bd1a2c09f50b302a8f7bb78b4452bdf8027ab3d6827725e4 noarch=y From a37d94b7b3ebaf5c9baa98ca858e929e1ddc0f76 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 17 May 2017 23:57:05 +0200 Subject: [PATCH 0570/1145] exfat-dkms: support for 4.11 kernel --- srcpkgs/exfat-dkms/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template index 7d9c33ff91..dd362c8c10 100644 --- a/srcpkgs/exfat-dkms/template +++ b/srcpkgs/exfat-dkms/template @@ -1,15 +1,15 @@ # Template file for 'exfat-dkms' pkgname=exfat-dkms version=1.2.8 -revision=1 -_commit=69713f6d20df08608111ea78742c6d37c1c9c81f +revision=2 +_commit=ef703b26a7caa1e77a5875cf7876870adaa6faf8 wrksrc=exfat-nofuse-${_commit} short_desc="Exfat kernel driver (nofuse)" maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://github.com/dorimanx/exfat-nofuse" distfiles="$homepage/archive/$_commit.tar.gz" -checksum=9b1c726c1f7699a802b4da897722656552e5a2234729993247bc31b4dfc3437f +checksum=b0928b39f9b65162a54d7719e41622d2057dab78d035a923caa37ed7785e047f triggers="dkms" dkms_modules="exfat ${version}" From 9e367bd1d0898f64da2618ffc85336fba117c09d Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Wed, 17 May 2017 20:10:03 -0500 Subject: [PATCH 0571/1145] feh: Fix icon permissions --- srcpkgs/feh/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index 81cc84a787..5986602aa1 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -1,7 +1,7 @@ # Template file for 'feh' pkgname=feh version=2.18.3 -revision=1 +revision=2 hostmakedepends="pkg-config" makedepends="giblib-devel libcurl-devel libexif-devel libpng-devel libjpeg-turbo-devel libXinerama-devel libXt-devel" @@ -19,4 +19,7 @@ do_build() { do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install vlicense COPYING + + # Fix the permissions on the icons + chmod 644 ${DESTDIR}/usr/share/icons/hicolor/*/*/* } From 0b92184eb623e7c6ca549d19ede199a2c21a6c95 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 18 May 2017 08:24:50 +0200 Subject: [PATCH 0572/1145] shadow: update to 4.5. --- .../shadow/patches/fix-load_defaults.patch | 35 ------------------- srcpkgs/shadow/patches/fix-prototypes.patch | 33 ----------------- srcpkgs/shadow/patches/fix-su-snprintf.patch | 17 --------- .../patches/fix-suidubins-assignments.patch | 31 ---------------- srcpkgs/shadow/template | 22 +++--------- 5 files changed, 4 insertions(+), 134 deletions(-) delete mode 100644 srcpkgs/shadow/patches/fix-load_defaults.patch delete mode 100644 srcpkgs/shadow/patches/fix-prototypes.patch delete mode 100644 srcpkgs/shadow/patches/fix-su-snprintf.patch delete mode 100644 srcpkgs/shadow/patches/fix-suidubins-assignments.patch diff --git a/srcpkgs/shadow/patches/fix-load_defaults.patch b/srcpkgs/shadow/patches/fix-load_defaults.patch deleted file mode 100644 index c1a272f358..0000000000 --- a/srcpkgs/shadow/patches/fix-load_defaults.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 507f96cdeb54079fb636c7ce21e371f7a16a520e Mon Sep 17 00:00:00 2001 -From: Tomas Mraz -Date: Thu, 25 Aug 2016 11:20:34 +0200 -Subject: [PATCH] Fix regression in useradd not loading defaults properly. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The get_defaults() has to be called before processing the flags. - -Signed-off-by: Tomáš Mráz ---- - src/useradd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- src/useradd.c.orig -+++ src/useradd.c -@@ -2027,6 +2027,8 @@ int main (int argc, char **argv) - is_shadow_grp = sgr_file_present (); - #endif - -+ get_defaults (); -+ - process_flags (argc, argv); - - #ifdef ENABLE_SUBIDS -@@ -2036,8 +2038,6 @@ int main (int argc, char **argv) - (!user_id || (user_id <= uid_max && user_id >= uid_min)); - #endif /* ENABLE_SUBIDS */ - -- get_defaults (); -- - #ifdef ACCT_TOOLS_SETUID - #ifdef USE_PAM - { diff --git a/srcpkgs/shadow/patches/fix-prototypes.patch b/srcpkgs/shadow/patches/fix-prototypes.patch deleted file mode 100644 index 244cdee5be..0000000000 --- a/srcpkgs/shadow/patches/fix-prototypes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 32c0b283ef5d68b63e4ec05fb22ed0db938fea67 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 5 Dec 2016 17:15:29 -0500 -Subject: [PATCH] include getdef.h for getdef_bool prototype - -Otherwise we get build warnings like: -sgroupio.c:255:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration] -shadowio.c:131:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration] ---- - lib/sgroupio.c | 1 + - lib/shadowio.c | 1 + - 2 files changed, 2 insertions(+) - ---- lib/sgroupio.c.orig -+++ lib/sgroupio.c -@@ -40,6 +40,7 @@ - #include "prototypes.h" - #include "defines.h" - #include "commonio.h" -+#include "getdef.h" - #include "sgroupio.h" - - /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent) ---- lib/shadowio.c.orig -+++ lib/shadowio.c -@@ -40,6 +40,7 @@ - #include - #include - #include "commonio.h" -+#include "getdef.h" - #include "shadowio.h" - #ifdef WITH_TCB - #include diff --git a/srcpkgs/shadow/patches/fix-su-snprintf.patch b/srcpkgs/shadow/patches/fix-su-snprintf.patch deleted file mode 100644 index 077fa27f7e..0000000000 --- a/srcpkgs/shadow/patches/fix-su-snprintf.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/shadow-maint/shadow/issues/32 - -Anyway, we use su from util-linux. - ---- src/su.c.orig 2016-12-01 20:41:50.000000000 +0100 -+++ src/su.c 2017-02-26 17:36:32.291904996 +0100 -@@ -373,8 +373,8 @@ - stderr); - (void) kill (-pid_child, caught); - -- snprintf (kill_msg, _(" ...killed.\n")); -- snprintf (wait_msg, _(" ...waiting for child to terminate.\n")); -+ snprintf (kill_msg, sizeof kill_msg, _(" ...killed.\n")); -+ snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n")); - - (void) signal (SIGALRM, kill_child); - (void) alarm (2); diff --git a/srcpkgs/shadow/patches/fix-suidubins-assignments.patch b/srcpkgs/shadow/patches/fix-suidubins-assignments.patch deleted file mode 100644 index 0425dc563e..0000000000 --- a/srcpkgs/shadow/patches/fix-suidubins-assignments.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 61abb4645cb0c4911eea0a7ce63a9c7d37cabe8f Mon Sep 17 00:00:00 2001 -From: Wolfgang Bumiller -Date: Sat, 5 Nov 2016 15:51:13 +0100 -Subject: [PATCH] buildsys: fix suidubins assignments - -These assignments were pasted as is into the Makefile and -ended up as part of a rule. (Usually the .PRECIOUS rule -which is why the build system never attempted to execute it -as commands, hiding the problem.) - -Signed-off-by: Wolfgang Bumiller -Reported-by: Rahel A ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -54,10 +54,10 @@ noinst_PROGRAMS = id sulogin - suidbins = su - suidubins = chage chfn chsh expiry gpasswd newgrp passwd - if ACCT_TOOLS_SETUID -- suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod -+suidubins += chage chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod - endif - if ENABLE_SUBIDS -- suidubins += newgidmap newuidmap -+suidubins += newgidmap newuidmap - endif - - if WITH_TCB diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index 18d2018730..95595b3f33 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -1,7 +1,7 @@ # Template file for 'shadow' pkgname=shadow -version=4.4 -revision=2 +version=4.5 +revision=1 build_style=gnu-configure configure_args="--bindir=/usr/bin --sbindir=/usr/bin --libdir=/usr/lib --enable-shared --disable-static @@ -10,27 +10,13 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/bin hostmakedepends="automake libtool gettext-devel" makedepends="acl-devel pam-devel" depends="pam" -conf_files=" - /etc/pam.d/usermod - /etc/pam.d/userdel - /etc/pam.d/useradd - /etc/pam.d/passwd - /etc/pam.d/newusers - /etc/pam.d/groupmod - /etc/pam.d/groupmems - /etc/pam.d/groupdel - /etc/pam.d/groupadd - /etc/pam.d/chpasswd - /etc/pam.d/chgpasswd - /etc/pam.d/chage - /etc/default/useradd - /etc/login.defs" +conf_files="/etc/pam.d/* /etc/default/* /etc/login.defs" short_desc="Shadow password file utilities" maintainer="Juan RP " license="BSD" homepage="https://github.com/shadow-maint/shadow" distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz" -checksum=61a9a4041b552eab9a253788d589e3664cf9b903bdd1f1ca73ea8aac4a71f03c +checksum=fc8c858381ad577a5c25ff5beb6ee60a34f8719c73e4e7c61e74188b4e54b741 pre_configure() { autoreconf -fi From 66a7f7446c394c90b7275e7ea1868624af455876 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 17 May 2017 22:46:16 +0200 Subject: [PATCH 0573/1145] void-artwork: add logo with transparent background and white outline. --- srcpkgs/void-artwork/files/void-transparent.png | Bin 0 -> 22246 bytes srcpkgs/void-artwork/template | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/void-artwork/files/void-transparent.png diff --git a/srcpkgs/void-artwork/files/void-transparent.png b/srcpkgs/void-artwork/files/void-transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..c3fc2a6f01287178f1e410b8f978f68ff1506e6b GIT binary patch literal 22246 zcmZU5Wl&sQuq~1xAvl5H7G#1YxVt-pJA~lwt{L0{4DK?xy9D_Nf#B}$?(X;Gy}G~d zR83I>bI#e)y?XW9-GnPEN}<0adItvwhb|*64u*q+X9wQ!C`iC>ZaB3Afgf+2MP<}b zfR_)-_b}iys)Mw)GaMY|)W0{pcZ5H16&#_9gqDk{y_t)l-BOH zN3GVnXa@@n&1DQ_m3iMpKoM73^f(ld6;TV+g4>&ym*#{gvy-LN`cyvm?q~i{e&ZGI z-4U4-o?G8h?~&Vp@c;W_gA}2EIVUTCst6-EV2q7lu#ttm$zzO_9z>+TLQ&DDUA?G# zNB_1okgc@Ol7fI6i3CS7fMgka%(48p2-N!dYQ2r%u!6b+lKXwM1%`ju3NSWK1> zQ68Qdkr{z1%{v-+K!j{0JtIRw!7s=}1Xy-Jj=qFGw^DI6JO(RhEx<_hhiIad1AQE2 zoOp;N4iVl$yxdGKqe3$LDhg#|>y#00>^EQ<0j3}x^k$-un0Fl44T;l(sj!9upQs>TZG5}3DGdplbR`U7WvQ} zm=?mrWPo)*zp${Xfu@d%tfB};OK=NtOBJxeh9a9QT^CD0O4!E*iTZqBaqn;4CPYci z3KY11T72mt+((?$3QNEy{dy1DhFjBE!xVNg+0~p?bN>8_SM*LXPW7jlr9{c1Ejtdd zjy;mSIOMoWJ}&&m{~0TIYLiyucwpXXpr~wXP%G&Dy9?Z)%@Jl7iIIiLZnAokMfU-yMR@Y*JNIuler~tYP=MGmF zsAayJq?wqInXYiNZ!?0IIsQk`o~}zMAZDC&A8#@IZtt$wP4zHL}j%Q(N@%s+RJ_mec0 zXv-t}k{%Atb*h*MO7P^VY@DOtc-b+jU`KDC5K{twyhcWpzQf4k{u_vkTwGo`H7%I% zO2_;;h746;@8jh7yyZ1pqknqLFdN`{h|(b30J;F74GPr8=JJ$fDffiL^kAr&%@DnK zsMI7|E?wq=yHjKMPmCoxh*nv?C2b0Zf@T3UunV!v5PrBdvwK4H#_W`XH1$7J^mj1L zU4u{V(r!C*9dF2RL`f#b>+6UnbN3<83nyr1jh#+k_QUf3TrBK_WqGh*7|M0>php+ZMNGR}B6YNc9ZCpAix_K(Ov#%E zWUI{hP#n2uWfWt@LH)4(F}*P81hNN~sfJnddbVNw=*+WjKf}o6GAHgc>KPgZ2PmsADGCBiT5z~ytZ^(nA`jPuRY_eSMMFt zu{IbohpiHTEqN;qDndjX+lzqerVJ+e>MmrQq{v*JVGCYK?}=C?tNHk_mo2=YEg7Fc z8Zjnw8xTOIZ_bb$emrQo+H&k8Pw+S$guR5MeoP7*LkYS5DCyE%2wf&y)1mA+(WUS#_<>mZ6SJ-iK1196PS>SkQCMZ%!5k|&{t zaEDW!o8+4_VFBxyHZoKolfleC9INa1iGfb;@XW?2)3mO?AUuVwUV{S0Pkx7?zHzj2 z)NUhGzf8@U>OrT!(fXyi&!{4VxuwfRm8Quu1*0NS8q}9_imEC;K&}!mTDw;G2{&8EHJK zY?i3~=l$0LDkKNndCN3@B-gvK5i~A*yS2*3j1i@ryc&F=tA3 z_y4yvGMYlOktul{h3^)h@>Qj*ZSidom~li?tdQ{m=%p=yngqg%&8*sDPQLA~XJ&mJ z=&?pceQ#{jS);RD#2P45_$@SOe{3lX7=|NF;7efCAy>@bG3o1Efvz``C8-$0$J}Wp zsfxn|GyqJnHJ)mH>pq6)-@xr=9?LcticP{h7n*IzKKVRz4~8`*gb6hp{RNHj#oo+9k0@V2>;FvUy9%N+{2kFW3f^?8HJ&*I7oNm&_NeJ1s3b+u_V6>WVPQ*|2C zL{q3n5?Dh;(zF4DIHQK}jL1{<>Zv1umW3<&G>yyY`ED}T6UE-qN)&}klqw7*oPw1- z9#~7@0}8s6eF_lrL-J~=-pQiTGlB}L>wiAQ`_zS&AO;}@@%VS$>%6iwp;EqVqo(r* z?vL?@VP~dc1r=A*f1@@DkB))?k@4yIXuytNG_yQEryzh$!kk;*BQ2wwq||zd=-3N* z%10riUk|TkM9tzT=RZP+CO!b;`AE&(0M`k}+juA~+V*B6Z{zIpdUD%WHxe5E?+&T{ z@wlFJ^o#=5bsvbrq9aUgR%`B1($74wzlfsL42qfU13~kB09}TTvM?6vF^;rFwy@3j z@}xX5Rc_Sph<$1(OZY}01DI^gS5lc6C0aq=4j#pFJQ_pR7yzoqJi^Uu&jR$-x%gcxGUrkM7Pv}82Zml8)GG6Bs{JVfb_VhSXzKv3x39@ z zKBk@kqb#UnSTEA7WU4BF?vgVCwZ&xbpL)gn=GJ@odzpq5nPISa=p*M?v!hNA%Y=s`rvax|0QdVjz<+i+Rzyuc9rg5$^CR z0KG%hsV+iAe7-o3+=HZpa69nXo??1K`qCgN1WdR|2P|v8IQO6{#C@m+^uQ{e?C$RF z--Po-^UFgA19L^gl1{k^qZ)U{R>ZWe*w2Q06Xi*H$%GbTrf{02P|gdpZW{2U6e~&# zBLI()Vp)8{kLEKulk}nDzuLI7H?qHmPc97spxKF&zad*(+}W_kro@&fVOLqs^d)wv z#L82^8*L1qC0g=1*SbMh3@! z0Pnmcnx2v?1IiE77Y==>NqAdyKgk!XVxSJ+wI?WcHyFjUBB)9ndOR;7t~R zDAbySYrKo~(f2J)xTbHEzLa|ngSBRQT1B)XX~hbB6?_OP<%GcZ_(2N>wt9jZCo{0D z!NbEU`pA0<+gbb_o~)APl5|*wFiH(ZGs3hy`rZ3ICWuG3i`npR)<;r=rO-+^k7pL6)P^M+ft%?nq3X@QWNpq|M+@DTh9gCd zl_OqSaQ4!mQ@65QW&m_>no(dRAX3=Z-f7XW{H%r{Z){ODG)e%Asik zzm-D?Q?NiFq9}?g#n2yVP}SQNxFa0~Qhv{$SI_%X{k)F^UW6u(F)%R~YtXZdD(6$Aa`$Qv^sQr%dLGhd#}l* zlml+%ZtRyk)tOQVk$xRfI_m|^^0I?W>5M9`=MG3aFBVs96};MUi*`5$m2htkEk=7paKqn4PWV(bDT7t=)LmKiWj#BPha6E24#xugzcnmsYG{uHeaPlK zM39xY4b+f7<^aMp3grO=YZP%)rGAA7NF#QBz3i4G+Zgl#q!9F(0gT!C8D`T+mWh2P z`_D_G!H}gcDeF#}&Z!fjLX{bFyNwo>703D~_RKU?(J=HbP0c^8XNUTC$-~#^eu8 zy;uvJQ2Tsba4y!!ESPlw(lxpZ#p2LcN?6ntM4;loLlUAdxHR^~f$mAZ@~*ar19+L- z4P5Q8ysn;h6w1;7;=rP*J|q{?92nLihYeqKH1Fb=9LZT&=#b@CgY7ZK!w0(ZzDAP2 zMw2f)sN}rgepfR6s@7sF+~F_<)1FA6PzGbg=5GluEIk8pVT`UO_67}IQAPswG4@mw zbCn5ZQ+w2cefBvtEaTMGmK#w>QY~bAe{s zIyoC)QD99h2t20u-wgb94vgV=@kjT=8rRhHIsc8Y!BuPD9kZ-grw;0(8@lAq+;B}Q z$Q`~!%-_N#8vx*3j_0P?BpZSb(yVSs7mLU`RAnt^Q@V;hqQ%5i$dC123lwM0$J6YW zZp;)j7Ib&yhYQFkdsv|lI_aqkIVV5riJ%{|eEV)xv~4fT-mFX1uva-)B+bqLm@yG5 zEONZ6Uml5))6Q<0k19!JkAN}UPixVvy?gW98?#7XoNttH1_7X6bLs7x0{n}*W|ju) zV*x@rSC(&}^YeN2rmepmedUK;tY}BDM17)b5f{!x05)W*HbCDU^qb#Y3ys@h1MY){ zEQc_KLlv+G_#y5V_%gWZI7JPF#5`_01$La}qf19aC8=LIaC35zrf9>+_Q?MhLsdpT zO`uCD*rI#KT8>Om)sJxD0GD>Dsqv*}+g9Tex$^y+?Fx9z?%#s5z;g!W0=WAAkYh*; zzai=e9R^t6WKx$GCy}Zi`y46MjBWba)t)!hxmMs?SVGDIaiJ<(&4!@b#R@=Aetpi& z2UwOE9cD@BX(E`&tJKmW)XdW2>wjK0=PV5T-=n)1GKootr{s&w5CSA-_N|PXu03A2 zUV0#lGUbFxKyp{+x{9MRtxSwA#>Wnw*A^SzSBdO6{Jd8=$-X#VP@Q|?%_6Va; zMyPZ=!8A-V79aJVd>eFniDGL9SZke+HN-+zP}s_WXe|jps~zjRzdoPJ0nBj`7%4oK z=nm8UhfMY7BH5_555+QxQvSYc@`=F%oaUJ9mPs zR-Ct{hPI0U?~Dx$o-qMf6lHF^W`V1UGFaHaG0SVNdO}pv&4M#pNyF|j_4A@Wfmk)? zCYSl(=pyN_p{=70yS1F_t{l4`864r9ctq)lvvMHx5)nJ;e|P|yKxqslZ>+ri$q}8; zD8$hw({94cflDclEqhmx8^a6`Wxsy63SspA@umE!xdG<}u@Ykrk`Nb*;=+2qx|_J| z9oC|mT0v*rQ^r?u0mcA1exsQ1|FA@#f~e#dgaMl6sM4#sTT)W7Zc(Y9EH1WFK*(Iw z6Tj<}cs&QiNzcD&JL5$Oncbov&df1W@)*DaMma^(`2+*{{CE;Uvt`%c=)QH!$rEWa$)1MLm+D1fjhBvzGuv~FOnz}EpW5rOd+@*;%AT)E^98}{0LGwN z7`_(dwZ>nkrVCgoPVRXs;^00+t6_FhL8>QB&fOTfGU4g<6HX996-1X zL$SqL#-blo{OzL4l_u7<^w7`J)Uw7HcPT#- zVBbw$X_4GK3;Zj##VFHiax)U=eE#tOCrJUQ0@Gp z;!q)c(T`;Xx#7|vmbWWNyq2U@Wo4Uc|AAsMc)QQp`t)1bG{FXB_-ad0MjfRA)ZVTC;bRN5d;}+Av2h?>gr?nd5Jp zV)UCdYdKiS|}WK)wp|E#)$*RKB-x}nytIxA@Hgz=&zn5> zjR51DOHMj?`bsMe%Q0rYE^4%DX;>2n#we6=&;B8DBCk3ud7SeCVpb^d3K$TA7R znx0WKlvQIB79xt`NOCvfHMEyGtMp-xiLcM28-qjA(PFbAyMUa%QtT32P@afeN8l-I z{Bnd*uG(I?pEXefS_@1-ac6%Pe{4EqKYfpW)K%KPu(0!cL`_m$sOZ38B#y1MHDdo zchS@V_c5e4njFRpBZ3us#$o04>&PZmUbZWLCa}rSR?)^jWSdbnuv|L2Dg^7O3>?^& z5hn0TE{A=mKMRIlfGNd)*DA__lsWTg;q>9%Z!?zOG9u3ut4lD-Z3YUfw3CXW;B4Z| zC$#qsn>9oQ#UlWz|M|701M0YN8nm_mm1Pv!DL@ZzI&ry6QWN^likE$G`RSBiK~_}f zk#>09!vNzR*84&GUy0|EHDo@Z+L8<1v+u9WMdGD^ex$PcR13ij>Ox@klgf zs5L_Ybo3qNi?L&AZ2pwn!gQZo%(0DDs0Q8PUxpEC&IvOK``c{`qz3Q+I(;nDs1T;Gq`49#e z2`$VAl{<*4^YW7e8PRJf%{EQJvAnhFNO@M;0ukrYQcgpSV|QhBeGM|##ra(AYylpyEbd_Rs^xn$ z+NARg6VX>iL9GwB#)B(M^Ckste_3;fGM*>x$S(s?jUM*Y26Ymu#+Hx=*V&Y0U6eY_ zn3osjEzHRbR^$RFYUqT-^|E0G5^*Pvw->b_0LUei%yyA7pR9jp7bK=?Yv;vt8RHCdy_;B}tLqe+9okR9U%JW5$qjePP zddz*sF}1gP&r86{bME>0_H=cWYt`rXNG2Z$RD&*Y_weAvtqL+99KnNmf*q;b3>; zw)!@(y8i^98OJQ)F3C%;^Nl}@+O?3032>Wrb9_&a_{+m=Cl2l;)@ofzhmh|BdsXKP zulMZ%V!9)2jCH$jB7+^hj!IYFvO5S8Qs@v6i~RO+n;4 zN!fdZv*bdXUzR-exidH1kH<}B#K*F=oMx;SH-iEPQ$7$(YOnci48Q3qfF(ZW z*pR(fC+BnAc;o+anXO%K5jPyFJsgHjT~12G?O>*^uKskl8T)kh8?#)eA!2AqzG#-? zbMAWXdvd;v$U=SbS%YCE6M9Cb?~DK0{u8+`?+&XvN7`>!7IoOthY~dn`ioWak9r3O z2MPJy7~9;5-PwkguTEF9fv;sP+ODz*Ja+a+{~N%Tu*Cm?RuA$#&C*BqOTXW+2@IghMIM{ zc~q@`>ZMtT`hbrgpOPZ25+_KkEF&XxwAx8-X!uCDEA)D=MCP?esekl^S4BmI|9&fB z$#qs=C;Pe+l`^AL*xHwGrOEFix$_B@NZT5cKp09dXgPbP#`Qoq4~lr1dSjjxmKXQ> z?z6dume$|nrqvO3P5teuR0#=*^VQdvu2C!Z{@0}u`lP71##>uKk!U%Imy zoUY$Ww^$Q@4@;T9<&AX{*_>>!?4Hrf(|s!sTY&dTi_~PQx~Ask!(mAL_AUL}w{Mrc zPuu0Q_)~xJx1ByFfCtbr+6@MCnHv09t!EfV1a6l!(&oJipd?y{EkW0Q`d%d>5psL~ zTMH1X!N+GP>q%WrivA%okwJ5!$=(p3QOoF6lz~{c79NkA!VyUtRvwZmL1iFt!)%!Z z+LnP4jT--Jjpfz4M;<_Rp0kntfZ!G=0oul+AdRk^Am+0BK9(cG|N3;Ph2t`fh9XUnbmZ4)%@fXKk_$TT7{ZFlG}828$Rs-vT0$#XX| zt#776x34$a0AyEAyz2idFe+qUG{CVKcNSm<(MCCcYlK_wasG#Z6sh2P>*~d1i*%;x zq}q_6Ek+R_gy;`|;)^2Z-2|i89Y&v;nmT*B9Az^b`gn8Xm~nl)yW2+{%P*>OCE#oc>DG0uXksO;)xWjDyL#nG>WE11*GkJOH~e2Oe@&dcsCTkG?L@kI3!zi? zU0=Wc{CBn}UgF+B$;OsIY}Xvfq?<8V;Cj4}7>q{1>Q%2l&LH$5 z6~2`Zd+S3sjrL>n}E~V#YrVJDE!T)7Mw`y&q?1G`nhl2!M&M0-1!RlOY5I#OCW4 zUC)EzqK`a&-^((zpRaori3TffR}ZMrGV6RVZ+ew#&z^Tz4|j&T&W{*bSYk1So|L)x zyb5nz!r2g|kJA2%jq;0oKsqAiJv}|2UfT2txZB<%6k#Z!)F9sVcpcUBkx^51U&0(D z`jist`kwjJGZ*_dcTG0y1_Dei@VNY6?swl4v4>5UWfpxH%HT0 zp;Wfew6wG&;*~eRSX21ynG=c>+*-CStH1tsiHjRqN|Ld)-4wu-jg-@_vx#0jE};W~ z!Wk-?MK9-`?k|@OtW1Zev=_4Ll5j|H*^kFR0fw9-K4efA&n{#fok4Si+d zC%WteKFqdj0icp%@9J&>CP&EaKw;?r+%S2`+`NXs%F3F-JTLTeXJXfWt)YLwT=Z;A z^h3&Omb*3R*AoBoffO2A#;tI1Magz(mH*fu{D8196uZ`a+F_GyzXwoX>>+_x=iWdh zI|H7M+z9G3+K#i+(MnyrS5ArNN2UB?O9U)@{NDUn!GkTA=ef=Y_X6Th?i%c`X`4V; zTmp!Td?s%qE*%NlU!=EhzuK?xYm{q=6e-3e`f}PW{bg!e%8SI^Tc~5Gv&-6^xt(j! z7b3jg5Z%4EAl9&3ldqI(Xv^4OjJp9S$oO!~+D{|q<|#{nP2-()i5i_K$IztfvU-d?!~`V^v9g9e2G# zIwwbo3y6m&b-GNG4cHz8gd;G;h*2UE;#oHuOSRLsEP-xCG*-|)*FwXl3y-A`Y@a9q z6Wu*S>v7rqVR!`Yr0rC2_*}out;S}ab@}KcubD+;K@w3uMV0XEd=m%Jphp`>*V#H1 zKgY!a9?J5!Zd7p5XK<dGkyQ(Yn#=M%&#Wwx_Ewp z;H%X$uF;W^omBIT0lpR}Wq!!dDS`gu(>kAXr>4$O4oA{W_P$tiQu9N}=MJBIsaUff zlw(24s$Ulo%n_s4dc0-Y1Jep-!?hd=vI&mJ`mJ;7M{~!O?1Q=5?`FxH$kG9dMxeL$ z&}HIW!pOY2M?3r3Zw5b!&1p*-pdyF$ym>%`@B!F2qh9mR>Mw1kzSy#{A+K=M6`1^2 zV`8m4)cWVh$G_+`Yke=>Vo10r?!uY7S68#=Fc#V&$&5PR!o(K<>k@p}qh3DRn`t9% ze_Y(ZZ6E^ClqGqYwV+!3IXZTu)dAbS@W>|lAdU*$W-#+eMLRnDcC-4dk5vx+*=~wC zX!r~nPUqqiaDBMi|Ni~E!#*s{y+>Wxkg^A1jrkDK($exDFRo~62zNPM&NT2nW?$AD zxsB{_fArQ$SW;~}6;=_!KGZ0m9L6vYuea}fZmc|@PabORVVYfjSkzD?v2~KuN@lZ} z`*Qtr`F-I$#_&Y(zk{%`T(MLh=fWSFds432G*W)c^QG2mcuBRE>rQUW_o->0`$oP} zQ3V0Wcln3FaIB+UpI83vz^X+&)=BWoi=XQ92h!Qg6v{E@Q6L}Q?!Lo)= zm;bYy<*mqoQpp$UKQH6zIfyVp=T5e>>)uIw`t!1FY;Qb&zSXrX|I<8a7Yb$1r3O0b zNslZF1vT{#*TbuHfu5e;W*S|+;akH!T?SOyGhGE&R}O$+%GnJStytcy#EHkL%YbwnP_%jRzGtx5+;SEmmXzRy4#aV5aqtd7G)0;k_Cw=UmN;tMsvAj zX6o}le{1sjTLA)nHa>Pzz&32c{(uW>i86To?e*^BolBj`&Cz_?^)Ogg|Ia7H9|+6w z(r8KDexyQmR?MAGPS<0+6=hsmQ|IOX+Z-sWtcUWZ! z5nKXuc0p?Oud7HHk$D@kkdV+xhpwvi&kqb5KjX%KrCVEn6f)&E#;&x#)>2dMc_5$V z^2etbL@l z)7RG*3gkbbOuCI{X|iutp5&{XZzf5Co7r;>kZ$5HZylDTY?rAbdvmG z_N5`&o#X@te!0sY54|q>?%L)6e1H3vxARp1*D@GOkNugdNl*9GqaZDn&AgNtTQjdf zWPbc}s2NDFspQr3Zap+Sa&iQ1A|XHhR#~Mu6Gz2?J=Ac=U+xCKFMbXV`#4{_-HW5D z{U%Mr=j@Y1IMxOdC4`OU_xX%c5~KD+^EtEV9ZI2mHsJ0RTeBRUPP9^;Ix+!(?SA^) z+rcRVNV1@+M6dt_4QV4 zFVC6jDJP?4&bFF%2ClmEA28@P&uPEMNPwN*V{_hS)qmfh+NqPasCmpa#S~IaGWHXEUjUVepH=&rh zuQOcdHS=5@^Td{Qc**N_q!ofmUP+Np+|66_NuZ*3GT<)A+Z45yKeU zSkHU0!EH16KDZUBG9f;`-facW<8qj*qpy+^SEujowqM{&fdOwspr!%^1$(jaui_zQ zc6{JKU$Is{{yIS{^lI`aum8n83i+*u{n1?QkL5*uUAvi&vm+fzXVQh$O z7pA#o3z%3~W;xRqVz);3PttClo_g^dZ5uM(N)NVr{S#uo znb=ynSO-X|((CPvG2Uy&YR4+1vIe8#9ud`jL|8u*Yq~^ceJYGZ4R>6+f)x+h6{)r1 z=n$v-ptipo$4$Up?jWo-nhdW0)L!k8e2so@OJ+zouFXt~mur?1>CppR4F|Be8pfOJ{keHrFyvp)elT7YF=-8J`bvL~-rZ2y=Q%BdF@`tZ@ZHJ;G$O)^KRi6ryEmom#LH1f*rNM<%?V%jNzR>L=s1Kxu*d; z?tkq*gJoB;ZaIVRM~D-eC=PqsLl3qD_|x;B;L7!_jW$+R&tXS1SE`oY<-zRUL9A#5tY zOc!%d`}q5XJ9tHP56roOa%H$W_g&@w)7FU2G3d z%iQBMOQ4K@M7%mfGe`C#IW-%;NU3VT5Q@^9H z@J;HNP}~{_E;QurWrm~&L+NI$$E}tavE)1skW5`&I)Z7E44R1p9zMk8tIx9oBANVd z@#bVcArVf`6AA}FzJnwg6Wuo`Q5}ZC#F{GOy&EXPh}v15A3O#%W?SQgp*Qvk%RB0MY2KGgA9(0$~|Pvq+yS zTAPcIy1%Z8w-{oj-eBEW4wEi@!tC%O5>r;Ot^atH>>sQwVFsJ&25!zVw zGd?cvW^vat?AQ4NagP*-KWFKmaWN^+hyRN1SG`{+B@TyXXOo3io~0@?ZL|5U6<+pz z{0y$^{^hPbJoA=R6>Q;dnryB!YRNYB>Kbab9_!!8I(Ho}oHFS$+kOc8K2+N+^LpJj z;_mAq>KVs9+2h}|ALv7{Hhw}c428uKx?7xgFRJ{X2P^KiI$r#)Qn(?^)OwSp6~(_G zY=7R?KfbMu*nuh$%ibtLo8B=8C{djUTI9^M#CjzHg_|cOosny=yy*qSJsZEwn~4t*;Duim9Nt%6%`e? z*Hy9E$$Ywf$G$S=a1R;f8$i?eGAj63u5q_bx5i2-9(mocL^Osix@B~2iqw2q*;YSg zpnEHLEmO;-t0QjtJwn)B@X(zG|4&Esa-Jbi0O zScYkAFclsUF#zp%dU|?4P5SWo>S#XUUy=!6nVxm2ao5q41!f*7rpKF z|Jc$v+&{e(;J`*@Rm+yrERsVV_5CunOs2Er&j-u(cHn^>@nu6qq7!}*5s`mcNSga| zUEto$_>$8r(~!4)R^j`fY@9ILiH6=WZK?{%^ZM|J{sg*&tgMk=o|h=^-hs(S5DRsP z-nD#EE>mK{_!X(Hs!UE!p5^zjk8j9G&k8l>G7vw2<)2-G(tI!lsx9d9o%~b{ z?X|sDO$280r7$~QUmoiQO8&S;Z8jp?ZB~q~Y~)!IG|&f2*h}b0@m;2K*_%CkjqV>2 z69V^UZrQ@|d%o68Vlk{tG(`G|^qxSpSxsG-Ae0tTjPPP7!0CFRR0&*)LZgA;?dH93RunXQxub)Vr?p((j?sgBd*f>uA z{Z9aSzCpiJr@zLek5|56y3R15X{=J8Z)Ye~%*>2dE{W0cs)<2dW%wf`;eWqPAQ?-xT(I>w;3ox`nN%WFa2N!0A>F+p=}MTLTdGikCrxKlPXdP^ zbi#3J$GN(?{^QF0zzGkDpwHZg9j^>UnM^>o`?RYd7>lv%;?U2r+sU1sD0elv{|cn+ zDZJAL3%r10he67#teS7Q5T=5PhGqh2vwFVQ)ADKTB{k{ORBM8ikVQ4>GR|xLo$HkxN{zMYgd7OWnn3!;xR7^BNEGT;{d(O`Hudz(jAn*A9kjQv@6q4UaDYCLk6-@utY(i4Y6V~3Bn7Ug(5B(M|X?d#rSzdVQOaHg3~P-jN#_e!3Mzsqnv}r zkZGi?id45SfF29NN%!|6FK)Vfwjpq@aJ@IghqC6JXemMJf-thF>1ju*QD+5NB5K-h z#b`h5pNtTX9^8@l{A*)y5Uf=M6P3b(hM7JvUz^fkSp#0uhq}!$edmobU1tSK@kFc* zjvQPE&>0I}uwv5(<&d|*Ut3Qt5T2rHpzbt4Pe_y^p@O({*`)D-@GYV<^=RGPIEkP_*pU^cOPE}bvmgFYRjEBb2dVqD8`g4^yv;$&YzZ{>W#dXb4+^t zTRtZ(TS$kws>0@SN^g@XVeb(Z5FL}GtP#{ZfTlO)!~cN#r+)|AOF90BJ2+e9Jt-X~ zVeje=i?cBJV-I%rA)8%xKw`HU4}QpdV$uik6F?>`=$rkz{thYtEiKH%o~gWosh=R+ z8=!RIK7B=?L}~&Cm8zE3eMBLDa5)%ALVQ5I~wtGDnq@pPg!<>V@A|lxE!S7 z$*}dTCjxDAb-jb8euV>y-J;09WL@*ksOnW3+7|Gk0M&{>V+iE!Vz3z(JTBu024)cy zmB_rtiQ)}e)j04bIu4B+B#sTmGe(Gnp?6~}{I^{i^KXcdwLq(izNZ7ogKD%RRBkG$7o!C={C_pY=^EGlx? z_rb!YPe5Dgcu79tn5%Fdn1mk?8iD$B$y-tdpfc^@tcsqE?K$mxBbMBpY4i15uId8^ z%nlW3${KMxq-!6Mp`|J)$*X=yh-*kL*GvDTL@unGJ#VCC#*mzUBt1U{)KYCCN6kiv z5dLeI8aeeB1nGmZZgSVE0?uQ;86j;^9@3ddj3}#F>9zj?443LR)%5Q|u`($XN362S zLs685oV@kBgIV%vF)mq|chPe?|sM&v#TUHkC zCVcgYixYoYYT{Th5PnIvsGz9OK|J24M1Ag*rP#xn4MsyYlpcj--Q9cnoT3<#8v-qA zYk9c@aT7EW)|Ng*5)nHrNjdFJUkJ*ETYz@rn4N{|nlE@n=QG~=hM@)urL z_J7@`hdY5-LCwY704nv;>>7x6Zu#km_y;6(MR&awMM*Ab+8g>U{F_BXMIC4p3ejre zDe(R7eH~r#v3il_5--b8P74S(av)7ag4x(;Inv$}o6TO_hyl5~hgtF#vkZmFS?>a9 z)jLWTkf{@mXc!H6fTIhSe$bqlWrNxW=#Y&Ax|>Q$OQ?WWW1wft3C#)g*;*fqkDogO z7}U4?Z{d+q){K6d!Bj*KDOlZXwvjsF&|1tdeO@;9HwI!wRslOs&cQUa)+p~A3KPI9 zkO{Rn0h1E{{9|3+8xs(ukVeB8)MtY^0 z{Nd|&7rP&}@D>XA?-6W8^R-dps3CX6vX%>4M(`TTYs=DaWv%N51DKPR2OHOh5a5X= zCIP6$$mTsF{E;TIJ2!HWYbxnvX7mMc8QOJc`2l6IQ#S;l?e9E0`$(3DP8L*k0TDRq zir=XbL2=~6`T@=mAkYeTDzam0pf}YXMN9~=pzL9!?7^XgIL;am@A`E~g3W+hmk^Ay z030C&i{u=#mmb_k?%xhs-FZ7+?`W#f0;GhzQkjrh`OVdEu~1$-C-uO#*Gr0szQ1yx z3OTgQNClMNV0r8KHHu-Mzehfh!+fV~=1xP8!|z=|z7qd_5nKQz4HVD<6=nS86ImEx zA0?a?$628JQadUQG_F9m&B}-n+lYQ2In4m2iSc0Ox0U7O>8xA)zxmk1x0bhGHyajT z%rYm&$UNYi=be*U$OoAS`?-0SuO8O+APZeo8@y#mlV36V_Z>FfZ)JjIz-te z)4s2DuBS1oLtBAWf~T*K4-*HB@}N0QXW{CvIFWDDtw{hMNGW4IWRi(N5JD_Mk)OA5 zY6H6sG_+Go?vSjGWADR2$+XrO(xC|<>QLPQE*dmeOI5*eR908<`gaS}LEd=aLrY^6 zld~9$Q@aKYr`D}wH_sU51R(@T@k#38e|uVL+YyFzXcpebN-{a2T|5Jl`*_ftrnB{6 zCSU(%*ARCKUR1np;y#2BU!XBl8`OP};bv+H?Gn_@W~xzg0u6~_9hxN*+@^|u`p64C zWKHvVf92;KJY|>6{*sh(q}KT+XBXbG{Opln*M;p%cXmE+ErxYy7T&aeGPHX?5@XNt zlr7Doy0(TF7B8TxrpkIa09Y)g^p0P`#H~16ej354MTJFaY0kas30s+P{w2;s8EFz&$6 z4$TsHv?(E)(0`;?q;S-;YWpvIzj=*%cr4~7fr$l2PHk}a!E`&vGaCh=L7`fuPKGb% zGqgjq@CnecX7~5??1J!nqzd3X6I>^^o-J$x041h$Duy;Hjm^+rLrK^}2xy*l+$ zr)nGlzR=x}W@31UX30XgiKSgOd?Mk&p$=YQJgRGJc=FRX)CKGSk4h=MT4u<^bqFCo zLu00K9Mo-)ZZWl9oqFNx<7+*13WHV#sPPJiCWOcXUb7y%Z1@F4g+_SD zqLz`Bdz_~iy+e(yDya|fZz<(W51D0RFgzJk3l0d@a-1(&8dVz}uW)D4!3T?u&P+t+VMK=L`JLoT-`AV{vNNqx14JrAvx>c6J73h2#}@jYG2t z$-QDdcImM3vWyE9N5<9EMs~nnz*MY!>)Dlk zfcyUSG)GU{sk1}?Uq~sRl~Ve9z%&yB;V`DwqxmtlzDa%6O`fZO2U}~Sr|?>bCWP3E zDtmdx=qYsVU{_G#j>)NpX28kA3_q@2~tqt6$?VlqKlxrdo&Vkx~jN zWp7X0(G*$}Q}Yo%4DC5oy_t3#c-qx=>WNo>^DX@@ZF07Ho|DWKBPMysBG)02EJ|C- zlb^mpQF)2_a2QJV_IfF$cj%IP0aD5#zEInk>xAB1yxO4w2qFH9A_UpM4dbsMKB~QkEOITs?oH=U?>xrVgPB@~N2AQv{w}2q z*4eZ+gOoB}O8Gvp5#?{{i=tOI-LsZ84U6*aji{ENLwXF+oT){HM$tRbZW8*15aJuR z8L1O(V#y+$>ok}rQ*!R>GVjr2piv`*=Sk_fp*N;z6z z>%0#s zlo1*jtgdOS2Cf!DEOx(@tw(F7CXpOCet>T0bW?8xd@h8TrMHdlqRluoXjpn~!|INE zB0q;a-hG1dstV5;<|ZP7!?^amOSx?LL`OTj5+%O)k`ThKQRvx%l+p*d62*}X(mJQ6 zu9ojMt>U9K-!Lw97wHp1O|bkAX-T4u!P%nyN*(L!ty zV0UJ=l#;_2PVn*mZC(DQcGsktJbU*Nql8)ukSv5a>Ex0e!mxn`U~XrESM`IYJHfRj>s1CxR2=GSd#llJYZsI6k> z@o)Jm{lIni$hykTnc89@#HZc66LcHzlS{%jDfd(L@Tn${;r+@2rdw6&I zhc-T8Tz)>j%uGyS-o)vQj_y*I-wL!dxD#k&w=#gUj=E%#QicGD=GS=h`$V8q%`T;s z9L+w(_VoQ6K6l)5m91{OKV=S2&wa$LL(S+sA<%q*{b-ZA+pXHMfh}n}ol}$x7#teG zjD%#SCrs(gy*6tk+KTo$=2sz5g0@Of8BhmY13I>F_6GW+-3IVS3#b@ikokQu5N-Z* zm$b@OGIGyz@Ju?XXOB`^U2)?Nb%P2u*Jk)Y1CUb20{;UdI&9-Fn^to0Y`XIba}hCN zQ6$GtVDiXB5@X}>@pg}vYYk0}WaOSB^~_NYojXQ#{r4vEJA?`~*X0p`1|X%J3hV{i zht@YXH}U-YuN(f!XIJ#=>%;h=qe+MzMM7*mqoaqpOef&F#s*I3T_7X(92vRixloYf zw0og;LhWH8#Ai+^O7WaP12A__*hGgptQB?D{PthVDJbv$4Pzto_VQ*#)DYq#V;LS9 z!|=!$hDJma{F}D6Oubq`I8?M)z1fZQ;~8EWJ~Onyc`* zKm(9czKb>;rd>gKG0WDzN_nkY_qS7=z(%Mwq1{tcp{654v=8crUjo++h#VXm!SW@` z9DXUK7|*9^yI8ezgJrvPA7G=D@_r|k<&iux(1Z{sv|j9Ab=*EIBAQp8_>K88Nl`kl zEz~Tuh1z{iD9IyvJRDv#;jy;s{>W=4o}bh-f{#@X!q3I zzQwhx^XNbWkWvPqovGd0ar@=cLS9(+24yvl8K9{cmyJ+U4+?bP@qq^IeY19>O|NNJ zR9VUk>)z)hwb$x+dE-h>UOMZX!W6e<=S=M(A;eZElw@cs&@4zP z`vDt(>wb%xT1>pPbuD{O9&%1$irZ56)byhQ%?c@{58A3Zi!HYE;l8b`-=}VYC|#q@ z)bybO%?9&IL9YSNS?=3)B9*tlSVxnoS^vTmx3y^6T$bLs*mAQ9wO*tG?FOWj&j4>@ zvB*UB)ja;P@g1&KmO7^}#Vx5bHOEqc)(KL|IlzCgX!%^-P|NF^-{WYu;TBI)9LP?n zskxs$qynvz%&Q804qUfJT&ry5qkY@>aQ{}zxqOOZ)1s+&vUKhvmYbV^2Za#ZoKTV> zs6guiDP=g?6VTa~`_eC-=FQL6P*zi^e_@JSQlZxS)WF&<5JHp!bAc6TJ@wm7j7wnU z(|;l*eu7hKQ{0O{&}eGH)MB#S)i(Hcq!Y?=d+H3Wo6OyB*P<=@ah=^K4)V@_Kj2z( zqyB{{E^k0U5WiaRBva#)tnDrUo)SWM?g~CVpaQK2q?BWTkANRo?#nAF;H|A|Ih&uY ze_@Ktx^3(fp1o&@t-gC(fTcnR)jGMGRG{^cl(H}I67YL0F5#t=Y){|M>YW>DXmZFB zmWrDQ4GiYz^B?E7v6HRsZUBBKg!sG8Wf_hNv|b{moDIB>wyxxL%4#ZE`Q>`GWS$2S z2xg6+#xwICrN5umb&}J7B|?ZSol7$$6==OkN*M=3K>_f5cGfmh5Ol$Bnf0?h%Wl#76Ou(ASpV{;Rqq;6+Z>UNq;P5Kw7I9!ll zAdk(smj%hQ=_9NTB**}MCWJVwb7_XB0?k3Blp$!#<^2RJ|IS5~rTlZ(CJtmC(Y-ds zF}%IJSukZ5kIh(MYh8+Kz$?HCA%vO;>;Njz985|%6Ica|vbH}X_dNgJvzgPEFX&pA z(tCsu%o;b1AKrdHks;x>4*ME-MhJ0U$I?8G3N#&ROx9c>+Ol{CFOnelKI9<7^#Pk9Nypg%F}%zv?`j3N$B>QceQ?hQ&%#9rp9xg_CSP zv_rN1b|GGU`Yu=&Cr408=cdp1y~RKK?sqjUv&zoKyxZ7= z)^WvEWo-R!54%qsq_VDBxB5KUknlm=mpq$0l5WAbZ$Ep7?g9QNgh;h_km7hM&|HMM z<@aK=X;cZejx)8GIFfyeJtq#4dgdstQk}K+CLiyB z-r>z?-HTrrLY&a2LZ!1*pt&$9CbR%c z1NH&m2q7w*Tauy|qkWl`E-){gd^6fy(s5|_--hEp--~A8EN~KSctskJE`(4k(s(F$ z`Qj=%ky7?Yn^QUtxCt1B7IMRYU?-JT4rBq@=J)f!DIil_J}MolKvOzRN*Rh4Y_UKX z5N>{jb$I!rt^VD1$36(~>hNP~&=v>*r~s2 literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template index e4464a4445..c74cfaa9de 100644 --- a/srcpkgs/void-artwork/template +++ b/srcpkgs/void-artwork/template @@ -1,6 +1,6 @@ # Template file for 'void-artwork' pkgname=void-artwork -version=20141219 +version=20170517 revision=1 noarch=yes short_desc="Void Linux artwork" @@ -12,4 +12,5 @@ do_install() { vinstall ${FILESDIR}/splash.png 644 usr/share/void-artwork vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork + vinstall ${FILESDIR}/void-transparent.png 644 usr/share/void-artwork } From c581c22dd020f9ca71cd756d47abf12000615fbe Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 18 May 2017 08:24:18 +0200 Subject: [PATCH 0574/1145] plymouth: use logo with transparent background --- srcpkgs/plymouth/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 4ffb006668..a9a5b7599f 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -1,12 +1,12 @@ # Template file for 'plymouth' pkgname=plymouth version=0.9.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-system-root-install=no \ --without-rhgb-compat-link --enable-systemd-integration=no \ --enable-gtk --enable-gdm-transition --enable-pango \ - --with-logo /usr/share/void-artwork/void-logo.png --localstatedir=/ \ + --with-logo=/usr/share/void-artwork/void-transparent.png --localstatedir=/ \ --disable-documentation" conf_files="/etc/plymouth/plymouthd.conf" hostmakedepends="pkg-config" @@ -40,6 +40,7 @@ plymouth-devel_package() { plymouth-data_package() { short_desc+=" - data files" noarch=yes + depends="void-artwork" pkg_install() { vmove usr/share/plymouth/themes } From f4912944a8425b687b23d37dc179c03ea1d88e39 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 18 May 2017 08:29:08 +0200 Subject: [PATCH 0575/1145] redis: update to 3.2.9. --- srcpkgs/redis/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 63d8509a20..5a3a8e9b31 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -1,6 +1,6 @@ # Template file for 'redis' pkgname=redis -version=3.2.8 +version=3.2.9 revision=1 makedepends="jemalloc-devel" homepage="http://redis.io" @@ -8,7 +8,7 @@ distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" short_desc="Advanced key-value store" maintainer="Enno Boland " license="BSD" -checksum=61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c +checksum=6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26 system_accounts="redis" redis_homedir="/var/lib/redis" From c21a795133e075b8dbaf1af99549cd2b08acac6c Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 18 May 2017 08:36:04 +0200 Subject: [PATCH 0576/1145] winetricks: update to 20170517. --- srcpkgs/winetricks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/winetricks/template b/srcpkgs/winetricks/template index 7d272791b8..668c587c1b 100644 --- a/srcpkgs/winetricks/template +++ b/srcpkgs/winetricks/template @@ -1,6 +1,6 @@ # Template file for 'winetricks' pkgname=winetricks -version=20170327 +version=20170517 revision=1 noarch=yes build_style=gnu-makefile @@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://wiki.winehq.org/$pkgname" distfiles="https://github.com/Winetricks/$pkgname/archive/$version.tar.gz" -checksum=ad381386be95f5f2c34a69a6d1d77f3d41d86f883b8bed7ac4699947cf13e97d +checksum=6699e0169c06d11c5467ae6440d8634575602af2f77430e31a781b2dc1790805 From 899480914029324b2d59c1d655bebfe008d1188e Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 18 May 2017 08:36:19 +0200 Subject: [PATCH 0577/1145] embree: update to 2.16.0. --- srcpkgs/embree/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template index c986bba09b..0ad27b78ec 100644 --- a/srcpkgs/embree/template +++ b/srcpkgs/embree/template @@ -1,6 +1,6 @@ # Template file for 'embree' pkgname=embree -version=2.15.1 +version=2.16.0 revision=1 only_for_archs="x86_64" build_style=cmake @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://embree.github.io/" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=bb05001c5449a73dbf0873aea6a0f862080a0625842e9bd5e00b8e4e52e3c8c0 +checksum=ece381d4cd94dedab6ddf3b0edca0666c8564ba5180516eef745a9b57bb97555 nopie=y From ecd25129968e888c600bd7037598cabbe494146d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 18 May 2017 09:16:47 +0200 Subject: [PATCH 0578/1145] aria2: update to 1.32.0. --- srcpkgs/aria2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 24371e4b46..53805bbfea 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,7 +1,7 @@ # Template file for 'aria2' pkgname=aria2 -version=1.31.0 -revision=2 +version=1.32.0 +revision=1 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt @@ -14,4 +14,4 @@ maintainer="Juan RP " license="GPL-2" homepage="https://aria2.github.io/" distfiles="https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${pkgname}-${version}.tar.xz" -checksum=7b85619048b23406f241e38a5b1b8b0bc2cae9e80fd117810c2a71ecca813f8c +checksum=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50 From 4833eb5d086511b91eb1ab4aeb0ee593deb05eb3 Mon Sep 17 00:00:00 2001 From: allan Date: Thu, 18 May 2017 11:27:14 +0000 Subject: [PATCH 0579/1145] nim: update to 0.17.0. --- srcpkgs/nim/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index b35279de8a..21dd7454b9 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -1,9 +1,9 @@ # Template file for 'nim' pkgname=nim -version=0.16.0 -revision=3 -_cversion=0.16.0 -_nimbleversion=0.8.4 +version=0.17.0 +revision=1 +_cversion=0.17.0 +_nimbleversion=0.8.6 depends="gcc" hostmakedepends="ed" short_desc="The Nim programming language" @@ -13,9 +13,9 @@ homepage="http://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" -checksum="63b35b35d5976fec9d88e3307adb78d2e3988538e5855d13b7f6e6f89c593f7c - e909cea51c2d1f6b04af955db219877ab9f9666741ccc750334597eded80844e - ba47cee4f74c56d14d6142e9324b3a8fd5a0e6cd8cbcf81e04ae58543b848e5e" +checksum="9f954f03a40e8fba32e02fcb91499e518f8e220809aef9e22bb7443c96bbbdcd + 6b8de28dc317534e45366b62dcad14b9932c0de398c44e1506f5bbd80019c671 + af251c1011fe1d6e72a9d18a7672a8b90013dd6659085082e525d31204ca6ddf" build_wrksrc=Nim-$version create_wrksrc=yes nopie=yes @@ -28,7 +28,7 @@ post_extract() { do_build() { cd csources - CFLAGS= sh build.sh + CFLAGS= LDFLAGS= sh build.sh cd .. ed lib/wrappers/openssl.nim <<-EDIT @@ -61,7 +61,7 @@ do_build() { for _p in \ dist/nimble/src/nimble \ tools/nimgrep \ - tools/nimsuggest/nimsuggest + nimsuggest/nimsuggest do bin/nim c -d:release --os:linux --cpu:$_arch --listCmd $_p mv $_p bin From 466daebab3086dd0c0dc763359b072440c0d3bca Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Thu, 18 May 2017 13:30:35 +0200 Subject: [PATCH 0580/1145] postgresql: update to 9.5.7. Signed-off-by: Gerardo Di Iorio --- srcpkgs/postgresql/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 9a9b8b9ade..f4f69a9e1b 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,7 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql -version=9.5.6 -revision=2 +version=9.5.7 +revision=1 build_style=gnu-configure make_build_target="world" configure_args="--with-openssl --with-python @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.postgresql.org" license="BSD" distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2" -checksum=bb9e5f6d34e20783e96e10c1d6c0c09c31749e802aaa46b793ce2522725ae12f +checksum=8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad hostmakedepends="flex docbook docbook2x openjade" makedepends="libfl-devel readline-devel libressl-devel perl From 91e23c4e660e5af7eadbc3ba4ee21bcf3d642788 Mon Sep 17 00:00:00 2001 From: Rui Abreu Ferreira Date: Thu, 18 May 2017 11:15:48 +0100 Subject: [PATCH 0581/1145] new package: rdup 1.1.15 --- srcpkgs/rdup/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/rdup/template diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template new file mode 100644 index 0000000000..87f7f34b1c --- /dev/null +++ b/srcpkgs/rdup/template @@ -0,0 +1,17 @@ +# Template file for 'rdup' +pkgname=rdup +version=1.1.15 +revision=1 +build_style=gnu-configure +hostmakedepends="automake pkg-config" +makedepends="glib-devel libarchive-devel nettle-devel" +short_desc="The only backup program that doesn't make backups" +maintainer="Rui Abreu Ferreira " +license="GPL-3" +homepage="https://github.com/miekg/rdup" +distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz" +checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb + +pre_configure() { + autoreconf -fi +} From ccc8651c04c3159e5d5116ecd08f7698fc1901b9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 18 May 2017 13:02:49 +0200 Subject: [PATCH 0582/1145] mcelog: update to 150. --- srcpkgs/mcelog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 4fa97d8c59..aa20d23359 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=149 +version=150 revision=1 conf_files="/etc/mcelog/mcelog.conf" only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -10,7 +10,7 @@ license="GPL-2" homepage="http://www.mcelog.org/" _changelog="https://github.com/andikleen/mcelog/releases" distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz" -checksum=a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f +checksum=12917e445786adb5405615c5800d60e32eec14108a1859491cdd356ddb984eb5 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} From e8fcecab23e26f1536320288908655cfdad22ae2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 18 May 2017 16:20:01 +0200 Subject: [PATCH 0583/1145] New package: perl-IO-Socket-INET6-2.72 --- srcpkgs/perl-IO-Socket-INET6/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-IO-Socket-INET6/template diff --git a/srcpkgs/perl-IO-Socket-INET6/template b/srcpkgs/perl-IO-Socket-INET6/template new file mode 100644 index 0000000000..d9ad395ecb --- /dev/null +++ b/srcpkgs/perl-IO-Socket-INET6/template @@ -0,0 +1,16 @@ +# Template build file for 'perl-IO-Socket-INET6'. +pkgname=perl-IO-Socket-INET6 +version=2.72 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +noarch=yes +short_desc="IO::Socket::INET6 - Object interface for AF_INET/AF_INET6 domain sockets" +maintainer="Leah Neukirchen " +homepage="http://search.cpan.org/dist/IO-Socket-INET6" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz" +checksum=85e020fa179284125fc1d08e60a9022af3ec1271077fe14b133c1785cdbf1ebb From 2600e281ad545b55f8dedd9d69a5f8ad7b656a21 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 18 May 2017 16:20:45 +0200 Subject: [PATCH 0584/1145] sawks: enable ipv6. --- srcpkgs/swaks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swaks/template b/srcpkgs/swaks/template index 5fd0724735..522e825e0f 100644 --- a/srcpkgs/swaks/template +++ b/srcpkgs/swaks/template @@ -1,7 +1,7 @@ # Template file for 'swaks' pkgname="swaks" version=20170101.0 -revision=1 +revision=2 noarch=yes short_desc="Swiss Army Knife for SMTP" maintainer="allan " @@ -10,7 +10,7 @@ homepage="http://www.jetmore.org/john/code/swaks/" distfiles="http://www.jetmore.org/john/code/${pkgname}/files/${pkgname}-${version}.tar.gz" checksum=84e62dd0de4a56d5daebe25afd16835bd8d3c7f39caa5e6bc7d86a056925915e hostmakedepends="perl" -depends="perl" +depends="perl perl-IO-Socket-INET6" do_install() { vbin swaks From 06565494e60163c02b2ba2f6af203516a8f9059b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 18 May 2017 16:42:12 +0200 Subject: [PATCH 0585/1145] New package: perl-Socket6-0.28 --- srcpkgs/perl-Socket6/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/perl-Socket6/template diff --git a/srcpkgs/perl-Socket6/template b/srcpkgs/perl-Socket6/template new file mode 100644 index 0000000000..ff9f7aebb8 --- /dev/null +++ b/srcpkgs/perl-Socket6/template @@ -0,0 +1,20 @@ +# Template build file for 'perl-Socket6'. +pkgname=perl-Socket6 +version=0.28 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +short_desc="Socket6 - IPv6 related part of the C socket.h defines and structure manipulators" +maintainer="Leah Neukirchen " +homepage="http://search.cpan.org/dist/Socket6" +license="Artistic, GPL-1" +distfiles="${CPAN_SITE}/${pkgname/perl-/}/${pkgname/perl-/}-${version}.tar.gz" +checksum=bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586 +nocross=yes # XXX fixme later + +post_extract() { + sed -i '/CFLAGS/d' Makefile.PL +} From 5119faaf45328ceaaf0798c8766ff5d67b6ef6b5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 18 May 2017 16:42:48 +0200 Subject: [PATCH 0586/1145] perl-IO-Socket-INET6: depend on perl-Socket6. --- srcpkgs/perl-IO-Socket-INET6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-IO-Socket-INET6/template b/srcpkgs/perl-IO-Socket-INET6/template index d9ad395ecb..8d3fbd44ab 100644 --- a/srcpkgs/perl-IO-Socket-INET6/template +++ b/srcpkgs/perl-IO-Socket-INET6/template @@ -1,12 +1,12 @@ # Template build file for 'perl-IO-Socket-INET6'. pkgname=perl-IO-Socket-INET6 version=2.72 -revision=1 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="${hostmakedepends}" -depends="${makedepends}" +depends="${makedepends} perl-Socket6" noarch=yes short_desc="IO::Socket::INET6 - Object interface for AF_INET/AF_INET6 domain sockets" maintainer="Leah Neukirchen " From 5530056cb60f33245db02ebc8bfbc93c0997813a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 18 May 2017 16:28:07 +0200 Subject: [PATCH 0587/1145] minidlna: update to 1.2.0. --- srcpkgs/minidlna/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template index 0197eeee6a..194fb4eec9 100644 --- a/srcpkgs/minidlna/template +++ b/srcpkgs/minidlna/template @@ -1,7 +1,7 @@ # Template file for 'minidlna' pkgname=minidlna -version=1.1.5 -revision=3 +version=1.2.0 +revision=1 build_style=gnu-configure configure_args=" --sbindir=/usr/bin @@ -21,7 +21,7 @@ maintainer="Duncaen " license="BSD, GPL-2" homepage="http://minidlna.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=8477ad0416bb2af5cd8da6dde6c07ffe1a413492b7fe40a362bc8587be15ab9b +checksum=8d34436580c4c44be25976d5e46bc5b71af69bf441c4492774eac001164c4433 post_install() { vlicense LICENCE.miniupnpd # This one is BSD. COPYING is GPL-2 From a1ee29653da9215e32a9def02a598b08845e209c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Thu, 18 May 2017 16:40:39 +0200 Subject: [PATCH 0588/1145] libostree: update to 2017.6. --- srcpkgs/libostree/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template index 587b94706a..9b17d41809 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/libostree/template @@ -1,6 +1,6 @@ # Template file for 'libostree' pkgname=libostree -version=2017.5 +version=2017.6 revision=1 build_style=gnu-configure configure_args="--with-builtin-grub2-mkconfig --with-openssl" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="GPL-2" homepage="https://ostree.readthedocs.io/en/latest/" distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz" -checksum=3fc89a5b6eff74bc55469175b6f6e42f1bf1d9814d285e86565635e8438d20e8 +checksum=25ac0ca3e9cc3af115df096fc183d3efa3cf36e765586e7e3f825dc32c89545b libostree-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 67bd7fb5b4f14b0f6ae59a72b39d4762b1ff115c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 18 May 2017 16:41:43 +0200 Subject: [PATCH 0589/1145] thunderbird: add mozilla api key --- srcpkgs/thunderbird/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 8a088d1674..a04725832a 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,7 +1,7 @@ # Template build file for 'thunderbird'. pkgname=thunderbird version=52.1.1 -revision=1 +revision=2 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" @@ -46,7 +46,11 @@ post_extract() { # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. - echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" >google-api-key + echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key + + # Mozilla API keys (see https://location.services.mozilla.com/api) + # Note: This is for Void Linux use ONLY. + echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key } do_build() { cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" @@ -88,6 +92,7 @@ do_build() { cat <>.mozconfig ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key" +ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key" ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2') ac_add_options $(vopt_enable alsa) ac_add_options $(vopt_enable dbus) From d8e3bb5164e4ce99577444da69f1a84d6c925560 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 18 May 2017 16:41:55 +0200 Subject: [PATCH 0590/1145] firefox: add mozilla api key --- srcpkgs/firefox/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 5f25af98a4..170febdcbb 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,7 +1,7 @@ # Template build file for 'firefox'. pkgname=firefox version=53.0.2 -revision=1 +revision=2 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" @@ -47,7 +47,11 @@ post_extract() { # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. - echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" >google-api-key + echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key + + # Mozilla API keys (see https://location.services.mozilla.com/api) + # Note: This is for Void Linux use ONLY. + echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key } do_build() { cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" @@ -89,6 +93,7 @@ do_build() { cat <>.mozconfig ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key" +ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key" ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2') ac_add_options $(vopt_enable alsa) ac_add_options $(vopt_enable dbus) From a51b307b103b460dfcb9668bfa088e555cbf2b5d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 18 May 2017 16:46:06 +0200 Subject: [PATCH 0591/1145] firefox-esr: add mozilla api key --- srcpkgs/firefox-esr/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 8dc5ae3ac7..92f655dbab 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -1,7 +1,7 @@ # Template build file for 'firefox-esr'. pkgname=firefox-esr version=45.9.0 -revision=2 +revision=3 wrksrc="firefox-${version}esr" short_desc="Lightweight gecko-based web browser" maintainer="Eivind Uggedal " @@ -50,8 +50,12 @@ pre_configure() { # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. - _google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" - echo -n "$_google_api_key" > google-api-key + echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key + + # Mozilla API keys (see https://location.services.mozilla.com/api) + # Note: This is for Void Linux use ONLY. + echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key + [ ! -d xbps-build ] && mkdir -p xbps-build } do_configure() { @@ -116,6 +120,7 @@ do_configure() { --with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ --with-nss-prefix=${XBPS_CROSS_BASE}/usr \ --with-google-api-keyfile="${wrksrc}/google-api-key" \ + --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key" \ --enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \ --disable-static --enable-pie --disable-profiling \ --disable-profilelocking ${_args} From 2fe30d97f0428c314c4d389f9196b7be1936d888 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 16:28:35 +0000 Subject: [PATCH 0592/1145] greg: fix deps Fixes #6425 --- srcpkgs/greg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/greg/template b/srcpkgs/greg/template index 261318bc12..75c7b01dd3 100644 --- a/srcpkgs/greg/template +++ b/srcpkgs/greg/template @@ -1,10 +1,10 @@ # Template file for 'greg' pkgname=greg version=0.4.7 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-feedparser" +depends="python3-feedparser python3-setuptools" noarch="yes" pycompile_module="$pkgname" short_desc="A command-line podcast aggregator" From 8e43ca9cdc7b5927b2669a93a3823470bb8af78a Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 14 May 2017 20:56:00 -0400 Subject: [PATCH 0593/1145] st: fix template --- srcpkgs/st/files/config.h | 442 ++++++++++++++++++++++++++++++++++++++ srcpkgs/st/template | 5 +- 2 files changed, 444 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/st/files/config.h diff --git a/srcpkgs/st/files/config.h b/srcpkgs/st/files/config.h new file mode 100644 index 0000000000..55c958a8ca --- /dev/null +++ b/srcpkgs/st/files/config.h @@ -0,0 +1,442 @@ +/* See LICENSE file for copyright and license details. */ + +/* + * appearance + * + * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html + */ +static char font[] = "Monospace:pixelsize=12:antialias=true:autohint=true"; +static int borderpx = 2; + +/* + * What program is execed by st depends of these precedence rules: + * 1: program passed with -e + * 2: utmp option + * 3: SHELL environment variable + * 4: value of shell in /etc/passwd + * 5: value of shell in config.h + */ +static char shell[] = "/bin/sh"; +static char *utmp = NULL; +static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400"; + +/* identification sequence returned in DA and DECID */ +static char vtiden[] = "\033[?6c"; + +/* Kerning / character bounding-box multipliers */ +static float cwscale = 1.0; +static float chscale = 1.0; + +/* + * word delimiter string + * + * More advanced example: " `'\"()[]{}" + */ +static char worddelimiters[] = " "; + +/* selection timeouts (in milliseconds) */ +static unsigned int doubleclicktimeout = 300; +static unsigned int tripleclicktimeout = 600; + +/* alt screens */ +static int allowaltscreen = 1; + +/* frames per second st should at maximum draw to the screen */ +static unsigned int xfps = 120; +static unsigned int actionfps = 30; + +/* + * blinking timeout (set to 0 to disable blinking) for the terminal blinking + * attribute. + */ +static unsigned int blinktimeout = 800; + +/* + * thickness of underline and bar cursors + */ +static unsigned int cursorthickness = 2; + +/* + * bell volume. It must be a value between -100 and 100. Use 0 for disabling + * it + */ +static int bellvolume = 0; + +/* default TERM value */ +static char termname[] = "st-256color"; + +/* + * spaces per tab + * + * When you are changing this value, don't forget to adapt the »it« value in + * the st.info and appropriately install the st.info in the environment where + * you use this st version. + * + * it#$tabspaces, + * + * Secondly make sure your kernel is not expanding tabs. When running `stty + * -a` »tab0« should appear. You can tell the terminal to not expand tabs by + * running following command: + * + * stty tabs + */ +static unsigned int tabspaces = 8; + +/* Terminal colors (16 first used in escape sequence) */ +static const char *colorname[] = { + /* 8 normal colors */ + "black", + "red3", + "green3", + "yellow3", + "blue2", + "magenta3", + "cyan3", + "gray90", + + /* 8 bright colors */ + "gray50", + "red", + "green", + "yellow", + "#5c5cff", + "magenta", + "cyan", + "white", + + [255] = 0, + + /* more colors can be added after 255 to use with DefaultXX */ + "#cccccc", + "#555555", +}; + +/* + * Default colors (colorname index) + * foreground, background, cursor, reverse cursor + */ +static unsigned int defaultfg = 7; +static unsigned int defaultbg = 0; +static unsigned int defaultcs = 256; +static unsigned int defaultrcs = 257; + +/* + * Default shape of cursor + * 2: Block ("█") + * 4: Underline ("_") + * 6: Bar ("|") + * 7: Snowman ("☃") + */ +static unsigned int cursorshape = 2; + +/* + * Default colour and shape of the mouse cursor + */ +static unsigned int mouseshape = XC_xterm; +static unsigned int mousefg = 7; +static unsigned int mousebg = 0; + +/* + * Colors used, when the specific fg == defaultfg. So in reverse mode this + * will reverse too. Another logic would only make the simple feature too + * complex. + */ +static unsigned int defaultitalic = 11; +static unsigned int defaultunderline = 7; + +/* + * Internal mouse shortcuts. + * Beware that overloading Button1 will disable the selection. + */ +static MouseShortcut mshortcuts[] = { + /* button mask string */ + { Button4, XK_ANY_MOD, "\031" }, + { Button5, XK_ANY_MOD, "\005" }, +}; + +/* Internal keyboard shortcuts. */ +#define MODKEY Mod1Mask + +static Shortcut shortcuts[] = { + /* mask keysym function argument */ + { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, + { ControlMask, XK_Print, toggleprinter, {.i = 0} }, + { ShiftMask, XK_Print, printscreen, {.i = 0} }, + { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, + { MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} }, + { MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} }, + { MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} }, + { ShiftMask, XK_Insert, selpaste, {.i = 0} }, + { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} }, + { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} }, + { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} }, + { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, +}; + +/* + * Special keys (change & recompile st.info accordingly) + * + * Mask value: + * * Use XK_ANY_MOD to match the key no matter modifiers state + * * Use XK_NO_MOD to match the key alone (no modifiers) + * appkey value: + * * 0: no value + * * > 0: keypad application mode enabled + * * = 2: term.numlock = 1 + * * < 0: keypad application mode disabled + * appcursor value: + * * 0: no value + * * > 0: cursor application mode enabled + * * < 0: cursor application mode disabled + * crlf value + * * 0: no value + * * > 0: crlf mode is enabled + * * < 0: crlf mode is disabled + * + * Be careful with the order of the definitions because st searches in + * this table sequentially, so any XK_ANY_MOD must be in the last + * position for a key. + */ + +/* + * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) + * to be mapped below, add them to this array. + */ +static KeySym mappedkeys[] = { -1 }; + +/* + * State bits to ignore when matching key or button events. By default, + * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. + */ +static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; + +/* + * Override mouse-select while mask is active (when MODE_MOUSE is set). + * Note that if you want to use ShiftMask with selmasks, set this to an other + * modifier, set to 0 to not use it. + */ +static uint forceselmod = ShiftMask; + +/* + * This is the huge key array which defines all compatibility to the Linux + * world. Please decide about changes wisely. + */ +static Key key[] = { + /* keysym mask string appkey appcursor crlf */ + { XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0}, + { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1, 0}, + { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, + { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0}, + { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0}, + { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0}, + { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0}, + { XK_KP_End, ControlMask, "\033[J", -1, 0, 0}, + { XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0}, + { XK_KP_End, ShiftMask, "\033[K", -1, 0, 0}, + { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0}, + { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0}, + { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0}, + { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0}, + { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0}, + { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0}, + { XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0}, + { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0}, + { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0}, + { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0}, + { XK_KP_Delete, ControlMask, "\033[M", -1, 0, 0}, + { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, + { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0}, + { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, + { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0}, + { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, + { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0}, + { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1}, + { XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1}, + { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0}, + { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0}, + { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0}, + { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0}, + { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0}, + { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0}, + { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0}, + { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0}, + { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0}, + { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0}, + { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0}, + { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0}, + { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0}, + { XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0}, + { XK_Up, ControlMask, "\033[1;5A", 0, 0, 0}, + { XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0}, + { XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0}, + { XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0}, + { XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0}, + { XK_Down, ControlMask, "\033[1;5B", 0, 0, 0}, + { XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0}, + { XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0}, + { XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0}, + { XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0}, + { XK_Left, ControlMask, "\033[1;5D", 0, 0, 0}, + { XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0}, + { XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0}, + { XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0}, + { XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0}, + { XK_Right, ControlMask, "\033[1;5C", 0, 0, 0}, + { XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0}, + { XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0}, + { XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0}, + { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0}, + { XK_Return, Mod1Mask, "\033\r", 0, 0, -1}, + { XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1}, + { XK_Return, XK_ANY_MOD, "\r", 0, 0, -1}, + { XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1}, + { XK_Insert, ShiftMask, "\033[4l", -1, 0, 0}, + { XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0}, + { XK_Insert, ControlMask, "\033[L", -1, 0, 0}, + { XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0}, + { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0}, + { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0}, + { XK_Delete, ControlMask, "\033[M", -1, 0, 0}, + { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, + { XK_Delete, ShiftMask, "\033[2K", -1, 0, 0}, + { XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0}, + { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, + { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, + { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0}, + { XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0}, + { XK_Home, ShiftMask, "\033[2J", 0, -1, 0}, + { XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0}, + { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, + { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, + { XK_End, ControlMask, "\033[J", -1, 0, 0}, + { XK_End, ControlMask, "\033[1;5F", +1, 0, 0}, + { XK_End, ShiftMask, "\033[K", -1, 0, 0}, + { XK_End, ShiftMask, "\033[1;2F", +1, 0, 0}, + { XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0}, + { XK_Prior, ControlMask, "\033[5;5~", 0, 0, 0}, + { XK_Prior, ShiftMask, "\033[5;2~", 0, 0, 0}, + { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0}, + { XK_Next, ControlMask, "\033[6;5~", 0, 0, 0}, + { XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0}, + { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0}, + { XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0}, + { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0}, + { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0}, + { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0}, + { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0}, + { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0}, + { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0}, + { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0}, + { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0}, + { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0}, + { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0}, + { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0}, + { XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0}, + { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0}, + { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0}, + { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0}, + { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0}, + { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0}, + { XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0}, + { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0}, + { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0}, + { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0}, + { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0}, + { XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0}, + { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0}, + { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0}, + { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0}, + { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0}, + { XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0}, + { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0}, + { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0}, + { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0}, + { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0}, + { XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0}, + { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0}, + { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0}, + { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0}, + { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0}, + { XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0}, + { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0}, + { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0}, + { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0}, + { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0}, + { XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0}, + { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0}, + { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0}, + { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0}, + { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0}, + { XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0}, + { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0}, + { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0}, + { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0}, + { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0}, + { XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0}, + { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0}, + { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0}, + { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0}, + { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0}, + { XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0}, + { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0}, + { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0}, + { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0}, + { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0}, + { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0}, + { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0}, + { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0}, + { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0}, + { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0}, + { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0}, + { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0}, + { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0}, + { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0}, + { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0}, + { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0}, + { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0}, + { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0}, + { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0}, + { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0}, + { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0}, + { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0}, + { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0}, + { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0}, + { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0}, + { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0}, + { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0}, + { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0, 0}, +}; + +/* + * Selection types' masks. + * Use the same masks as usual. + * Button1Mask is always unset, to make masks match between ButtonPress. + * ButtonRelease and MotionNotify. + * If no match is found, regular selection is used. + */ +static uint selmasks[] = { + [SEL_RECTANGULAR] = Mod1Mask, +}; + +/* + * Printable characters in ASCII, used to estimate the advance width + * of single wide characters. + */ +static char ascii_printable[] = + " !\"#$%&'()*+,-./0123456789:;<=>?" + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" + "`abcdefghijklmnopqrstuvwxyz{|}~"; diff --git a/srcpkgs/st/template b/srcpkgs/st/template index 31b6e1285c..0078276500 100644 --- a/srcpkgs/st/template +++ b/srcpkgs/st/template @@ -3,6 +3,7 @@ pkgname=st version=0.7 revision=1 build_style=gnu-makefile +make_use_env=compliant hostmakedepends="pkg-config" makedepends="fontconfig-devel libX11-devel libXft-devel" depends="ncurses" @@ -14,9 +15,7 @@ distfiles="http://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000 pre_build() { - sed -i 's|Liberation Mono|Monospace|g' config.def.h - sed -i 's|^CFLAGS +=|override CFLAGS +=|g' config.mk - sed -i 's|^LDFLAGS +=|override LDFLAGS +=|g' config.mk + cp ${FILESDIR}/config.h config.h # We will use tic after install. See INSTALL. sed -i 's|@tic -s st.info||g' Makefile } From 68078ad7575c566fbcb120f3c46b1573868d7dba Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 18:23:34 +0000 Subject: [PATCH 0594/1145] uncrustify: update to 0.65. --- srcpkgs/uncrustify/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/uncrustify/template b/srcpkgs/uncrustify/template index ab105c8104..59f959d766 100644 --- a/srcpkgs/uncrustify/template +++ b/srcpkgs/uncrustify/template @@ -1,15 +1,16 @@ # Template file for 'uncrustify' pkgname=uncrustify -version=0.64 +version=0.65 revision=1 build_style=cmake create_wrksrc=yes +hostmakedepends="python" short_desc="Source Code Beautifier for multiple languages" maintainer="Juan RP " license="GPL-2" homepage="http://uncrustify.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=0fca05fe8bac2cd80bf3ed77378c82ffe365f37a3f80b8e0ca2dbb3c6e25f3d7 +checksum=7f7afc2ecbaf9dab3c460da39bb97a77c199e62a1dd8bd26300ef5679a789d76 post_install() { for f in etc/*cfg; do From 284ba310e226ffecc0a01a9cd87839e812b64b47 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 18:29:06 +0000 Subject: [PATCH 0595/1145] btrfs-progs: update to 4.11. --- srcpkgs/btrfs-progs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index f5e49db2ed..88be1f3ed3 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -1,6 +1,6 @@ # Template file for 'btrfs-progs' pkgname=btrfs-progs -version=4.10.2 +version=4.11 revision=1 wrksrc=${pkgname}-v${version} build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://btrfs.wiki.kernel.org/" distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz" -checksum=ed09df670338562a52d9e7d76a362cc932737e2a67adca4c09395374be1de60a +checksum=e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e pre_configure() { NOCONFIGURE=1 ./autogen.sh From 3c313814acb995bd7f608cccdf506a7d6b8e4112 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 18:29:09 +0000 Subject: [PATCH 0596/1145] perl-JSON: update to 2.92. --- srcpkgs/perl-JSON/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-JSON/template b/srcpkgs/perl-JSON/template index f026576e36..6f4edead08 100644 --- a/srcpkgs/perl-JSON/template +++ b/srcpkgs/perl-JSON/template @@ -1,9 +1,9 @@ # Template file for 'perl-JSON' pkgname=perl-JSON -version=2.90 +version=2.92 revision=1 distfiles="${CPAN_SITE}/JSON/JSON-${version}.tar.gz" -checksum="4ddbb3cb985a79f69a34e7c26cde1c81120d03487e87366f9a119f90f7bdfe88" +checksum=26995aba35a97379d700f29d92b41010e6446279ad5442fffd6efba4687446e8 build_style="perl-module" hostmakedepends="perl" makedepends="${hostmakedepends}" From b72d6b7d1ee80635c8877c06c702ad8c4f02f45f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 18:29:14 +0000 Subject: [PATCH 0597/1145] youtube-dl: update to 2017.05.18. --- 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 35dc33f5f6..367b1add27 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.05.14 +version=2017.05.18 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=363e8f16752dfc35730351d3ead56ebd34ffa394864f7aa00ebf07d6ec5e8793 +checksum=433c4ac9199c01251bd7504eedbbeaccdca932725196706a65476ec916cd2ded alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From 45bd72238fedbedea3aeb1938934783605c16d08 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Thu, 18 May 2017 21:49:38 +0200 Subject: [PATCH 0598/1145] freeciv: update to 2.5.7. --- srcpkgs/freeciv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template index a73a824b1e..d835565061 100644 --- a/srcpkgs/freeciv/template +++ b/srcpkgs/freeciv/template @@ -1,6 +1,6 @@ # Template file for 'freeciv' pkgname=freeciv -version=2.5.6 +version=2.5.7 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all @@ -15,7 +15,7 @@ maintainer="bra1nwave " license="GPL-2" homepage="http://freeciv.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b +checksum=ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw" if [ -z "$CROSS_BUILD" ]; then From d8723db964c475b5f63e5feef555c585ef4b3d9c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 23:34:56 +0000 Subject: [PATCH 0599/1145] dropbear: update to 2017.75. --- srcpkgs/dropbear/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template index c867f818e8..7182f9233c 100644 --- a/srcpkgs/dropbear/template +++ b/srcpkgs/dropbear/template @@ -1,6 +1,6 @@ # Template file for 'dropbear' pkgname=dropbear -version=2016.74 +version=2017.75 revision=1 build_style="gnu-configure" configure_args="--enable-zlib" @@ -10,7 +10,7 @@ maintainer='Juan RP ' license="MIT" homepage="https://matt.ucc.asn.au/dropbear/dropbear.html" distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2" -checksum=2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891 +checksum=6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c post_install() { vmkdir etc/dropbear From 040a4d6fe0ca3f8dfcd09995d089961f79dd9cdb Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 23:35:16 +0000 Subject: [PATCH 0600/1145] exiftool: update to 10.53. --- srcpkgs/exiftool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 5dc0691473..353cffa59e 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.52 +version=10.53 revision=1 noarch=yes wrksrc="Image-ExifTool-${version}" @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" license="Artistic, GPL-1" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" -checksum=ffd50444efab6141b1bf7373b194dc023272a98fec79b4c6fec4f42e6d08ad22 +checksum=77693e992f4b88b707cca55690d5216ef96f6c0deefa0bc716abb073e2a0ba30 From 9879e7e679d6e63767d8e4bc156260ad84591198 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 23:41:14 +0000 Subject: [PATCH 0601/1145] inspircd: update to 2.0.24. --- srcpkgs/inspircd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index c462acf543..153b5047aa 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,7 +1,7 @@ # Template file for 'inspircd' pkgname=inspircd -version=2.0.23 -revision=4 +version=2.0.24 +revision=1 build_style=gnu-makefile hostmakedepends="perl pkg-config" makedepends="geoip-devel libressl-devel sqlite-devel" @@ -12,7 +12,7 @@ short_desc="Modular Internet Relay Chat server" maintainer="Alexander Gehrke " license="GPL-2" distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz" -checksum=522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 +checksum=41f702cb84caa2db089a02f511a3da3e7fa3cdce7d2c5040b3c54c5da83c8b40 do_configure() { ./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp,m_geoip.cpp From 8cba39cba1d88ecdce261db7a2cc5d3cd2ff620a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 19 May 2017 00:40:36 +0000 Subject: [PATCH 0602/1145] common/shlibs: cleanup - remove entries for no longer existing packages - remove entries for shlibs no longer provided by any package --- common/shlibs | 67 --------------------------------------------------- 1 file changed, 67 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2e649a1b74..41b2539afe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -63,7 +63,6 @@ libgo.so.9 libgo-6.2.1_1 libmpx.so.2 libmpx-6.2.1_1 libmpxwrappers.so.2 libmpx-6.2.1_1 libperl.so.5.24 perl-5.24.0_1 -libmp.so.3 gmp-5.0.1_1 libgmp.so.10 gmp-5.0.1_1 libgmpxx.so.4 gmpxx-6.0.0_2 libmpfr.so.4 mpfr-3.0.0_1 @@ -114,8 +113,6 @@ libX11.so.6 libX11-1.2_1 libexpat.so.1 expat-2.0.0_1 libjpeg.so.8 libjpeg-turbo-1.3.0_2 libturbojpeg.so.0 libjpeg-turbo-1.3.0_2 -libpng14.so.14 libpng-1.4.2_1 -libpng15.so.15 libpng-1.5.10_1 libpng16.so.16 libpng-1.6.2_1 libXrender.so.1 libXrender-0.9.4_1 libXrandr.so.2 libXrandr-1.3.0_1 @@ -196,10 +193,6 @@ libgstrtsp-0.10.so.0 gst-plugins-base-0.10.22_1 libgstvideo-0.10.so.0 gst-plugins-base-0.10.22_1 libgstpbutils-0.10.so.0 gst-plugins-base-0.10.22_1 libgstrtp-0.10.so.0 gst-plugins-base-0.10.22_1 -libbfd-2.21.so binutils-2.22_1<2.23_1 -libopcodes-2.21.so binutils-2.22_1<2.23_1 -libdb-4.8.so libdb-4.8.24_1 -libdb_cxx-4.8.so libdb-cxx-4.8.24_1 libgdbm.so.4 gdbm-1.10_1_1 libgdbm_compat.so.4 gdbm-1.10_1_1 libintl.so.8 gettext-libs-0.19.2_1 @@ -244,9 +237,6 @@ liblzo2.so.2 lzo-2.03_1 libgcrypt.so.20 libgcrypt-1.6.1_1 libgnutls.so.30 gnutls-3.4.13_1 libgnutlsxx.so.28 gnutls-3.2.13_1 -libgnutls-openssl.so.27 gnutls-3.1.5_1 -libgnutls-xssl.so.0 gnutls-3.2.13_1 -libwrap.so.0 tcp_wrappers-libs-7.6_1 libdevmapper.so.1.02 device-mapper-2.02.110_1 libdevmapper-event.so.1.02 device-mapper-2.02.110_1 libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1 @@ -427,7 +417,6 @@ libcdio++.so.0 libcdio-0.83_1 libcdio.so.16 libcdio-0.93_1 libmpcdec.so.5 libmpcdec-1.2.6_1 libproxy.so.1 libproxy-0.4.6_1 -libmodman.so.1 libproxy-0.4.6_1 libmoar.so MoarVM-2015.11_1 libFLAC.so.8 libflac-1.2.1_1 libFLAC++.so.6 libflac-1.2.1_1 @@ -483,14 +472,11 @@ libxenstore.so.3.0 xen-libs-4.2.2_2 libvhd.so.1.0 xen-libs-4.2.2_2 libxenstat.so.0 xen-libs-4.2.2_2 libblktapctl.so.1.0 xen-libs-4.2.2_2 -libblktap.so.3.0 xen-libs-4.2.2_2 libfsimage.so.1.0 xen-libs-4.2.2_2 libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1 libbabl-0.1.so.0 babl-0.1.10_1 libbamf3.so.2 bamf-0.5.1_1 libgegl-0.2.so.0 gegl-0.2.0_1 -libiculx.so.59 icu-libs-59.1_1 -libicule.so.59 icu-libs-59.1_1 libicuio.so.59 icu-libs-59.1_1 libicui18n.so.59 icu-libs-59.1_1 libicudata.so.59 icu-libs-59.1_1 @@ -555,7 +541,6 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6 libgtop-2.0.so.10 libgtop-2.30.0_1 librarian.so.0 rarian-0.8.1_1 -libmetacity-private.so.0 metacity-2.30.1_1 libgnome-menu-3.so.0 gnome-menus-2.91.6_1 libart_lgpl_2.so.2 libart-2.3.20_1 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1 @@ -673,7 +658,6 @@ libgtksourceview-3.0.so.1 gtksourceview-3.8.0_1 libtalloc.so.2 talloc-2.0.1_1 libmount.so.1 libmount-2.18_1 libdconf.so.1 dconf-0.13.90_1 -libdconf-dbus-1.so.0 dconf-0.13.90_1 libassuan.so.0 libassuan-2.0.1_1 libgpgme.so.11 gpgme-1.3.0_1 libgpgme-pthread.so.11 gpgme-1.3.0_1 @@ -719,11 +703,6 @@ libjasper.so.4 libjasper-1.900.27_1 librecode.so.0 librecode-3.6_1 libenca.so.0 libenca-1.13_1 libwavpack.so.1 libwavpack-4.60.1_1 -libvala-0.24.so.0 libvala-0.24.0_1 -libvala-0.26.so.0 libvala-0.26.2_1 -libvala-0.28.so.0 libvala-0.28.0_1 -libvala-0.30.so.0 libvala-0.30.0_1 -libvala-0.34.so.0 libvala-0.34.0_1 libvala-0.36.so.0 libvala-0.36.1_1 libSDL_net-1.2.so.0 SDL_net-1.2.7_1 libmodplug.so.1 libmodplug-0.8.8_1 @@ -758,7 +737,6 @@ libgailutil-3.so.0 gtk+3-3.0.0_1 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1 liblightdm-qt-3.so.0 liblightdm-qt-1.10.1_1 liblightdm-qt5-3.so.0 liblightdm-qt5-1.12.2_3 -libcelt051.so.0 celt051-0.5.1.3_1 libcelt0.so.2 celt-0.11.1_1 libspice-server.so.1 spice-0.6.4_1 libbrasero-burn3.so.1 brasero-2.91.90_1 @@ -776,13 +754,11 @@ libgjs.so.0 gjs-0.7.11_1 libgjs-gi.so gjs-0.7.11_1 libgjs-dbus.so.0 gjs-0.7.11_1 libtelepathy-glib.so.0 telepathy-glib-0.15.5_1 -libgedit-private.so.0 gedit-2.91.7_1 libaccountsservice.so.0 accountsservice-0.6.4_1 libgee.so.2 libgee-0.6.1_1 libfolks.so.25 folks-0.9.5_1 libfolks-telepathy.so.25 folks-0.9.5_1 libfolks-eds.so.25 folks-0.9.5_1 -libfolks-tracker.so.25 folks-0.9.5_1 libnice.so.10 libnice-0.1.0_1 libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1 libtelepathy-logger.so.3 telepathy-logger-0.6.0_1 @@ -819,7 +795,6 @@ libgtkmm-2.4.so.1 gtkmm2-2.24.0_1 libseed-gtk3.so.0 libseed-3.0.0_1 libquadmath.so.0 libquadmath-4.4.0_1 libgfortran.so.3 libgfortran-4.4.0_1 -libblktapctl.so.1 xen-4.1.2_1 libmozjs185.so.1.0 js-1.8.5_1 libwebp.so.7 libwebp-0.6.0_1 libwebpmux.so.3 libwebp-0.6.0_1 @@ -837,10 +812,8 @@ libv4lconvert.so.0 v4l-utils-0.8.5_1 libv4l1.so.0 v4l-utils-0.8.5_1 libv4l2rds.so.0 v4l-utils-1.2.1_1 libdvbv5.so.0 v4l-utils-1.6.2_1 -libclutter-gst-1.0.so.0 clutter-gst-1.5.4_1 libmx-1.0.so.2 mx-1.4.3_1_1 libmx-gtk-1.0.so.0 mx-1.4.3_1_1 -libjson.so.0 json-c-0.9_1 libjson-c.so.2 json-c-0.11_1 libcogl.so.20 cogl-1.18.0_1 libcogl-pango.so.20 cogl-1.18.0_1 @@ -956,22 +929,13 @@ libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 libyajl.so.2 yajl-2.0.1_1 libconfuse.so.1 confuse-3.0_1 libclang.so.4 clang-4.0.0_1 -liblldb.so lldb-3.5.1_1 -libLLVM-3.5.so libllvm-3.5.0_1 -libLLVM-3.6.so libllvm3.6-3.6.0_1 -libLLVM-3.7.so libllvm3.7-3.7.0_1 -libLLVM-3.7.1.so libllvm3.7-3.7.1_1 libLLVM-3.8.so libllvm3.8-3.8.0_1 libLLVM-3.8.1.so libllvm3.8-3.8.1_1 libLLVM-3.9.so libllvm3.9-3.9.0_1 libLLVM-4.0.so libllvm4.0-4.0.0_1 libisofs.so.6 libisofs-0.6.24_1 -libbfd-2.22.so binutils-2.22_1<2.23_1 -libopcodes-2.22.so binutils-2.22_1<2.23_1 libv8.so.3.24 libv8-3.24.35.22_1 -libv8.so.3.16 libv8-3.16-3.16.8.1_2 libGeoIP.so.1 libgeoip-1.4.8_1 -libGeoIPUpdate.so.0 libgeoip-1.4.8_1 libcherokee-base.so.0 libcherokee-1.2.101_1 libcherokee-client.so.0 libcherokee-1.2.101_1 libcherokee-server.so.0 libcherokee-1.2.101_1 @@ -1016,7 +980,6 @@ libgcr-base-3.so.1 gcr-3.3.92_1 libgck-1.so.0 gcr-3.8.0_1 libgcr-ui-3.so.1 gcr-3.8.0_1 libwacom.so.2 libwacom-0.3_1 -libfarstream-0.1.so.0 farstream-0.1.1_1 libfarstream-0.2.so.5 farstream-0.2.7_1 libass.so.9 libass-0.13.6_1 libcryptui.so.0 libcryptui-3.4.0_1 @@ -1029,7 +992,6 @@ libwebrtc_audio_processing.so.1 webrtc-audio-processing-0.3_1 libcupsmime.so.1 libcups-1.5.3_1 libcupsppdc.so.1 libcups-1.5.3_1 libcupscgi.so.1 libcups-1.5.3_1 -libcupsdriver.so.1 libcups-1.5.3_1 libcups.so.2 libcups-1.5.3_1 libcupsimage.so.2 libcups-1.5.3_1 libijs-0.35.so libijs-0.8_1 @@ -1091,7 +1053,6 @@ libflowcanvas.so.5 flowcanvas-0.7.1_1 liblash.so.1 ladish-1_1 libmowgli-2.so.0 libmowgli-2.0.0_1 libguess.so.1 libguess-1.1_1 -libaudclient.so.2 audacious-3.3.1_1 libaudcore.so.4 audacious-3.8_1 libaudgui.so.4 audacious-3.8_1 libaudtag.so.3 audacious-3.8_1 @@ -1127,7 +1088,6 @@ libxapian.so.30 libxapian-1.4.0_1 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1 libcolord-gtk.so.1 colord-gtk-0.1.23_1 libgdm.so.1 libgdm-3.6.0_1 -libgdmsimplegreeter.so.1 gdm-3.6.0_1 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1 libcheese.so.8 libcheese-3.17.90_1 libcheese-gtk.so.25 libcheese-3.17.90_1 @@ -1359,7 +1319,6 @@ 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 -libkgapi.so.1 libkgapi-2.0.1_1 libkgapi2.so.2 libkgapi-2.0.1_1 libqoauth.so.1 qoauth-1.0.1_1 libIrrlicht.so.1.8 irrlicht-1.8_1 @@ -1375,9 +1334,6 @@ libqmi-glib.so.5 libqmi-1.14.2_1 libmbim-glib.so.4 libmbim-1.10.0_1 libmm-glib.so.0 libmm-glib-1.0.0_1 libgpm.so.2 libgpm-1.20.7_1 -libavcodec.so.53 libavcodec53-0.10.7_1 -libavutil.so.51 libavutil51-0.10.7_1 -libavformat.so.53 libavformat53-0.10.7_1 libgdl-3.so.5 gdl-3.8.1_1 libgda-5.0.so.4 libgda-5.1.2_1 libgda-report-5.0.so.4 libgda-5.1.2_1 @@ -1393,7 +1349,6 @@ libgmtk.so.1 gmtk-1.0.8_1 liblrzip.so.0 liblrzip-0.614_3 libsilcclient-1.1.so.4 silc-toolkit-1.1.11_1 libsilc-1.1.so.4 silc-toolkit-1.1.11_1 -libobjfw.so.6 objfw-0.7.1_1 libphorward.so.0 libphorward-0.17_1 libusbip.so.0 libusbip-3.10_1 libcpupower.so.0 libcpupower-3.10_1 @@ -1449,7 +1404,6 @@ libecore_input_evas.so.1 efl-1.12.0_1 libecore_input.so.1 efl-1.12.0_1 libecore_ipc.so.1 efl-1.12.0_1 libecore.so.1 efl-1.12.0_1 -libecore_wayland.so.1 efl-1.12.0_1 libecore_x.so.1 efl-1.12.0_1 libedje.so.1 efl-1.12.0_1 libeet.so.1 efl-1.12.0_1 @@ -1467,14 +1421,12 @@ libethumb_client.so.1 efl-1.12.0_1 libethumb.so.1 efl-1.12.0_1 libevas.so.1 efl-1.12.0_1 libefl.so.1 efl-1.12.0_1 -libecore_drm.so.1 efl-1.13.0_1 libelua.so.1 efl-1.13.0_1 libelocation.so.1 efl-1.13.0_1 libelementary.so.1 efl-1.18.0_1 libector.so.1 efl-1.18.1_1 libemile.so.1 efl-1.18.1_1 libcjs.so.0 cjs-2.0.0_1 -libcjs-dbus.so.0 cjs-2.0.0_1 libmuffin.so.0 muffin-2.0.5_1 libcinnamon-desktop.so.4 cinnamon-desktop-2.0.4_1 libcinnamon-control-center.so.1 libcinnamon-control-center-2.4.2_1 @@ -1552,8 +1504,6 @@ libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1 libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1 libgtkhex-3.so.0 libgtkhex-3.10.0_1 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1 -libgnote-3.12.so.0 gnote-3.12.0_1 -libgnote-3.22.so.0 gnote-3.22.0_1 libdmraid.so.1 dmraid-1.0.0.rc16.3_5 libdovecot.so.0 dovecot-2.2.11_2 libdovecot-login.so.0 dovecot-2.2.11_2 @@ -1674,8 +1624,6 @@ libBulletCollision.so.2.83 bullet-2.83.5_1 libLinearMath.so.2.83 bullet-2.83.5_1 libBulletSoftBody.so.2.83 bullet-2.83.5_1 libinotifytools.so.0 libinotify-tools-3.14_2 -libgtest.so.0 gmock-1.7.0_1 -libgtest_main.so.0 gmock-1.7.0_1 libgmock.so.0 gmock-1.7.0_1 libgmock_main.so.0 gmock-1.7.0_1 libopensc.so.4 libopensc-0.16.0_1 @@ -1725,18 +1673,12 @@ libid3.so id3lib-3.8.3_1 libid3-3.8.so.3 id3lib-3.8.3_1 libgirara-gtk3.so.2 girara-0.2.4_1 libjq.so.1 jq-devel-1.4_1 -libcrypto.so.34 libcrypto34-2.2.1_1 -libcrypto.so.35 libcrypto35-2.2.2_1 libcrypto.so.37 libcrypto37-2.3.3_1 libcrypto.so.38 libcrypto38-2.4.2_1 libcrypto.so.41 libcrypto41-2.5.3_1 -libssl.so.33 libssl33-2.2.1_1 -libssl.so.35 libssl35-2.2.2_1 libssl.so.38 libssl38-2.3.3_1 libssl.so.39 libssl39-2.4.2_1 libssl.so.43 libssl43-2.5.3_1 -libtls.so.4 libtls4-2.2.1_1 -libtls.so.6 libtls6-2.2.2_1 libtls.so.10 libtls10-2.3.3_1 libtls.so.11 libtls11-2.4.2_1 libtls.so.15 libtls15-2.5.3_1 @@ -1768,8 +1710,6 @@ libchm.so.0 libchmlib-0.40_1 libokularcore.so.5 libokular-4.14.2_1 libmnl.so.0 libmnl-1.0.3_1 libnftnl.so.4 libnftnl-1.0.5_1 -libwld.so.0 wld-git-20140809_1 -libswc.so.0 swc-git-20140809_1 libfcgi.so.0 fcgi-2.4.0_2 libdshconfig.so.1 libdshconfig-0.20.13_1 libpar2.so.1 libpar2-0.4_1 @@ -1943,7 +1883,6 @@ libimobiledevice.so.6 libimobiledevice-1.2.0_1 libstfl.so.0 stfl-0.23_1 libenventor.so.1 enventor-1.0.0_1 libCDApplet.so cairo-dock-plugins-3.4.0_1 -libhydrogen-core-0.9.6.1.so hydrogen-0.9.6.1_1 libldns.so.2 libldns-1.7.0_1 libopenjpeg.so.5 libopenjpeg-1.5.2_1 liboping.so.0 liboping-1.8.0_1 @@ -2000,10 +1939,6 @@ libastro.so.1 marble-4.14.3_2 libparrot.so.6.9.0 parrot-6.9.0_1 libkipi.so.11 libkipi-4.14.3_1 libasr.so.0 libasr-1.0.0_1 -libsystemd-daemon.so.0 LoginKit-git-20141226_1 -libsystemd-journal.so.0 LoginKit-git-20141226_1 -libsystemd-login.so.0 LoginKit-git-20141226_1 -libsystemd.so.0 LoginKit-git-20141226_1 libssr-glinject.so ssr-0.3.1_1 libgdict-1.0.so.10 gnome-dictionary-3.18.1_1 libasignify.so.1 asignify-1.0_1 @@ -2187,7 +2122,6 @@ libCEGUILuaScriptModule-0.7.9.so cegui07-0.7.9_1 libCEGUISILLYImageCodec-0.7.9.so cegui07-0.7.9_1 libCEGUISTBImageCodec-0.7.9.so cegui07-0.7.9_1 libCEGUIFreeImageImageCodec-0.7.9.so cegui07-0.7.9_3 -libCEGUISampleHelper-0.7.9.so cegui07-0.7.9_1 libCEGUITGAImageCodec-0.7.9.so cegui07-0.7.9_1 libCEGUITinyXMLParser-0.7.9.so cegui07-0.7.9_1 libCEGUItoluapp-0.7.9.so cegui07-0.7.9_1 @@ -2454,7 +2388,6 @@ libfastjson.so.4 libfastjson-0.99.3_1 libdcadec.so.0 dcadec-0.2.0_1 libcmark.so.0 cmark-0.24.1_1 libspotify.so.12 libspotify-12.1.51_1 -libwiredtiger-2.8.0.so wiredtiger-2.8.0_1 libwiredtiger_lz4.so wiredtiger-2.9.0_1 libwiredtiger_snappy.so wiredtiger-2.9.0_1 libwiredtiger_zlib.so wiredtiger-2.9.0_1 From ed35da2f7b49d50951296fd202a67e400b88e4b3 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 20:38:18 -0500 Subject: [PATCH 0603/1145] apache-tomcat: update to 8.5.15 --- srcpkgs/apache-tomcat/template | 4 ++-- srcpkgs/apache-tomcat/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/apache-tomcat/update diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template index a8a64d6474..e63db0e6f6 100644 --- a/srcpkgs/apache-tomcat/template +++ b/srcpkgs/apache-tomcat/template @@ -1,6 +1,6 @@ # Template file for 'apache-tomcat' pkgname=apache-tomcat -version=8.5.4 +version=8.5.15 revision=1 wrksrc=${pkgname}-${version}-src hostmakedepends="openjdk apache-ant" @@ -15,7 +15,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://tomcat.apache.org" distfiles="http://mirrors.advancedhosters.com/apache/tomcat/tomcat-8/v${version}/src/apache-tomcat-${version}-src.tar.gz" -checksum=bb35d2b37e2ff237e09e389dbfb0a99fa8a71f11c947c20f5bbea375f6f3449d +checksum=941e1e936af46dbe233e41f770e68b09e2ac0d88b6ee01f7b2116a67220cb323 do_build() { ant diff --git a/srcpkgs/apache-tomcat/update b/srcpkgs/apache-tomcat/update new file mode 100644 index 0000000000..c1ff63b2c3 --- /dev/null +++ b/srcpkgs/apache-tomcat/update @@ -0,0 +1 @@ +pattern='Tomcat \K[\d.]+(?= Released)' From fce7cbe884ed0390a4f7bbdc8a987aa9f45c1c21 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 20:46:09 -0500 Subject: [PATCH 0604/1145] autojump: update to 22.5.1 --- srcpkgs/autojump/template | 4 ++-- srcpkgs/autojump/update | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/autojump/template b/srcpkgs/autojump/template index ea042a1f8e..1961be13b2 100644 --- a/srcpkgs/autojump/template +++ b/srcpkgs/autojump/template @@ -1,6 +1,6 @@ # Template file for 'autojump' pkgname=autojump -version=22.3.4 +version=22.5.1 revision=1 wrksrc=${pkgname}-release-v${version} hostmakedepends="python" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://github.com/wting/autojump" distfiles="https://github.com/wting/autojump/archive/release-v${version}.tar.gz" -checksum=3fbd83f19e60514887c7efa1ce1b9015179c55c381a8867417eed933f2657984 +checksum=765fabda130eb4df70d1c1e5bc172e1d18f8ec22c6b89ff98f1674335292e99f do_install() { # The install script does some naive checks diff --git a/srcpkgs/autojump/update b/srcpkgs/autojump/update index ef748b89c5..e53e0fa3fe 100644 --- a/srcpkgs/autojump/update +++ b/srcpkgs/autojump/update @@ -1,2 +1,2 @@ site=https://github.com/wting/autojump/releases -pattern='release-\Kv?[0-9]+\.[0-9]+\.[0-9]+(?:\.[0-9]+)?' +pattern='release-v\K[\d.]+(?=\.tar\.gz)' From fc4387d00de114046eeef709223d735c1d964062 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 20:53:35 -0500 Subject: [PATCH 0605/1145] gns3-gui: update to 2.0.1 --- srcpkgs/gns3-gui/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 79e7895af9..b627191228 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,6 +1,6 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=1.5.3 +version=2.0.1 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" @@ -10,4 +10,4 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://gns3.com" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=446fdc87d884fb24f879b8bba862dc43b92b6f859edefcd22f8682bdac61bec4 +checksum=22226d4e08a8927bb0be108efe17479ca730826fad8a003bdce315ddf0e4a986 From 9716e15814402bdfbb61b374706fff571fd05aa2 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 20:55:49 -0500 Subject: [PATCH 0606/1145] gns3-server: update to 2.0.1 --- srcpkgs/gns3-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index a9886a6811..175ae6077f 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,6 +1,6 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=1.5.3 +version=2.0.1 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://gns3.com" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=2f42dd1bc1304bed04a83ce3e7fe158cc126a1aad4e044d541af0726ed8693fb +checksum=ad57ab9b5b3cbdb873a7824e841d37971818341576bfd9350a722beae87f574f # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we From 30012b491211452858ea3b9e6a09d773127a7a35 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:17:06 -0500 Subject: [PATCH 0607/1145] python-ldap: update to 2.4.38 --- srcpkgs/python-ldap/template | 4 ++-- srcpkgs/python-ldap/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/python-ldap/update diff --git a/srcpkgs/python-ldap/template b/srcpkgs/python-ldap/template index 99fe99911f..9cf3e5cd8e 100644 --- a/srcpkgs/python-ldap/template +++ b/srcpkgs/python-ldap/template @@ -1,6 +1,6 @@ # Template file for 'python-ldap' pkgname=python-ldap -version=2.4.32 +version=2.4.38 revision=1 build_style=python2-module pycompile_module="ldap lidf.py dsml.py ldapurl.py" @@ -12,7 +12,7 @@ maintainer="Michael Aldridge " license="PSF" homepage="https://www.python-ldap.org" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=5810f1b5a9ae9255df99fb9c2dcab7352fed325687efda56c0faae1a82c5e3cb +checksum=88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779 pre_build() { sed -i "s,/usr/include/sasl,${XBPS_CROSS_BASE}/usr/include/sasl," setup.cfg diff --git a/srcpkgs/python-ldap/update b/srcpkgs/python-ldap/update new file mode 100644 index 0000000000..2d64e8e28a --- /dev/null +++ b/srcpkgs/python-ldap/update @@ -0,0 +1 @@ +site=https://pypi.python.org/pypi/python-ldap/ From c8388b69af03d8baf9bfe99d7b1df6fa3a7085ce Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:19:59 -0500 Subject: [PATCH 0608/1145] python3-aiohttp-cors: update to 0.5.3 --- srcpkgs/python3-aiohttp-cors/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-aiohttp-cors/template b/srcpkgs/python3-aiohttp-cors/template index cef39a633c..235a51f5ea 100644 --- a/srcpkgs/python3-aiohttp-cors/template +++ b/srcpkgs/python3-aiohttp-cors/template @@ -1,6 +1,6 @@ # Template file for 'python3-aiohttp-cors' pkgname=python3-aiohttp-cors -version=0.5.0 +version=0.5.3 revision=1 wrksrc=aiohttp-cors-${version} build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="Apache-2" homepage="https://github.com/aio-libs/aiohttp-cors" distfiles="https://github.com/aio-libs/aiohttp-cors/archive/v${version}.tar.gz" -checksum=7d0c682657db4f3265337875be75e5f222aef644e780e125267e98a690ff9d85 +checksum=bec79cc5c62cffd044899863a73a450d058a6cb2c965d4c8cec8e6b0d06e9768 post_install() { vlicense LICENSE From eb5f5659e003a62ac8070d2146f7bb4a5a3e9dc7 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:25:31 -0500 Subject: [PATCH 0609/1145] python3-aiohttp: update to 2.0.7 --- srcpkgs/python3-aiohttp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index a7eeea7a52..e87358a11f 100644 --- a/srcpkgs/python3-aiohttp/template +++ b/srcpkgs/python3-aiohttp/template @@ -1,6 +1,6 @@ # Template file for 'python3-aiohttp' pkgname=python3-aiohttp -version=1.2.0 +version=2.0.7 revision=1 wrksrc=aiohttp-${version} build_style=python3-module @@ -10,8 +10,8 @@ short_desc="HTTP client/server for asyncio (PEP-3156)" maintainer="Michael Aldridge " license="Apache-2" homepage="http://aiohttp.readthedocs.io/" -distfiles="https://github.com/KeepSafe/aiohttp/archive/v${version}.tar.gz" -checksum=b2fa11df067207ff15813be84b78910f6f9d897f02e9c345993b9962802a6bea +distfiles="https://github.com/aio-libs/aiohttp/archive/${version}.tar.gz" +checksum=fcc17b56747ac76fd99ddf63d07de2bed12a5d0f78b658f0c9c5d7d9f696c766 post_install() { vlicense LICENSE.txt From cc71aaa03b168a381f46cf8ff9cba26f64261c8d Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:30:42 -0500 Subject: [PATCH 0610/1145] python3-async-timeout: update to 1.2.1 --- srcpkgs/python3-async-timeout/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template index 876d1ac97d..0c043a2d3c 100644 --- a/srcpkgs/python3-async-timeout/template +++ b/srcpkgs/python3-async-timeout/template @@ -1,6 +1,6 @@ # Template file for 'python3-async-timeout' pkgname=python3-async-timeout -version=1.1.0 +version=1.2.1 revision=1 wrksrc=async-timeout-${version} build_style=python3-module @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="Apache-2" homepage="https://github.com/aio-libs/async-timeout" distfiles="https://github.com/aio-libs/async-timeout/archive/v${version}.tar.gz" -checksum=44a72eaedb82e53786d2b2590499b5e86a97805557361f51d467c283dc79b328 +checksum=840ca2fb8237faa2251ecccdd8b5180d6f9f2d92df6068e77ea823642fcc75d4 post_install() { vlicense LICENSE From ab968363b497ef6a72898335ad99fbcc1964bd4a Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:40:56 -0500 Subject: [PATCH 0611/1145] python3-multidict: update to 2.1.5 --- srcpkgs/python3-multidict/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template index bd4c359edd..4250723b99 100644 --- a/srcpkgs/python3-multidict/template +++ b/srcpkgs/python3-multidict/template @@ -1,6 +1,6 @@ # Template file for 'python3-multidict' pkgname=python3-multidict -version=2.1.4 +version=2.1.5 revision=1 wrksrc=multidict-${version} build_style=python3-module @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="Apache-2" homepage="https://github.com/aio-libs/multidict" distfiles="https://github.com/aio-libs/multidict/archive/v${version}.tar.gz" -checksum=4116a99f024269210bc5629661e55f5f613e1b11016b3bbf4e0ba453b02a65c1 +checksum=f3d8f71104d2084cbdb51158ac5eeb6aee0907618a59fe7cb97b2b139d58abb6 post_install() { vlicense LICENSE From ccc4f4fd02156535b92a7986f1017609a9864a4d Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:55:38 -0500 Subject: [PATCH 0612/1145] python3-yarl: update to 0.10.2 --- srcpkgs/python3-yarl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template index 2c3eeca2fd..6c5b109126 100644 --- a/srcpkgs/python3-yarl/template +++ b/srcpkgs/python3-yarl/template @@ -1,6 +1,6 @@ # Template file for 'python3-yarl' pkgname=python3-yarl -version=0.8.1 +version=0.10.2 revision=1 wrksrc=yarl-${version} #create_wrksrc=yes @@ -13,7 +13,7 @@ maintainer="Michael Aldridge " license="Apache-2.0" homepage="http://yarl.readthedocs.io/" distfiles="https://github.com/aio-libs/yarl/archive/v${version}.tar.gz" -checksum=cb2790f35af5d04986b14c5b79678954cd4052ad9846f3d7327baed62581c48e +checksum=3ff138278de5a82fa434748c52d3c6871ca981821b6831013747b5368b431295 post_install() { vlicense LICENSE From 1d6ec32037ce957670ff29ee7fc4cb532157f2ab Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 21:59:01 -0500 Subject: [PATCH 0613/1145] raven-python: update to 6.0.0 --- srcpkgs/raven-python/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/raven-python/template b/srcpkgs/raven-python/template index f2c4b299e6..310300f700 100644 --- a/srcpkgs/raven-python/template +++ b/srcpkgs/raven-python/template @@ -1,6 +1,6 @@ # Template file for 'raven-python' pkgname=raven-python -version=5.32.0 +version=6.0.0 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools" @@ -10,4 +10,4 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://github.com/getsentry/raven-python" distfiles="https://github.com/getsentry/${pkgname}/archive/${version}.tar.gz" -checksum=beb421c7741c94225d1648dcd8165e709e885b45505b4a99acb1f2867bf279cb +checksum=50631c712fd4a5782a31c068ab879a1a272873a7dc1ed914df18df417a5f75d9 From a03f0228e1f431f656105827054f7e6c63dc8717 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 22:16:22 -0500 Subject: [PATCH 0614/1145] wps-office: add update file and template cleanup --- srcpkgs/wps-office/template | 6 ------ srcpkgs/wps-office/update | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/wps-office/update diff --git a/srcpkgs/wps-office/template b/srcpkgs/wps-office/template index 39763d1d0c..98059d5d65 100644 --- a/srcpkgs/wps-office/template +++ b/srcpkgs/wps-office/template @@ -55,10 +55,4 @@ do_install() { rm ${DESTDIR}/opt/kingsoft/wps-office/README.txt rm -rf ${DESTDIR}/opt/kingsoft/wps-office/font* rm ${DESTDIR}/opt/kingsoft/wps-office/install_fonts - rm -rf ${DESTDIR}/usr/include - rm -rf ${DESTDIR}/usr/share/man - rm -rf ${DESTDIR}/usr/lib/pkgconfig - rm -rf ${DESTDIR}/usr/bin/libpng* - rm -f ${DESTDIR}/usr/lib/*.so - rm -f ${DESTDIR}/usr/lib/*.a } diff --git a/srcpkgs/wps-office/update b/srcpkgs/wps-office/update new file mode 100644 index 0000000000..4f0dc19177 --- /dev/null +++ b/srcpkgs/wps-office/update @@ -0,0 +1,2 @@ +site=http://wps-community.org/downloads +pattern='wps-office_\K[\d.]+(?=.*_x86.tar.xz)' From 3f38aa9e0eab1b59c3a5f6f8b5d815dd8a6dc680 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Thu, 18 May 2017 17:50:25 +0200 Subject: [PATCH 0615/1145] R: add tcltk support --- srcpkgs/R/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R/template b/srcpkgs/R/template index 90fd541867..65089b55a1 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,17 +1,17 @@ # Template file for 'R' pkgname=R version=3.4.0 -revision=2 +revision=3 nocross=yes build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R - --with-lapack --with-blas --enable-R-shlib + --with-lapack --with-blas --enable-R-shlib --with-tcltk LIBnn=lib" hostmakedepends="gcc-fortran pkg-config perl less" makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel libpng-devel libjpeg-turbo-devel tiff-devel cairo-devel icu-devel lapack-devel blas-devel zlib-devel bzip2-devel pcre-devel liblzma-devel - libcurl-devel" + libcurl-devel tcl-devel tk-devel" depends="xdg-utils less" short_desc="System for statistical computation and graphics" maintainer="Leah Neukirchen " From 61c06bfa72374ee456ccdb4b7cf41de767740900 Mon Sep 17 00:00:00 2001 From: Ivan Kozak Date: Fri, 19 May 2017 16:44:43 +0300 Subject: [PATCH 0616/1145] New package: gxkb-0.7.9 Closes: #6457 [via git-merge-pr] --- srcpkgs/gxkb/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/gxkb/template diff --git a/srcpkgs/gxkb/template b/srcpkgs/gxkb/template new file mode 100644 index 0000000000..9f89f97dae --- /dev/null +++ b/srcpkgs/gxkb/template @@ -0,0 +1,22 @@ +# Template for gxkb + +pkgname="gxkb" +version="0.7.9" +revision=1 +build_style=gnu-configure +short_desc="Lightweight X keyboard layout indicator and switcher, uses GTK+2" +maintainer="Ivan Kozak " +hostmakedepends="autoconf automake libtool pkg-config" +makedepends="xorg-server-devel gtk+-devel libxklavier-devel libwnck2-devel" +license="GPL2" +homepage="https://github.com/zen-tools/gxkb" +distfiles="https://github.com/zen-tools/${pkgname}/archive/v${version}.tar.gz" +checksum="964f814eba0ff7688b7a40a21d5c70f47b56a6242a3d36b713420e572bf4bba2" + +pre_configure() { + ./autogen.sh +} + +do_install() { + make DESTDIR="${DESTDIR}" install +} From 0f16e6d1a0c767859af9ea49c76a1a22a9551e5d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 19 May 2017 16:27:32 +0200 Subject: [PATCH 0617/1145] gxkb: cleanup --- srcpkgs/gxkb/template | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gxkb/template b/srcpkgs/gxkb/template index 9f89f97dae..b34c3a4d35 100644 --- a/srcpkgs/gxkb/template +++ b/srcpkgs/gxkb/template @@ -1,14 +1,13 @@ -# Template for gxkb - -pkgname="gxkb" -version="0.7.9" +# Template file for 'gxkb' +pkgname=gxkb +version=0.7.9 revision=1 build_style=gnu-configure -short_desc="Lightweight X keyboard layout indicator and switcher, uses GTK+2" +hostmakedepends="automake libtool pkg-config" +makedepends="libxklavier-devel libwnck2-devel" +short_desc="Lightweight GTK+2 X11 keyboard layout indicator and switcher" maintainer="Ivan Kozak " -hostmakedepends="autoconf automake libtool pkg-config" -makedepends="xorg-server-devel gtk+-devel libxklavier-devel libwnck2-devel" -license="GPL2" +license="GPL-2" homepage="https://github.com/zen-tools/gxkb" distfiles="https://github.com/zen-tools/${pkgname}/archive/v${version}.tar.gz" checksum="964f814eba0ff7688b7a40a21d5c70f47b56a6242a3d36b713420e572bf4bba2" @@ -16,7 +15,3 @@ checksum="964f814eba0ff7688b7a40a21d5c70f47b56a6242a3d36b713420e572bf4bba2" pre_configure() { ./autogen.sh } - -do_install() { - make DESTDIR="${DESTDIR}" install -} From 5f6100d2f3f39cbd6fe8f4d3fab5cc87d54e0434 Mon Sep 17 00:00:00 2001 From: cr6git Date: Fri, 19 May 2017 08:00:36 +0200 Subject: [PATCH 0618/1145] brisk-menu: update to 0.4.0 Closes: #6453 [via git-merge-pr] --- srcpkgs/brisk-menu/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/brisk-menu/template b/srcpkgs/brisk-menu/template index f18b67390f..ffa76cbbff 100644 --- a/srcpkgs/brisk-menu/template +++ b/srcpkgs/brisk-menu/template @@ -1,6 +1,6 @@ # Template file for 'brisk-menu' pkgname=brisk-menu -version=0.3.5 +version=0.4.0 revision=1 build_style=gnu-configure hostmakedepends="glib pkg-config intltool" @@ -9,6 +9,6 @@ depends="mate-panel" short_desc="Modern, efficient menu for the MATE DE" maintainer="Jasu Koponen " license="GPL-2" -homepage="https://github.com/solus-project/${pkgname}" -distfiles="https://github.com/solus-project/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=6648b67c60f395bc72d5a74cd7bae4826ea038814e2947c90e319564ce1381d7 +homepage="https://github.com/solus-project/brisk-menu" +distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz" +checksum=8737113dc06b472c9f37d36056f0262ef1e76a0de7dbe281cd903b0f9fa26e77 From 2bbaeb178dd8536fb3a3322fdcc9683570776f62 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 22:59:59 -0500 Subject: [PATCH 0619/1145] zerotier-one: update to 1.2.4 Closes: #6452 [via git-merge-pr] --- srcpkgs/zerotier-one/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zerotier-one/template b/srcpkgs/zerotier-one/template index 0dd6b667b4..f30e3a6333 100644 --- a/srcpkgs/zerotier-one/template +++ b/srcpkgs/zerotier-one/template @@ -1,6 +1,6 @@ # Template file for 'zerotier' pkgname=zerotier-one -version=1.1.14 +version=1.2.4 revision=1 wrksrc=ZeroTierOne-${version} build_style=gnu-makefile @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="GPL-3" homepage="https://www.zerotier.com/" distfiles="https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz" -checksum=d206069ad21c665159cdececb0a20a21758849ad73d91234d709962b26f634af +checksum=9f275b3732b721f02cc4b8df75b51e6a8fb56dfe1a542a7bd681538d852b0358 do_build() { make all ZT_ENABLE_NETWORK_CONTROLLER=1 From 8f8f22dd1b3ee0477ef17ca3858e44d726375c09 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 22:39:58 -0500 Subject: [PATCH 0620/1145] xapps: update to 1.0.3 Closes: #6451 [via git-merge-pr] --- srcpkgs/xapps/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template index 551c08860c..66e2c9d47b 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapps/template @@ -1,9 +1,9 @@ # Template file for 'xapps' pkgname=xapps -version=1.0.2 +version=1.0.3 revision=1 build_style=gnu-configure -hostmakedepends="gnome-common glib-devel intltool pkg-config libtool intltool" +hostmakedepends="gnome-common glib-devel intltool pkg-config libtool intltool gtk-doc" makedepends="gettext-devel gobject-introspection gtk+3-devel gdk-pixbuf-devel libgnomekbd-devel" depends="inxi gist xfconf" short_desc="Cross-desktop libraries and common resources from Linux Mint" @@ -11,7 +11,7 @@ maintainer="Michael Aldridge " license="GPL-2" homepage="https://github.com/linuxmint/xapps" distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz" -checksum=1443e9f319763f8b90749ea9669880005f315af060f7bbaa2b4241b4c4ca49a4 +checksum=bb1b89b586eec67fc109140de791710c5b4ec488b01ef3ac261e288a27b4797e pre_configure() { ./autogen.sh From 2ebdc9e23588061a5f96e3639da2ecb280f6e237 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Thu, 18 May 2017 22:08:15 -0500 Subject: [PATCH 0621/1145] stepmania: add update file Closes: #6449 [via git-merge-pr] --- srcpkgs/stepmania/update | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/stepmania/update diff --git a/srcpkgs/stepmania/update b/srcpkgs/stepmania/update new file mode 100644 index 0000000000..abda5ef48e --- /dev/null +++ b/srcpkgs/stepmania/update @@ -0,0 +1,2 @@ +site=https://github.com/stepmania/stepmania/releases +pattern='StepMania-\K[\d.]+(?=-Linux)' From 7ecae6bc60fd3fd4952f1b5d049278e852ae6a45 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Fri, 19 May 2017 16:49:34 +0200 Subject: [PATCH 0622/1145] New package: xkb-switch Closes: #6429 [via git-merge-pr] --- srcpkgs/xkb-switch/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/xkb-switch/template diff --git a/srcpkgs/xkb-switch/template b/srcpkgs/xkb-switch/template new file mode 100644 index 0000000000..2ed2ae1373 --- /dev/null +++ b/srcpkgs/xkb-switch/template @@ -0,0 +1,17 @@ +# Template file for 'xkb-switch' +pkgname=xkb-switch +version=1.5.0 +revision=1 +build_style=cmake +hostmakedepends="cmake" +makedepends="libX11-devel libxkbfile-devel" +short_desc="Query and change the XKB layout state" +maintainer="Andrey Raugas " +license="GPL-3" +homepage="https://github.com/ierton/xkb-switch" +distfiles="https://github.com/ierton/${pkgname}/archive/${version}.tar.gz" +checksum=3e100ac15670eda2109fb0d3159ad08e85e3b33de4cb1b3369dce5da7d83e954 + +post_install() { + vman man/xkb-switch.1 +} From 0eb32413aad65a869be2638641fded9b7297e740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 20 May 2017 03:55:19 +0200 Subject: [PATCH 0623/1145] qt5: fix gcc7 build --- srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch | 11 ++++ .../qt5/patches/gcc7-linked_hash_set.patch | 62 +++++++++++++++++++ srcpkgs/qt5/patches/gcc7-template-type.patch | 11 ++++ 3 files changed, 84 insertions(+) create mode 100644 srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch create mode 100644 srcpkgs/qt5/patches/gcc7-linked_hash_set.patch create mode 100644 srcpkgs/qt5/patches/gcc7-template-type.patch diff --git a/srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch b/srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch new file mode 100644 index 0000000000..f7793db6e3 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc7-avoid_wchar_t.patch @@ -0,0 +1,11 @@ +--- qtwebengine/src/3rdparty/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp 2017-05-20 02:18:35.281893421 +0200 ++++ qtwebengine/src/3rdparty/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp 2017-05-20 02:23:36.260127027 +0200 +@@ -24,7 +24,7 @@ + struct CHash; + + // Only needed to hash single-character strings. +-template ++template + struct CHash { + static const unsigned value = N; + }; diff --git a/srcpkgs/qt5/patches/gcc7-linked_hash_set.patch b/srcpkgs/qt5/patches/gcc7-linked_hash_set.patch new file mode 100644 index 0000000000..d9c73d2f67 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc7-linked_hash_set.patch @@ -0,0 +1,62 @@ +--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h 2017-01-03 10:28:53.000000000 +0100 ++++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h 2017-05-20 02:43:53.182512520 +0200 +@@ -129,6 +129,29 @@ + LinkedHashSetNodeBase& operator=(const LinkedHashSetNodeBase& other); + }; + ++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) ++{ ++ ASSERT(a.m_prev && a.m_next && b.m_prev && b.m_next); ++ swap(a.m_prev, b.m_prev); ++ swap(a.m_next, b.m_next); ++ if (b.m_next == &a) { ++ ASSERT(b.m_prev == &a); ++ b.m_next = &b; ++ b.m_prev = &b; ++ } else { ++ b.m_next->m_prev = &b; ++ b.m_prev->m_next = &b; ++ } ++ if (a.m_next == &b) { ++ ASSERT(a.m_prev == &b); ++ a.m_next = &a; ++ a.m_prev = &a; ++ } else { ++ a.m_next->m_prev = &a; ++ a.m_prev->m_next = &a; ++ } ++} ++ + template + class LinkedHashSetNode : public LinkedHashSetNodeBase { + DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); +@@ -720,29 +743,6 @@ + remove(find(value)); + } + +-inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) +-{ +- ASSERT(a.m_prev && a.m_next && b.m_prev && b.m_next); +- swap(a.m_prev, b.m_prev); +- swap(a.m_next, b.m_next); +- if (b.m_next == &a) { +- ASSERT(b.m_prev == &a); +- b.m_next = &b; +- b.m_prev = &b; +- } else { +- b.m_next->m_prev = &b; +- b.m_prev->m_next = &b; +- } +- if (a.m_next == &b) { +- ASSERT(a.m_prev == &b); +- a.m_next = &a; +- a.m_prev = &a; +- } else { +- a.m_next->m_prev = &a; +- a.m_prev->m_next = &a; +- } +-} +- + inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) + { + ASSERT(a.m_next != &a && b.m_next != &b); diff --git a/srcpkgs/qt5/patches/gcc7-template-type.patch b/srcpkgs/qt5/patches/gcc7-template-type.patch new file mode 100644 index 0000000000..bc7895b5b1 --- /dev/null +++ b/srcpkgs/qt5/patches/gcc7-template-type.patch @@ -0,0 +1,11 @@ +--- qtwebengine/src/3rdparty/chromium/v8/src/objects-body-descriptors.h 2017-01-03 10:28:53.000000000 +0100 ++++ qtwebengine/src/3rdparty/chromium/v8/src/objects-body-descriptors.h 2017-05-20 02:00:14.447917361 +0200 +@@ -99,7 +99,7 @@ + + template + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody(obj); + } + }; + From fdc703269b81174dec662e57c4cdbfe6d397bf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 20 May 2017 12:47:54 +0200 Subject: [PATCH 0624/1145] lollypop: update to 0.9.237 --- srcpkgs/lollypop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 7a52fcca70..6f2d4382b8 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,6 +1,6 @@ # Template file for 'lollypop' pkgname=lollypop -version=0.9.233 +version=0.9.237 revision=1 build_style=gnu-configure noarch=yes @@ -15,4 +15,4 @@ maintainer="Jürgen Buchmüller " license="GPL-3" homepage="https://gnumdk.github.io/lollypop-web/" distfiles="https://github.com/gnumdk/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=98e3c2d782673e690c0015ea5e3d64971761d4d8199ce5659382232324403445 +checksum=461f7710ecacfa4bd09efc8ec4f52955b9d327a08704fbed3a316b48fa2df508 From ad77476f0684e54690f962eecdf6a3b91080ea24 Mon Sep 17 00:00:00 2001 From: Pavel Kiselev Date: Sat, 20 May 2017 14:12:43 +0300 Subject: [PATCH 0625/1145] i3blocks: fix musl --- srcpkgs/i3blocks/patches/fix_musl.patch | 54 +++++++++++++++++++++++++ srcpkgs/i3blocks/template | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/i3blocks/patches/fix_musl.patch diff --git a/srcpkgs/i3blocks/patches/fix_musl.patch b/srcpkgs/i3blocks/patches/fix_musl.patch new file mode 100644 index 0000000000..04c09f8368 --- /dev/null +++ b/srcpkgs/i3blocks/patches/fix_musl.patch @@ -0,0 +1,54 @@ +--- src/sched.c.orig 2017-05-20 13:31:34.109614479 +0300 ++++ src/sched.c 2017-05-20 13:34:25.934611402 +0300 +@@ -31,7 +31,7 @@ + #include "json.h" + #include "log.h" + +-static sigset_t sigset; ++static sigset_t sigset_ng; + + static int + gcd(int a, int b) +@@ -88,13 +88,13 @@ + static int + setup_signals(void) + { +- if (sigemptyset(&sigset) == -1) { ++ if (sigemptyset(&sigset_ng) == -1) { + errorx("sigemptyset"); + return 1; + } + + #define ADD_SIG(_sig) \ +- if (sigaddset(&sigset, _sig) == -1) { errorx("sigaddset(%d)", _sig); return 1; } ++ if (sigaddset(&sigset_ng, _sig) == -1) { errorx("sigaddset(%d)", _sig); return 1; } + + /* Control signals */ + ADD_SIG(SIGTERM); +@@ -125,7 +125,7 @@ + #undef ADD_SIG + + /* Block signals for which we are interested in waiting */ +- if (sigprocmask(SIG_SETMASK, &sigset, NULL) == -1) { ++ if (sigprocmask(SIG_SETMASK, &sigset_ng, NULL) == -1) { + errorx("sigprocmask"); + return 1; + } +@@ -164,7 +164,7 @@ + bar_poll_timed(bar); + + while (1) { +- sig = sigwaitinfo(&sigset, &siginfo); ++ sig = sigwaitinfo(&sigset_ng, &siginfo); + if (sig == -1) { + /* Hiding the bar may interrupt this system call */ + if (errno == EINTR) +@@ -212,7 +212,7 @@ + * Unblock signals (so subsequent syscall can be interrupted) + * and wait for child processes termination. + */ +- if (sigprocmask(SIG_UNBLOCK, &sigset, NULL) == -1) ++ if (sigprocmask(SIG_UNBLOCK, &sigset_ng, NULL) == -1) + errorx("sigprocmask"); + while (waitpid(-1, NULL, 0) > 0) + continue; diff --git a/srcpkgs/i3blocks/template b/srcpkgs/i3blocks/template index 3db003ba47..30a8c95f0d 100644 --- a/srcpkgs/i3blocks/template +++ b/srcpkgs/i3blocks/template @@ -1,7 +1,7 @@ # Template file for 'i3blocks' pkgname=i3blocks version=1.4 -revision=2 +revision=3 build_style=gnu-makefile short_desc="Flexible scheduler for i3bar" maintainer="Eivind Uggedal " From c08357a0eb51a711856e661341c9546b4a215e3f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 20 May 2017 15:04:00 +0200 Subject: [PATCH 0626/1145] linux4.10: update to 4.10.17. --- srcpkgs/linux4.10/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.10/template b/srcpkgs/linux4.10/template index 414a523e24..e2a2181bc1 100644 --- a/srcpkgs/linux4.10/template +++ b/srcpkgs/linux4.10/template @@ -1,6 +1,6 @@ # Template file for 'linux4.10' pkgname=linux4.10 -version=4.10.16 +version=4.10.17 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=dcc547c505e4b4d150c32426547e4aad070d7b4b103bfd559f1674c9fc7fe00b +checksum=1ae7056b5b6a3fb653b065503afeb514afc870e103b0f857d0d13a6d06fd66ee nodebug=yes # -dbg package is generated below manually nostrip=yes From 4ba6d5bd58929fec0e3a5288d522c8343eb6b790 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 15:03:24 +0200 Subject: [PATCH 0627/1145] fio: update to 2.20. --- srcpkgs/fio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template index 1feac556d6..cfc621a1e4 100644 --- a/srcpkgs/fio/template +++ b/srcpkgs/fio/template @@ -1,6 +1,6 @@ # Template file for 'fio' pkgname=fio -version=2.19 +version=2.20 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="https://github.com/axboe/fio" distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=61fb03a18703269b781aaf195cb0d7931493bbb5bfcc8eb746d5d66d04ed77f7 +checksum=eb51fbad161929f1bcd6c1d0d09d2c7543651f834aec860ba5def9bc52dcc3ae case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" libnuma-devel" From d2a5783dda1da4c807f84b6c69204845e1b66fa4 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 15:14:43 +0200 Subject: [PATCH 0628/1145] perl-Socket6: fix cross. --- srcpkgs/perl-Socket6/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Socket6/template b/srcpkgs/perl-Socket6/template index ff9f7aebb8..215d8a3e43 100644 --- a/srcpkgs/perl-Socket6/template +++ b/srcpkgs/perl-Socket6/template @@ -1,7 +1,7 @@ # Template build file for 'perl-Socket6'. pkgname=perl-Socket6 version=0.28 -revision=1 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" @@ -13,8 +13,13 @@ homepage="http://search.cpan.org/dist/Socket6" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/${pkgname/perl-/}/${pkgname/perl-/}-${version}.tar.gz" checksum=bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586 -nocross=yes # XXX fixme later post_extract() { sed -i '/CFLAGS/d' Makefile.PL } +pre_configure() { + if [ "$CROSS_BUILD" ]; then + export ipv6_cv_can_inet_ntop=yes + sed -i 's:\./configure:& --host='$XBPS_CROSS_TRIPLET':g' Makefile.PL + fi +} From 30748af2c47fa55bbe519adbacc8532ddc06e490 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 15:46:18 +0200 Subject: [PATCH 0629/1145] perl-JSON: update to 2.93. --- srcpkgs/perl-JSON/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-JSON/template b/srcpkgs/perl-JSON/template index 6f4edead08..0e0f9c1801 100644 --- a/srcpkgs/perl-JSON/template +++ b/srcpkgs/perl-JSON/template @@ -1,9 +1,9 @@ # Template file for 'perl-JSON' pkgname=perl-JSON -version=2.92 +version=2.93 revision=1 distfiles="${CPAN_SITE}/JSON/JSON-${version}.tar.gz" -checksum=26995aba35a97379d700f29d92b41010e6446279ad5442fffd6efba4687446e8 +checksum=589300c3077ac7b2061ec4322f4bef5bde51c4f455eb98f34c56abe59551ba7a build_style="perl-module" hostmakedepends="perl" makedepends="${hostmakedepends}" From cab13b087e41852181f8cfabd4eb6b4ff7c29b60 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 15:52:12 +0200 Subject: [PATCH 0630/1145] dpkg: update to 1.18.24. --- srcpkgs/dpkg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template index 84549f51e1..719fbd3b4e 100644 --- a/srcpkgs/dpkg/template +++ b/srcpkgs/dpkg/template @@ -1,6 +1,6 @@ # Template file for 'dpkg' pkgname=dpkg -version=1.18.23 +version=1.18.24 revision=1 build_style=gnu-configure configure_args="--disable-start-stop-daemon --with-libz --with-libbz2 --with-liblzma" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://packages.debian.org/dpkg" distfiles="${DEBIAN_SITE}/main/d/dpkg/dpkg_${version}.tar.xz" -checksum=cc08802a0cea2ccd0c10716bc71531ff9b9234dd454b83a59f71117a37f36923 +checksum=d853081d3e06bfd46a227056e591f094e42e78fa8a5793b0093bad30b710d7b4 dpkg-devel_package() { short_desc+=" - development files" From 70ea779c051f827cf2598db3f8eb26cacda553fe Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 15:57:04 +0200 Subject: [PATCH 0631/1145] mpd: update to 0.20.8. --- srcpkgs/mpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 915a3d53cb..59436db9b6 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,6 +1,6 @@ # Template file for 'mpd' pkgname=mpd -version=0.20.7 +version=0.20.8 revision=1 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-neighbor-plugins @@ -27,7 +27,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.musicpd.org/" distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=005ac663b39a76701ba043cce4caef82ac6b0c2f16aae12fdc28e1b3b5b6c780 +checksum=7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35 # Package build options build_options="jack lame mpcdec pulseaudio libao wavpack" From 97675812d4ce94b44c5fb9c787b1baaff11adc89 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 15:57:09 +0200 Subject: [PATCH 0632/1145] perl-Net-HTTP: update to 6.15. --- srcpkgs/perl-Net-HTTP/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template index cf4bd0b509..3b28c56d55 100644 --- a/srcpkgs/perl-Net-HTTP/template +++ b/srcpkgs/perl-Net-HTTP/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Net-HTTP'. pkgname=perl-Net-HTTP -version=6.14 +version=6.15 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Juan RP " homepage="http://search.cpan.org/dist/Net-HTTP" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Net/Net-HTTP-${version}.tar.gz" -checksum=df0e71d3ec3a8351204619b32ee4a4a39368a419bcfe9324fcd6655bb11a433e +checksum=650c9aca583ed8ecda988f4330f62520d2441a9325276eea27d01b47b86615a5 From 3e568a08bb0c39335e266e1acf9101a803fd413c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 16:11:08 +0200 Subject: [PATCH 0633/1145] openmpi: update to 2.1.1. --- srcpkgs/openmpi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 587dbb7b02..08a8cf0fdc 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,6 +1,6 @@ # Template file for 'openmpi' pkgname=openmpi -version=2.1.0 +version=2.1.1 revision=1 lib32disabled=yes build_style=gnu-configure @@ -16,7 +16,7 @@ homepage="https://www.open-mpi.org/" license="3-clause-BSD" maintainer="Juan RP " distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=b169e15f5af81bf3572db764417670f508c0df37ce86ff50deb56bd3acb43957 +checksum=bd7badd4ff3afa448c0d7f3ca0ee6ce003b957e9954aa87d8e4435759b5e4d16 nocross=yes # libtool -rpath /usr/lib issue post_extract() { From ee26681041eeb4e67b30680a5d9bbd362e9e8bd7 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 20 May 2017 17:28:06 +0200 Subject: [PATCH 0634/1145] embree: update to 2.16.1. --- srcpkgs/embree/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template index 0ad27b78ec..03f9ad6243 100644 --- a/srcpkgs/embree/template +++ b/srcpkgs/embree/template @@ -1,6 +1,6 @@ # Template file for 'embree' pkgname=embree -version=2.16.0 +version=2.16.1 revision=1 only_for_archs="x86_64" build_style=cmake @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://embree.github.io/" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=ece381d4cd94dedab6ddf3b0edca0666c8564ba5180516eef745a9b57bb97555 +checksum=4091994a2f947fdf9e22a8087be00f1c8453ff87dcba5aac0a5a710c2f23879e nopie=y From 71ca4bb45b5a3ac5bf0db10dbf508b1e4b33b2ff Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 20 May 2017 17:34:15 +0200 Subject: [PATCH 0635/1145] etcd: update to 3.1.8. --- srcpkgs/etcd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index adeb77d0f0..c1a1dd960b 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,6 +1,6 @@ # Template file for 'etcd' pkgname=etcd -version=3.1.7 +version=3.1.8 revision=1 build_style=go short_desc="Distributed reliable key-value store" @@ -10,7 +10,7 @@ hostmakedepends="git glide" go_import_path="github.com/coreos/etcd" homepage="https://coreos.com/etcd/docs/latest/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=41cbfc6744c76aa1735e11c82e6f6ff03c88dc88810938cf6eb80930dc994b2a +checksum=f68700f710dfd9c5fefb41a60e96f9d0c7907e6abe21518ab0a05f6e425a3d4e conf_files="/etc/sv/etcd/conf" system_accounts="etcd" make_dirs="/var/lib/etcd 0755 etcd etcd" From 19ee3615b32aefe928b7f12faa2aa2f66a32033d Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 20 May 2017 17:36:15 +0200 Subject: [PATCH 0636/1145] kubernetes: update to 1.6.4. --- srcpkgs/kubernetes/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 79da1156e2..258347940f 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.6.3 +version=1.6.4 revision=1 build_style=go nocross=yes @@ -12,7 +12,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=903f4fe7c943e0e07ccb225a4ec2065baa07a80b9e9ff915d869199a0112effd +checksum=8042628d49fd8d2382ad487a08b89d68b72d3dbaf24c1cc7c452ae7c72e9c0b9 system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" From d061e791179f1767e265e3c5f39a162e295993a1 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 20 May 2017 17:43:54 +0200 Subject: [PATCH 0637/1145] libguestfs: update to 1.37.14. --- srcpkgs/libguestfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index e1836d6297..4ae08ae05e 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,6 +1,6 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.37.13 +version=1.37.14 revision=1 _version_short=${version%.*} build_style=gnu-configure @@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/$_version_short-development/$pkgname-$version.tar.gz" -checksum=92e252683c555ec77acf12d340f4e24878bdd73858e9475419ef6c86446e63a3 +checksum=2f7727c5440502a4df46128c7b074a24744b540c300c2582a0c67f0bc2877e5d conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf From d0e5e7e6321f25f1184b47dad9255ad1ebf36c75 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 20 May 2017 17:48:50 +0200 Subject: [PATCH 0638/1145] python-CherryPy: update to 10.2.2. --- srcpkgs/python-CherryPy/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-CherryPy/template b/srcpkgs/python-CherryPy/template index ab1c8d1960..7a4882d47c 100644 --- a/srcpkgs/python-CherryPy/template +++ b/srcpkgs/python-CherryPy/template @@ -1,7 +1,7 @@ # Template file for 'python-CherryPy' pkgname=python-CherryPy -version=10.2.1 -revision=2 +version=10.2.2 +revision=1 noarch=yes wrksrc="CherryPy-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="3-clause-BSD" homepage="http://www.cherrypy.org" distfiles="${PYPI_SITE}/C/CherryPy/CherryPy-${version}.tar.gz" -checksum=2ee7e514de0167b63233a6bba25dda2bb9d5ef800da8ea3a0282a9a57a382274 +checksum=32d93334df765c7fd5d22815ab643333e850f0cc4f6d51fee62a68f23eea8ff8 alternatives="cherrypy:cherryd:/usr/bin/cherryd2" post_install() { From 69ea6c9928998c1c98512046587b6ff7a5c4d0dd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 20 May 2017 17:57:27 +0200 Subject: [PATCH 0639/1145] jo: update to 1.1. --- srcpkgs/jo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jo/template b/srcpkgs/jo/template index 68e1bf3056..8efcd0e176 100644 --- a/srcpkgs/jo/template +++ b/srcpkgs/jo/template @@ -1,6 +1,6 @@ # Template file for 'jo' pkgname=jo -version=1.0 +version=1.1 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -9,7 +9,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/jpmens/jo" license="GPL-2" distfiles="https://github.com/jpmens/jo/releases/download/v${version}/jo-${version}.tar.gz" -checksum=d66ec97258d1afad15643fb2d5b5e807153a732ba45c2417adc66669acbde52e +checksum=63ed4766c2e0fcb5391a14033930329369f437d7060a11d82874e57e278bda5f pre_configure() { autoreconf -fi From cb0f33843b84bb251649495970dcfd3a91f06213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 20 May 2017 19:30:03 +0200 Subject: [PATCH 0640/1145] libunique: fix gcc7 build --- srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch diff --git a/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch new file mode 100644 index 0000000000..5309f45b2f --- /dev/null +++ b/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch @@ -0,0 +1,11 @@ +--- unique/uniqueapp.c 2011-06-14 14:26:26.000000000 +0200 ++++ unique/uniqueapp.c 2017-05-20 19:27:59.043332852 +0200 +@@ -175,7 +175,7 @@ + { + gchar *id; + +- if (startup_id && startup_id != '\0') ++ if (startup_id && *startup_id != '\0') + id = g_strdup (startup_id); + else + { From 4d6e92abc359324c219bb26bae97d90af70142aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 20 May 2017 19:34:56 +0200 Subject: [PATCH 0641/1145] libmp4v2: fix gcc7 build --- srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch diff --git a/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch new file mode 100644 index 0000000000..4428386c51 --- /dev/null +++ b/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch @@ -0,0 +1,11 @@ +--- src/rtphint.cpp 2012-05-21 00:11:53.000000000 +0200 ++++ src/rtphint.cpp 2017-05-20 19:33:12.524731466 +0200 +@@ -339,7 +339,7 @@ + pSlash = strchr(pSlash, '/'); + if (pSlash != NULL) { + pSlash++; +- if (pSlash != '\0') { ++ if (*pSlash != '\0') { + length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); + *ppEncodingParams = (char *)MP4Calloc(length + 1); + strncpy(*ppEncodingParams, pSlash, length); From a761d8e268aa9f7c43af66343bc6502399092771 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 20 May 2017 20:18:09 +0200 Subject: [PATCH 0642/1145] linux4.11: update to 4.11.2. --- srcpkgs/linux4.11/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.11/template b/srcpkgs/linux4.11/template index 59613d0751..1972d60b3b 100644 --- a/srcpkgs/linux4.11/template +++ b/srcpkgs/linux4.11/template @@ -1,7 +1,7 @@ # Template file for 'linux4.11' pkgname=linux4.11 -version=4.11.1 -revision=2 +version=4.11.2 +revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=7e46f9e216907942b0b07f2bb59708dc33501d4e2a0938164396386ebd21e608 +checksum=bb149395a9e7e49728c824914c30943698e952693fbd1dd0106bad91a59f622c nodebug=yes # -dbg package is generated below manually nostrip=yes From 315fa72042e17af12a9e12f11352fbcb5374ba41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 20 May 2017 20:21:41 +0200 Subject: [PATCH 0643/1145] ruby: fix gcc7 build for i686* With gcc-7.1.0 -fstack-protector or -fstack-protector-strong fail to link because of undefined references to __stack_chk_fail_local. This patch is merely a hack to make ruby build until the root cause for this bug is found. --- srcpkgs/ruby/template | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index cba5e28515..4e17ba25e5 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -28,6 +28,16 @@ pre_build() { sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb # Hack for cross-builds. touch ext/ripper/check + if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then + # Set -fno-stack-protector for i686* or otherwise linking fails with + # ...: undefined reference to `__stack_chk_fail_local' + case "$XBPS_TARGET_MACHINE" in + i686*) sed -i Makefile \ + -e "s;-fstack-protector-strong;;" \ + -e "s;-fstack-protector;-fno-stack-protector;" + ;; + esac + fi } post_install() { # Remove references to the cross compiler From 18a6db671af71c82acd10175ab627ab7c05279f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 20 May 2017 20:51:58 +0200 Subject: [PATCH 0644/1145] zeitgeist: update to 1.0 --- srcpkgs/zeitgeist/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index 63b824ba61..098a4166de 100644 --- a/srcpkgs/zeitgeist/template +++ b/srcpkgs/zeitgeist/template @@ -1,10 +1,11 @@ # Template file for 'zeitgeist' pkgname=zeitgeist -version=0.9.16 -revision=2 +version=1.0 +revision=1 build_style=gnu-configure configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool vala-devel $(vopt_if gir gobject-introspection)" +hostmakedepends="automake libtool pkg-config gettext-devel + intltool vala-devel $(vopt_if gir gobject-introspection)" makedepends=" python-rdflib json-glib-devel gtk+3-devel telepathy-glib-devel python-gobject-devel dbus-devel sqlite-devel xapian-core-devel raptor" @@ -14,8 +15,8 @@ short_desc="Logs the users’ activities and events" maintainer="Juan RP " homepage="http://zeitgeist-project.com" license="LGPL-2.1" -distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.xz" -checksum=6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a +distfiles="https://launchpad.net/${pkgname}/${version}/${version}/+download/${pkgname}-${version}.tar.xz" +checksum=5ff508508f7a7b46acc9fbf1cf73fecb1aec214e18d9d22325aae8c2c2e8ddc8 # Package build options build_options="gir" @@ -24,6 +25,10 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi +pre_configure() { + NOCONFIGURE=1 autoreconf -fi +} + post_install() { rm -rf ${DESTDIR}/usr/doc } From b6e78a4cbb3f9a3dcc0db7a66a417158a03c7af9 Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Sat, 20 May 2017 15:03:09 -0600 Subject: [PATCH 0645/1145] obs: update to 19.0.1 --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 04e6c40c70..7e2ca5a8cc 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=18.0.2 +version=19.0.1 revision=1 wrksrc=obs-studio-${version} only_for_archs="i686 x86_64 i686-musl x86_64-musl" @@ -15,7 +15,7 @@ maintainer="lemmi " license="GPL-2" homepage="https://obsproject.com" distfiles="https://github.com/jp9000/obs-studio/archive/${version}.tar.gz" -checksum=1cfbad3439b1d581b4f5b47792ccc4dae231acaf37178808811ff4e2b68feb0a +checksum=922aca3d098d43a9f82d79fffd004c6cdcf699912a69895bbd707dd29cd01c85 obs-devel_package() { short_desc+=" - development files" From 2ddbf683bf71496727adbc3941dd75ad3535372e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 20 May 2017 18:10:00 +0200 Subject: [PATCH 0646/1145] rrdtool: update to 1.7.0. --- srcpkgs/rrdtool/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template index 479417f369..e42b926061 100644 --- a/srcpkgs/rrdtool/template +++ b/srcpkgs/rrdtool/template @@ -1,9 +1,9 @@ # Template file for 'rrdtool' pkgname=rrdtool -version=1.6.0 -revision=3 +version=1.7.0 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config groff intltool" +hostmakedepends="pkg-config groff intltool python-setuptools" makedepends="libxml2-devel pango-devel python-devel ruby-devel LuaJIT-devel perl" depends="dejavu-fonts-ttf" short_desc="Data logging and graphing system for time series data" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="http://oss.oetiker.ch/${pkgname}" distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz" -checksum=cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 +checksum=f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b configure_args="--enable-perl --enable-perl-site-install --with-perl-options=INSTALLDIRS=vendor --enable-ruby --enable-ruby-site-install --enable-python --enable-lua From 884edbfb6c917aadd5c176abe5c2ccc9a25ef9e8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 20 May 2017 23:04:10 +0200 Subject: [PATCH 0647/1145] retroshare: update to 0.6.2. --- srcpkgs/retroshare/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index b3569a4114..a70def838b 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare -version=0.6.1 -revision=3 +version=0.6.2 +revision=1 build_style=qmake wrksrc="RetroShare-${version}" homepage="http://retroshare.github.io" @@ -15,4 +15,10 @@ makedepends="qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel libXScrnSaver-devel libxslt-devel libcurl-devel ffmpeg-devel speex-devel pulseaudio-devel" distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz" -checksum=4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42 +checksum=76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b + +post_extract() { + sed -i \ + 's/OPENSSL_VERSION_NUMBER < 0x10100000L/\0 || defined(LIBRESSL_VERSION_NUMBER)/' \ + `grep -lr 'OPENSSL_VERSION_NUMBER < 0x10100000L'` +} From 76cf5584068ac7dea70d6d9fc6829f15f96f70ef Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 20 May 2017 23:06:54 +0200 Subject: [PATCH 0648/1145] NetworkManager-openvpn: update to 1.2.10. --- srcpkgs/NetworkManager-openvpn/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template index b570414a19..22a50156ec 100644 --- a/srcpkgs/NetworkManager-openvpn/template +++ b/srcpkgs/NetworkManager-openvpn/template @@ -1,6 +1,6 @@ # Template build file for 'NetworkManager-openvpn'. pkgname=NetworkManager-openvpn -version=1.2.8 +version=1.2.10 revision=1 lib32disabled=yes build_style=gnu-configure @@ -13,5 +13,4 @@ homepage="https://wiki.gnome.org/Projects/NetworkManager" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" license="GPL-2" maintainer="Enno Boland " -checksum=3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654 -LDFLAGS="-ldl" +checksum=ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 From 27bf261bbe25c67bbc360f91db1d5c05bd1170ef Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 20 May 2017 23:34:12 +0200 Subject: [PATCH 0649/1145] gsoap: update to 2.8.46. --- srcpkgs/gsoap/patches/fix-libressl.patch | 43 ------------------------ srcpkgs/gsoap/patches/libressl.patch | 40 ++++++++++++++++++++++ srcpkgs/gsoap/patches/musl-fixes.patch | 22 ++++++++++++ srcpkgs/gsoap/template | 9 ++--- 4 files changed, 65 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/gsoap/patches/fix-libressl.patch create mode 100644 srcpkgs/gsoap/patches/libressl.patch create mode 100644 srcpkgs/gsoap/patches/musl-fixes.patch diff --git a/srcpkgs/gsoap/patches/fix-libressl.patch b/srcpkgs/gsoap/patches/fix-libressl.patch deleted file mode 100644 index a8bdfb6e37..0000000000 --- a/srcpkgs/gsoap/patches/fix-libressl.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- gsoap/plugin/smdevp.c.orig 2017-01-15 20:09:56.876555589 +0100 -+++ gsoap/plugin/smdevp.c 2017-01-15 20:10:50.012509531 +0100 -@@ -306,6 +306,40 @@ the digest or signature produced. - extern "C" { - #endif - -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) -+static EVP_MD_CTX *EVP_MD_CTX_new(void) -+{ -+ EVP_MD_CTX *ctx = (EVP_MD_CTX *)malloc(sizeof(*ctx)); -+ if (ctx != NULL) -+ EVP_MD_CTX_init(ctx); -+ return ctx; -+} -+ -+static void EVP_MD_CTX_free(EVP_MD_CTX *ctx) -+{ -+ if (ctx != NULL) { -+ EVP_MD_CTX_cleanup(ctx); -+ free(ctx); -+ } -+} -+ -+static HMAC_CTX *HMAC_CTX_new(void) -+{ -+ HMAC_CTX *ctx = (HMAC_CTX *)malloc(sizeof(*ctx)); -+ if (ctx != NULL) -+ HMAC_CTX_init(ctx); -+ return ctx; -+} -+ -+static void HMAC_CTX_free(HMAC_CTX *ctx) -+{ -+ if (ctx != NULL) { -+ HMAC_CTX_cleanup(ctx); -+ free(ctx); -+ } -+} -+#endif -+ - /******************************************************************************\ - * - * Static protos diff --git a/srcpkgs/gsoap/patches/libressl.patch b/srcpkgs/gsoap/patches/libressl.patch new file mode 100644 index 0000000000..71ff17383c --- /dev/null +++ b/srcpkgs/gsoap/patches/libressl.patch @@ -0,0 +1,40 @@ +diff --git a/gsoap/plugin/smdevp.c b/gsoap/plugin/smdevp.c +index a42d7be..193f470 100644 +--- gsoap/plugin/smdevp.c ++++ gsoap/plugin/smdevp.c +@@ -479,7 +479,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data *data, int alg, const void + /* allocate and init the OpenSSL HMAC or EVP_MD context */ + if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); + if (data->ctx) + HMAC_CTX_init((HMAC_CTX*)data->ctx); +@@ -489,7 +489,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data *data, int alg, const void + } + else + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX)); + if (data->ctx) + EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx); +@@ -642,7 +642,7 @@ soap_smd_final(struct soap *soap, struct soap_smd_data *data, char *buf, int *le + *len = (int)n; + } + /* cleanup */ +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); + else +@@ -687,7 +687,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data *data, int ok, const char + } + if (data->ctx) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(OPENSSL_VERSION_NUMBER) + if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); + else diff --git a/srcpkgs/gsoap/patches/musl-fixes.patch b/srcpkgs/gsoap/patches/musl-fixes.patch new file mode 100644 index 0000000000..9ac981727e --- /dev/null +++ b/srcpkgs/gsoap/patches/musl-fixes.patch @@ -0,0 +1,22 @@ +--- ./gsoap/stdsoap2.cpp.orig ++++ ./gsoap/stdsoap2.cpp +@@ -18691,7 +18691,7 @@ + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if defined(_GNU_SOURCE) && !defined(__ANDROID__) ++# if defined(_GNU_SOURCE) && !defined(__ANDROID__) && defined(__GLIBC__) + return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ + # else + strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ +--- ./gsoap/stdsoap2.h.orig ++++ ./gsoap/stdsoap2.h +@@ -943,7 +943,7 @@ + # endif + #elif defined(SOCKLEN_T) + # define SOAP_SOCKLEN_T SOCKLEN_T +-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) ++#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) || defined (LINUX) + # define SOAP_SOCKLEN_T socklen_t + #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + # define SOAP_SOCKLEN_T int diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index 5855363ec8..e35526cc82 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,6 +1,6 @@ # Template file for 'gsoap' pkgname=gsoap -version=2.8.45 +version=2.8.46 revision=1 build_style=gnu-configure hostmakedepends="unzip flex autoconf" @@ -13,13 +13,10 @@ maintainer="Enno Boland " license="GPL-3" homepage="http://www.cs.fsu.edu/~engelen/soap.html" distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip" -checksum=81946d1ecd99ea414383d5f090e6b292908ff3ac0211cb097a1d1d54e9808bce +checksum=3083818fb42b9e7251daf21728132db15354eb8c14060c2dc6949dafbec976be wrksrc="${pkgname}-${version%.*}" disable_parallel_build=yes - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/11649/steps/shell_3/logs/stdio";; -esac +configure_args=" --enable-ipv6" gsoap-devel_package() { depends="gsoap>=${version}_${revision} $makedepends" From 646dcdc5ff96ba7297a74c2d7bcebcb3ef0aeaa8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 20 May 2017 23:36:31 +0200 Subject: [PATCH 0650/1145] libgexiv2: update to 0.10.6. --- srcpkgs/libgexiv2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template index 2f46c3b93b..bd722d30bd 100644 --- a/srcpkgs/libgexiv2/template +++ b/srcpkgs/libgexiv2/template @@ -1,6 +1,6 @@ # Template file for 'libgexiv2' pkgname=libgexiv2 -version=0.10.5 +version=0.10.6 revision=1 wrksrc="${pkgname/lib/}-${version}" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://wiki.gnome.org/Projects/gexiv2" distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz" -checksum=318fe068cd414c0af91759a87c29fd577cd5d42bf7a6f50caff27535c02ac7f3 +checksum=132788919667254b42c026ab39ab3c3a5be59be8575c05fa4b371ca8aed55825 libgexiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" From e403aff883b1082de58a352edecf7d1efeed3486 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 20 May 2017 23:38:43 +0200 Subject: [PATCH 0651/1145] vigra: update to 1.11.1. --- srcpkgs/vigra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vigra/template b/srcpkgs/vigra/template index 34bbc69795..589cb4db3b 100644 --- a/srcpkgs/vigra/template +++ b/srcpkgs/vigra/template @@ -1,6 +1,6 @@ # Template file for 'vigra' pkgname=vigra -version=1.11.0 +version=1.11.1 revision=1 build_style=cmake configure_args="-DWITH_OPENEXR=1" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://ukoethe.github.io/vigra/" distfiles="https://github.com/ukoethe/vigra/archive/Version-${version//./-}.tar.gz" -checksum=cae4838a2cc92ca52eafa621ab848df2e61399bbd77b2b945db35068fb50c86b +checksum=b2718250d28baf1932fcbe8e30f7e4d146e751ad0e726e375a72a0cdb4e3250e wrksrc=$pkgname-Version-${version//./-} pre_configure() { From 05dccbba254524b29a6bf1e9db6f990ed81d8e4a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 00:16:35 +0200 Subject: [PATCH 0652/1145] retroshare: fix musl. --- srcpkgs/retroshare/patches/musl.patch | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/srcpkgs/retroshare/patches/musl.patch b/srcpkgs/retroshare/patches/musl.patch index d0acb38696..87db0292dd 100644 --- a/srcpkgs/retroshare/patches/musl.patch +++ b/srcpkgs/retroshare/patches/musl.patch @@ -25,3 +25,32 @@ +#endif // defined(__linux__) && defined(__GLIBC__) #endif // _STACKTRACE_H_ +--- libretroshare/src/util/rsdir.cc.orig 2017-05-21 00:02:56.024215330 +0200 ++++ libretroshare/src/util/rsdir.cc 2017-05-21 00:05:01.129867612 +0200 +@@ -57,6 +57,25 @@ + #include + #endif + ++#ifndef __GLIBC__ ++#include ++#include ++#include ++#include ++static char * canonicalize_file_name(const char *path) ++{ ++ char buf[PATH_MAX] = { }; ++ ++ snprintf(buf, sizeof(buf) - 1, "%s", path); ++ ++ if (!realpath(path, buf)) ++ return NULL; ++ ++ return strdup(buf); ++} ++#endif ++ ++ + /**** + * #define RSDIR_DEBUG 1 + ****/ + From 528d65026996cb4dcdedb1fe7fe49b63d4d5faa6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 20 May 2017 22:23:09 +0000 Subject: [PATCH 0653/1145] httrack: update to 3.49.2. --- srcpkgs/httrack/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template index eace2a6bbb..976a52c61e 100644 --- a/srcpkgs/httrack/template +++ b/srcpkgs/httrack/template @@ -1,7 +1,7 @@ # Template file for 'httrack' pkgname="httrack" -version=3.49.1 -revision=2 +version=3.49.2 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr" short_desc="A free and easy-to-use offline browser utility" @@ -9,7 +9,7 @@ maintainer="mid-kid " license="GPL-3" homepage="http://www.httrack.com" distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz" -checksum=8640ab00cabc9189667cc88829620ce08ac796688f0ef94876350d14fbe7a842 +checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025 makedepends="zlib-devel libressl-devel" httrack-devel_package() { From 637f80d57f07dedd78124b4e4021ad73a6318bc0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 20 May 2017 22:36:39 +0000 Subject: [PATCH 0654/1145] pcsclite: update to 1.8.21. --- srcpkgs/pcsclite/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template index b8472cba3c..840d2feb0c 100644 --- a/srcpkgs/pcsclite/template +++ b/srcpkgs/pcsclite/template @@ -1,6 +1,6 @@ # Template file for 'pcsclite' pkgname=pcsclite -version=1.8.20 +version=1.8.21 revision=1 wrksrc="pcsc-lite-${version}" build_style=gnu-configure @@ -12,8 +12,8 @@ configure_args="--enable-libudev --sbindir=/usr/bin" hostmakedepends="intltool pkg-config python" makedepends="eudev-libudev-devel libusb-devel python-devel" depends="python" -distfiles="https://alioth.debian.org/frs/download.php/file/4203/pcsc-lite-${version}.tar.bz2" -checksum=ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 +distfiles="https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-${version}.tar.bz2" +checksum=fe3365eb7d4ce0fe891e2b6d6248351c287435ca502103f1f1431b1710e513ad post_install() { vsv pcscd From 6c1446734bb5db9f371ff4a3b9db2891c1eca622 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 20 May 2017 22:36:45 +0000 Subject: [PATCH 0655/1145] ImageMagick: update to 6.9.8.6. --- srcpkgs/ImageMagick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index ead6cf0f39..384c600417 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=6.9.8 -_patchver=5 +_patchver=6 version=${_majorver}.${_patchver} revision=1 wrksrc=${pkgname}-${_majorver}-${_patchver} @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.imagemagick.org/" license="ImageMagick" distfiles="http://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" -checksum=33404592e3c11f1887dafc0ee0f5161ba89ed3d5c9198a877ac90c94edb87856 +checksum=dc587a30457d1b42fa980fe7d94bfad906407ad811335e60f5eb673b3a17afeb subpackages="libmagick libmagick-devel" From 3e4eeab56e15eea494ef31fed6b075f6b6cb5aeb Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 00:49:46 +0200 Subject: [PATCH 0656/1145] retroshare: improve musl patch, thanks @ebfe --- srcpkgs/retroshare/patches/musl.patch | 19 ++----------------- srcpkgs/retroshare/template | 2 +- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/srcpkgs/retroshare/patches/musl.patch b/srcpkgs/retroshare/patches/musl.patch index 87db0292dd..eb76a83232 100644 --- a/srcpkgs/retroshare/patches/musl.patch +++ b/srcpkgs/retroshare/patches/musl.patch @@ -27,28 +27,13 @@ #endif // _STACKTRACE_H_ --- libretroshare/src/util/rsdir.cc.orig 2017-05-21 00:02:56.024215330 +0200 +++ libretroshare/src/util/rsdir.cc 2017-05-21 00:05:01.129867612 +0200 -@@ -57,6 +57,25 @@ +@@ -57,6 +57,10 @@ #include #endif +#ifndef __GLIBC__ -+#include -+#include -+#include -+#include -+static char * canonicalize_file_name(const char *path) -+{ -+ char buf[PATH_MAX] = { }; -+ -+ snprintf(buf, sizeof(buf) - 1, "%s", path); -+ -+ if (!realpath(path, buf)) -+ return NULL; -+ -+ return strdup(buf); -+} ++#define canonicalize_file_name(p) realpath(p, NULL) +#endif -+ + /**** * #define RSDIR_DEBUG 1 diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index a70def838b..d04ec9ad42 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,7 +1,7 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.2 -revision=1 +revision=2 build_style=qmake wrksrc="RetroShare-${version}" homepage="http://retroshare.github.io" From 160599519bc3d1607a0d1753d163715904bfcd88 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 08:28:32 +0200 Subject: [PATCH 0657/1145] pkgconf: update to 1.3.7. --- srcpkgs/pkgconf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index d107c4c982..7a1c752ff8 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,6 +1,6 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.3.6 +version=1.3.7 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/pkgconf/pkgconf" distfiles="$homepage/archive/$pkgname-$version.tar.gz" -checksum=95331d7e77c43a253cc677f87a319b5f8e36b163b715dc155df2711fcddd5437 +checksum=0c624678e8a8b027b532830b01c6d99542c3f967b28ccff9933b52a8a1009677 wrksrc="$pkgname-$pkgname-$version" pre_configure() { From d1c59884dfc37504249ae479ddba38a2d47edc8f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 17:14:47 +0200 Subject: [PATCH 0658/1145] libplist: fix crosbuild --- srcpkgs/libplist/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index eac3263a74..66f6b77220 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -1,7 +1,7 @@ # Template file for 'libplist' pkgname=libplist version=2.0.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkg-config python-devel python-Cython" @@ -12,13 +12,11 @@ license="GPL-2, LGPL-2.1" homepage="http://libimobiledevice.org/" distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2" checksum=3a7e9694c2d9a85174ba1fa92417cfabaea7f6d19631e544948dc7e17e82f602 - -nocross="investigate why this works with aarch64 but not arm[67]" +CPPFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python2.7" +LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib -lpython2.7" pre_configure() { sed -i 's,-L$(libdir),,g' cython/Makefile.am - export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" - export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython2.7" autoreconf -fi } From 1c413e169d2aba8f7b5f2bf6411d375d25734160 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 17:28:28 +0200 Subject: [PATCH 0659/1145] libplist: fix crossbuild --- srcpkgs/libplist/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index 66f6b77220..ad6275bdf8 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -1,7 +1,7 @@ # Template file for 'libplist' pkgname=libplist version=2.0.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkg-config python-devel python-Cython" @@ -12,12 +12,13 @@ license="GPL-2, LGPL-2.1" homepage="http://libimobiledevice.org/" distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2" checksum=3a7e9694c2d9a85174ba1fa92417cfabaea7f6d19631e544948dc7e17e82f602 -CPPFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python2.7" -LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib -lpython2.7" pre_configure() { sed -i 's,-L$(libdir),,g' cython/Makefile.am + export PYTHON_CPPFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/python2.7" + export PYTHON_LDFLAGS=" -L${XBPS_CROSS_BASE}/usr/lib -lpython2.7" autoreconf -fi + sed -i "s#\$PYTHON-config#__DOES_NOT_EXIST__#" configure } libplist++_package() { From dc068adfeba7aabca89317ebee72e78a854d181f Mon Sep 17 00:00:00 2001 From: Nero Date: Sun, 21 May 2017 15:57:41 +0000 Subject: [PATCH 0660/1145] screenFetch: update to 3.8.0 --- srcpkgs/screenFetch/patches/void-fixes.patch | 55 ++++++++++---------- srcpkgs/screenFetch/template | 6 +-- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/srcpkgs/screenFetch/patches/void-fixes.patch b/srcpkgs/screenFetch/patches/void-fixes.patch index 0c0e713e47..9df92bfc18 100644 --- a/srcpkgs/screenFetch/patches/void-fixes.patch +++ b/srcpkgs/screenFetch/patches/void-fixes.patch @@ -1,6 +1,6 @@ ---- ./screenfetch-dev.orig 2015-07-14 08:32:02.000000000 -0400 -+++ ./screenfetch-dev 2015-12-30 17:39:02.668091221 -0500 -@@ -500,6 +500,11 @@ +--- ./screenfetch-dev.orig 2017-03-10 13:55:45.000000000 +0000 ++++ ./screenfetch-dev 2017-05-21 15:54:48.717974375 +0000 +@@ -587,6 +587,11 @@ distro="Viperr" distro_codename=null ;; @@ -10,36 +10,37 @@ + distro_release="" + ;; *) - ;; - esac -@@ -558,7 +563,6 @@ + if [ "x$(printf "${distro_detect}" | od -t x1 | sed -e 's/^\w*\ *//' | tr '\n' ' ' | grep 'eb b6 89 ec 9d 80 eb b3 84 ')" != "x" ]; then + distro="Red Star OS" +@@ -664,7 +669,7 @@ fi # Hotfixes -- [[ "${distro}" == "Void" || "${distro}" == "void" ]] && distro="Void" +- [[ "${distro}" == "void" ]] && distro="Void" ++ [[ "${distro}" == "void" ]] && distro="Void Linux" [[ "${distro}" == "evolveos" ]] && distro="Evolve OS" - [[ "${distro}" == "antergos" || "${distro}" == "Antergos" ]] && distro="Antergos" - [[ "${distro}" == "logos" || "${distro}" == "Logos" ]] && distro="Logos" -@@ -757,7 +761,7 @@ - trisquel) distro="Trisquel";; - parabolagnu|parabolagnu/linux-libre|'parabola gnu/linux-libre'|parabola) distro="Parabola GNU/Linux-libre" ;; + [[ "${distro}" == "antergos" ]] && distro="Antergos" + [[ "${distro}" == "logos" ]] && distro="Logos" +@@ -978,7 +983,7 @@ + fi + ;; viperr) distro="Viperr" ;; - void) distro="Void" ;; + void*linux) distro="Void Linux" ;; - kaos) distro="KaOS";; - linuxdeepin) distro="LinuxDeepin" ;; - deepin) distro="Deepin" ;; -@@ -846,7 +850,7 @@ - 'Gentoo'|'Sabayon'|'Funtoo') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;; + esac + verboseOut "Finding distro...found as '${distro} ${distro_release}'" + } +@@ -1073,7 +1078,7 @@ + 'Gentoo'|'Sabayon'|'Funtoo'|'Kogaion') pkgs=$(ls -d /var/db/pkg/*/* | wc -l) ;; 'NixOS') pkgs=$(ls -d -1 /nix/store/*/ | wc -l) ;; - 'Fedora'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'Red Hat Enterprise Linux'|'CentOS'|'Mandriva'|'Mandrake'|'Mageia'|'Viperr') pkgs=$(rpm -qa | wc -l) ;; + 'Fedora'|'Fux'|'Korora'|'BLAG'|'Chapeau'|'openSUSE'|'SUSE Linux Enterprise'|'Red Hat Enterprise Linux'|'ROSA'|'Oracle Linux'|'CentOS'|'Mandriva'|'Mandrake'|'Mageia'|'Mer'|'SailfishOS'|'PCLinuxOS'|'Viperr'|'Qubes OS'|'Red Star OS') pkgs=$(rpm -qa | wc -l) ;; - 'Void') pkgs=$(xbps-query -l | wc -l) ;; + 'Void Linux') pkgs=$(xbps-query -l | wc -l) ;; 'Evolve OS'|'Solus') pkgs=$(pisi list-installed | wc -l) ;; 'CRUX') pkgs=$(pkginfo -i | wc -l) ;; 'Lunar Linux') pkgs=$(lvu installed | wc -l) ;; -@@ -3655,7 +3659,7 @@ - "${c1} \`.:+ooyyddddddddddddyyso+:.\`") +@@ -4461,7 +4466,7 @@ + "${c1} \`.:+ooyyddddddddddddyyso+:.\` %s") ;; - "Void") @@ -47,12 +48,12 @@ if [[ "$no_color" != "1" ]]; then c1=$(getColor 'green') # Dark Green c2=$(getColor 'light green') # Light Green -@@ -3905,7 +3909,7 @@ +@@ -5081,7 +5086,7 @@ case ${myascii} in - "Arch Linux - Old"|"Fedora"|"Korora"|"Chapeau"|"Mandriva"|"Mandrake"|"Chakra"|"ChromeOS"|"Sabayon"|"Slackware"|"Mac OS X"|"Trisquel"|"Kali Linux"|"Jiyuu Linux"|"Antergos"|"KaOS"|"Logos"|"gNewSense"|"NixOS") labelcolor=$(getColor 'light blue');; + "Alpine Linux"|"Arch Linux - Old"|"Fedora"|"Korora"|"Chapeau"|"Mandriva"|"Mandrake"|"Chakra"|"ChromeOS"|"Sabayon"|"Slackware"|"Mac OS X"|"Trisquel"|"Kali Linux"|"Jiyuu Linux"|"Antergos"|"KaOS"|"Logos"|"gNewSense"|"Netrunner"|"NixOS"|"SailfishOS"|"Qubes OS"|"Kogaion"|"PCLinuxOS"|"Obarun"|"Solus"|"SwagArch"|"Parrot Security") labelcolor=$(getColor 'light blue');; "Arch Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX") labelcolor=$(getColor 'light cyan');; -- "Mint"|"LMDE"|"openSUSE"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void") labelcolor=$(getColor 'light green');; -+ "Mint"|"LMDE"|"openSUSE"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void Linux") labelcolor=$(getColor 'light green');; - "Ubuntu"|"FreeBSD"|"FreeBSD - Old"|"Debian"|"Raspbian"|"BSD"|"Red Hat Enterprise Linux"|"Peppermint"|"Cygwin"|"Fuduntu"|"NetBSD"|"Scientific Linux"|"DragonFlyBSD"|"BackTrack Linux") labelcolor=$(getColor 'light red');; - "CrunchBang"|"Solus"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');; - "Gentoo"|"Parabola GNU/Linux-libre"|"Funtoo"|"Funtoo-text"|"BLAG") labelcolor=$(getColor 'light purple');; +- "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void") labelcolor=$(getColor 'light green');; ++ "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"|"Manjaro-tree"|"Android"|"Void Linux") labelcolor=$(getColor 'light green');; + "Ubuntu"|"FreeBSD"|"FreeBSD - Old"|"Debian"|"Raspbian"|"BSD"|"Red Hat Enterprise Linux"|"Oracle Linux"|"Peppermint"|"Cygwin"|"Msys"|"Fuduntu"|"Scientific Linux"|"DragonFlyBSD"|"BackTrack Linux"|"Red Star OS"|"SparkyLinux") labelcolor=$(getColor 'light red');; + "ROSA") labelcolor=$(getColor 'white');; + "CrunchBang"|"Viperr"|"elementary"*) labelcolor=$(getColor 'dark grey');; diff --git a/srcpkgs/screenFetch/template b/srcpkgs/screenFetch/template index 407a5f1108..2c54a1da4f 100644 --- a/srcpkgs/screenFetch/template +++ b/srcpkgs/screenFetch/template @@ -1,7 +1,7 @@ # Template file for 'screenFetch' pkgname=screenFetch -version=3.7.0 -revision=5 +version=3.8.0 +revision=1 noarch=yes depends="bash xdpyinfo" short_desc="Bash screenshot information tool" @@ -9,7 +9,7 @@ maintainer="Eivind Uggedal " license="GPL-3" homepage="https://github.com/KittyKatt/screenFetch" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=6711fe924833919d53c1dfbbb43f3777d33e20357a1b1536c4472f6a1b3c6be0 +checksum=248283ee3c24b0dbffb79ed685bdd518554073090c1c167d07ad2a729db26633 do_install() { vbin screenfetch-dev screenfetch From 9368d16f2e8d06e412d3bb0764163db80d970356 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 18:37:03 +0200 Subject: [PATCH 0661/1145] p8-platform: update to 2.1.0.1. --- common/shlibs | 2 +- srcpkgs/p8-platform/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 41b2539afe..3966933978 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2104,7 +2104,7 @@ libembree.so.2 embree-2.5.1_1 libgtkimageview.so.0 gtkimageview-1.6.4_1 libgoocanvas.so.3 goocanvas1-1.0.0_1 libplatform.so.2.0 platform-2.0.1_1 -libp8-platform.so.2.0 p8-platform-2.0.1_1 +libp8-platform.so.2 p8-platform-2.1.0.1_1 libfacter.so.3.6.2 facter-3.6.2_1 libOIS-1.3.0.so ois-1.3_1 libSILLY.so.1 silly-0.1.0_1 diff --git a/srcpkgs/p8-platform/template b/srcpkgs/p8-platform/template index bab5afbad2..27db8a61c0 100644 --- a/srcpkgs/p8-platform/template +++ b/srcpkgs/p8-platform/template @@ -1,6 +1,6 @@ # Template file for 'p8-platform' pkgname=p8-platform -version=2.0.1 +version=2.1.0.1 revision=1 build_style=cmake short_desc="Platform support library used by libCEC (Pulse Eight Edition)" @@ -8,7 +8,7 @@ maintainer="Enno Boland " license="GPL-2" homepage="https://github.com/Pulse-Eight/platform" distfiles="https://github.com/Pulse-Eight/platform/archive/p8-platform-$version.tar.gz" -checksum=e97e45273e90571aa37732cde913b262f5f519c387083645d2557d7189c054cf +checksum=064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0 configure_args+=" -DBUILD_SHARED_LIBS=1" wrksrc=platform-$pkgname-$version @@ -17,8 +17,8 @@ post_install() { if [ -d $DESTDIR/usr/lib64 ]; then mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib fi - sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/p8-platform/p8-platform-config.cmake $DESTDIR/usr/lib/pkgconfig/p8-platform.pc mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib + sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/p8-platform/p8-platform-config.cmake $DESTDIR/usr/lib/pkgconfig/p8-platform.pc } p8-platform-devel_package() { From 1edf7c37e6db21e8f5782a1e6113fbf84c0d0a81 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 18:37:14 +0200 Subject: [PATCH 0662/1145] libcec: update to 4.0.2. --- common/shlibs | 2 +- srcpkgs/libcec/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3966933978..c660f3974d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1167,7 +1167,7 @@ libmmal_core.so rpi-userland-0.0.0.0.20150907_1 libmmal_util.so rpi-userland-0.0.0.0.20150907_1 libOpenVG.so rpi-userland-0.0.0.0.20150907_1 liblockdev.so.1 lockdev-1.0.3_1 -libcec.so.3 libcec-3.1.0_1 +libcec.so.4 libcec-4.0.2_1 librump.so.0 netbsd-rumpkernel-20130321_1 librumpvfs.so.0 netbsd-rumpkernel-20130321_1 librumpdev_disk.so.0 netbsd-rumpkernel-20130321_1 diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index cf145da46d..9bd07757ca 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,6 +1,6 @@ # Template file for 'libcec' pkgname=libcec -version=3.1.0 +version=4.0.2 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="https://github.com/Pulse-Eight/libcec" license="GPL-2" distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz" -checksum=09109d21a1b03f42c9e341d12600f2e4c41038d640269fa75408e2d36126f921 +checksum=b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27 build_options="rpi" case "$XBPS_TARGET_MACHINE" in @@ -30,8 +30,8 @@ post_install() { if [ -d $DESTDIR/usr/lib64 ]; then mv $DESTDIR/usr/lib64/* $DESTDIR/usr/lib fi - sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/pkgconfig/libcec.pc mv $DESTDIR/$wrksrc/build/lib*/* $DESTDIR/usr/lib + sed -i "s#$wrksrc/build/##" $DESTDIR/usr/lib/pkgconfig/libcec.pc } cec-client_package() { From 2c9a4a8b5f833f97e589fd7f64e2495e5c5e4354 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 18:02:41 +0200 Subject: [PATCH 0663/1145] kodi: rebuild with libcec-4.0.2 --- srcpkgs/kodi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index dfef8d77c5..6c337b66d9 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=17.1 -revision=1 +revision=2 patch_args="-Np1" _codename="Krypton" wrksrc="xbmc-${version}-${_codename}" From c57fbf7966109a10caed302f1c8908888f90b016 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 18:41:36 +0200 Subject: [PATCH 0664/1145] kodi-rpi: update to 17.1. --- srcpkgs/kodi-rpi/patches/cross-fix.patch | 24 - .../disable-static-texturepacker-build.patch | 1 + .../kodi-rpi/patches/kodi-16-ffmpeg3.patch | 641 ------------------ srcpkgs/kodi-rpi/patches/versioncheck.patch | 1 + srcpkgs/kodi-rpi/template | 11 +- 5 files changed, 7 insertions(+), 671 deletions(-) delete mode 100644 srcpkgs/kodi-rpi/patches/cross-fix.patch create mode 120000 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch delete mode 100644 srcpkgs/kodi-rpi/patches/kodi-16-ffmpeg3.patch create mode 120000 srcpkgs/kodi-rpi/patches/versioncheck.patch diff --git a/srcpkgs/kodi-rpi/patches/cross-fix.patch b/srcpkgs/kodi-rpi/patches/cross-fix.patch deleted file mode 100644 index 9991a9b66f..0000000000 --- a/srcpkgs/kodi-rpi/patches/cross-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/configure.ac.orig 2015-07-23 23:49:37.887069973 +0200 -+++ b/configure.ac 2015-07-23 23:51:40.074074325 +0200 -@@ -2170,15 +2170,12 @@ else - final_message="$final_message\n Bluray:\tNo" - fi - --# we don't compile with default upstream squish, so we use our own one --# even on non unified deps platforms --if test "$cross_compiling" != "yes"; then -- make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX} -- export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH" --fi --PKG_CHECK_MODULES([SQUISH], [squish], -- [INCLUDES="$INCLUDES $SQUISH_CFLAGS" LIBS="$LIBS $SQUISH_LIBS"], -- AC_MSG_ERROR("squish not found")) -+make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX} -+SQUISH_CFLAGS="-I${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/include " -+SQUISH_LIBS="-L${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib -lsquish " -+INCLUDES="$INCLUDES $SQUISH_CFLAGS" -+LIBS="$LIBS $SQUISH_LIBS" -+ - - if test "x$use_texturepacker" != "xno"; then - AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"], diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch new file mode 120000 index 0000000000..fa11d3a8c4 --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch @@ -0,0 +1 @@ +../../kodi/patches/disable-static-texturepacker-build.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/kodi-16-ffmpeg3.patch b/srcpkgs/kodi-rpi/patches/kodi-16-ffmpeg3.patch deleted file mode 100644 index 755af69f8f..0000000000 --- a/srcpkgs/kodi-rpi/patches/kodi-16-ffmpeg3.patch +++ /dev/null @@ -1,641 +0,0 @@ - -Changes from original commit are only in file paths & quilt refresh. - -commit c31b7d374062f87c7512d9872cbceac920465913 -Author: Philip Langdale -Date: Mon Sep 21 19:49:36 2015 -0700 - - ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master - - The deprecated PixelFormat and PIX_FMT_* names have been removed in - ffmpeg master. - -Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h -+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h -@@ -24,7 +24,6 @@ - #include "utils/CPUInfo.h" - - extern "C" { --#include "libswscale/swscale.h" - #include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - #include "libavutil/avutil.h" -@@ -33,23 +32,6 @@ extern "C" { - #include "libpostproc/postprocess.h" - } - --inline int SwScaleCPUFlags() --{ -- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); -- int flags = 0; -- -- if (cpuFeatures & CPU_FEATURE_MMX) -- flags |= SWS_CPU_CAPS_MMX; -- if (cpuFeatures & CPU_FEATURE_MMX2) -- flags |= SWS_CPU_CAPS_MMX2; -- if (cpuFeatures & CPU_FEATURE_3DNOW) -- flags |= SWS_CPU_CAPS_3DNOW; -- if (cpuFeatures & CPU_FEATURE_ALTIVEC) -- flags |= SWS_CPU_CAPS_ALTIVEC; -- -- return flags; --} -- - inline int PPCPUFlags() - { - unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -@@ -39,7 +39,7 @@ extern "C" { - #include "libswscale/swscale.h" - } - --// allocate a new picture (PIX_FMT_YUV420P) -+// allocate a new picture (AV_PIX_FMT_YUV420P) - DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight) - { - DVDVideoPicture* pPicture = new DVDVideoPicture; -@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert - - int dstformat; - if (format == RENDER_FMT_UYVY422) -- dstformat = PIX_FMT_UYVY422; -+ dstformat = AV_PIX_FMT_UYVY422; - else -- dstformat = PIX_FMT_YUYV422; -+ dstformat = AV_PIX_FMT_YUYV422; - -- struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P, -+ struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P, - pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat, -- SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ SWS_BILINEAR, NULL, NULL, NULL); - sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride); - sws_freeContext(ctx); - } -@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur - } - - struct EFormatMap { -- PixelFormat pix_fmt; -+ AVPixelFormat pix_fmt; - ERenderFormat format; - }; - - static const EFormatMap g_format_map[] = { -- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P } --, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } --, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } --, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } --, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } --, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } --, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } --, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } --, { PIX_FMT_NONE , RENDER_FMT_NONE } -+ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P } -+, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } -+, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } -+, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } -+, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } -+, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } -+, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } -+, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } -+, { AV_PIX_FMT_NONE , RENDER_FMT_NONE } - }; - - ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt) - { -- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) -+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) - { - if(p->pix_fmt == fmt) - return p->format; -@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro - - int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt) - { -- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) -+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) - { - if(p->format == fmt) - return p->pix_fmt; - } -- return PIX_FMT_NONE; -+ return AV_PIX_FMT_NONE; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -77,8 +77,8 @@ enum DecoderState - STATE_SW_MULTI - }; - --enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx -- , const PixelFormat * fmt ) -+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx -+ , const AVPixelFormat * fmt ) - { - CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque; - -@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G - avctx->hwaccel_context = 0; - } - -- const PixelFormat * cur = fmt; -- while(*cur != PIX_FMT_NONE) -+ const AVPixelFormat * cur = fmt; -+ while(*cur != AV_PIX_FMT_NONE) - { - #ifdef HAVE_LIBVDPAU - if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU)) -@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G - #endif - #ifdef HAVE_LIBVA - // mpeg4 vaapi decoding is disabled -- if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) -+ if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) - { - VAAPI::CDecoder* dec = new VAAPI::CDecoder(); - if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true) -@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre - - for(std::vector::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it) - { -- m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); -+ m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); - if(*it == RENDER_FMT_YUV420P) -- m_formats.push_back(PIX_FMT_YUVJ420P); -+ m_formats.push_back(AV_PIX_FMT_YUVJ420P); - } -- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ -+ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ - - pCodec = avcodec_find_decoder(hints.codec); - -@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom - pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc; - pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace; - if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG -- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P) -+ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P) - pDvdVideoPicture->color_range = 1; - else - pDvdVideoPicture->color_range = 0; -@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV - pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED; - pDvdVideoPicture->extended_format = 0; - -- PixelFormat pix_fmt; -- pix_fmt = (PixelFormat)m_pFrame->format; -+ AVPixelFormat pix_fmt; -+ pix_fmt = (AVPixelFormat)m_pFrame->format; - - pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt); - return true; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -@@ -46,7 +46,7 @@ public: - public: - IHardwareDecoder() {} - virtual ~IHardwareDecoder() {}; -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0; -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0; - virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0; - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0; - virtual int Check (AVCodecContext* avctx) = 0; -@@ -77,7 +77,7 @@ public: - void SetHardware(IHardwareDecoder* hardware); - - protected: -- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt); -+ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt); - - int FilterOpen(const std::string& filters, bool scale); - void FilterClose(); -@@ -119,7 +119,7 @@ protected: - int m_iLastKeyframe; - double m_dts; - bool m_started; -- std::vector m_formats; -+ std::vector m_formats; - double m_decoderPts; - int m_skippedDeint; - bool m_requestSkipDeint; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop( - - void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture) - { -- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P. -+ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P. - struct SwsContext *swcontext = sws_getContext( -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422, -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - if (swcontext) - { - uint8_t *src[] = { yuv422_ptr, 0, 0, 0 }; -@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42 - - void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture) - { -- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P. -+ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P. - struct SwsContext *swcontext = sws_getContext( -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA, -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - if (swcontext) - { - uint8_t *src[] = { bgra_ptr, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo - return true; - } - --bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) - { - if (!CheckCompatibility(avctx)) - return false; -@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder() - return true; - } - --bool CDecoder::Supports(enum PixelFormat fmt) -+bool CDecoder::Supports(enum AVPixelFormat fmt) - { -- if(fmt == PIX_FMT_DXVA2_VLD) -+ if(fmt == AV_PIX_FMT_DXVA2_VLD) - return true; - return false; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -@@ -141,7 +141,7 @@ class CDecoder - public: - CDecoder(); - ~CDecoder(); -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual int Check (AVCodecContext* avctx); -@@ -154,7 +154,7 @@ public: - int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); - void RelBuffer(uint8_t *data); - -- static bool Supports(enum PixelFormat fmt); -+ static bool Supports(enum AVPixelFormat fmt); - - void CloseDXVADecoder(); - -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -@@ -479,7 +479,7 @@ CDecoder::~CDecoder() - Close(); - } - --bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) - { - // don't support broken wrappers by default - // nvidia cards with a vaapi to vdpau wrapper -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -@@ -406,7 +406,7 @@ public: - CDecoder(); - virtual ~CDecoder(); - -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual void Reset(); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -@@ -186,7 +186,7 @@ void CDecoder::Close() - m_bitstream = NULL; - } - --bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) - { - Close(); - -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -@@ -35,7 +35,7 @@ class CDecoder - public: - CDecoder(); - ~CDecoder(); -- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode(AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual int Check(AVCodecContext* avctx); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_ - m_vdpauConfig.context = 0; - } - --bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) - { - // check if user wants to decode this format with VDPAU - std::string gpuvendor = g_Windowing.GetRenderVendor(); -@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct - return 0; - } - --bool CDecoder::IsVDPAUFormat(PixelFormat format) -+bool CDecoder::IsVDPAUFormat(AVPixelFormat format) - { - if (format == AV_PIX_FMT_VDPAU) - return true; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -@@ -556,7 +556,7 @@ public: - CDecoder(); - virtual ~CDecoder(); - -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual void Reset(); -@@ -571,7 +571,7 @@ public: - bool Supports(VdpVideoMixerFeature feature); - bool Supports(EINTERLACEMETHOD method); - EINTERLACEMETHOD AutoInterlaceMethod(); -- static bool IsVDPAUFormat(PixelFormat fmt); -+ static bool IsVDPAUFormat(AVPixelFormat fmt); - - static void FFReleaseBuffer(void *opaque, uint8_t *data); - static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack - - // for video we need a decoder to get desired information into codec context - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata && -- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) -+ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE)) - { - // open a decoder, it will be cleared down by ffmpeg on closing the stream - if (!st->codec->codec) -@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() - st = m_pFormatContext->streams[idx]; - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { -- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) -+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) - return true; - hasVideo = true; - } -@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() - st = m_pFormatContext->streams[i]; - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { -- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) -+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) - return true; - hasVideo = true; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp -@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st - - uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4]; - struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight, -- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); - - if (context) - { -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - } - else if (m_format == RENDER_FMT_NV12) - { -- srcFormat = PIX_FMT_NV12; -+ srcFormat = AV_PIX_FMT_NV12; - for (int i = 0; i < 2; i++) - { - src[i] = im->plane[i]; -@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - } - else if (m_format == RENDER_FMT_YUYV422) - { -- srcFormat = PIX_FMT_YUYV422; -+ srcFormat = AV_PIX_FMT_YUYV422; - src[0] = im->plane[0]; - srcStride[0] = im->stride[0]; - } - else if (m_format == RENDER_FMT_UYVY422) - { -- srcFormat = PIX_FMT_UYVY422; -+ srcFormat = AV_PIX_FMT_UYVY422; - src[0] = im->plane[0]; - srcStride[0] = im->stride[0]; - } -@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - - m_context = sws_getCachedContext(m_context, - im->width, im->height, (AVPixelFormat)srcFormat, -- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - - uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 }; - int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; -@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - - if (m_format == RENDER_FMT_YUV420P) - { -- srcFormat = PIX_FMT_YUV420P; -+ srcFormat = AV_PIX_FMT_YUV420P; - for (int i = 0; i < 3; i++) - { - srcTop[i] = im->plane[i]; -@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_NV12) - { -- srcFormat = PIX_FMT_NV12; -+ srcFormat = AV_PIX_FMT_NV12; - for (int i = 0; i < 2; i++) - { - srcTop[i] = im->plane[i]; -@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_YUYV422) - { -- srcFormat = PIX_FMT_YUYV422; -+ srcFormat = AV_PIX_FMT_YUYV422; - srcTop[0] = im->plane[0]; - srcStrideTop[0] = im->stride[0] * 2; - srcBot[0] = im->plane[0] + im->stride[0]; -@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_UYVY422) - { -- srcFormat = PIX_FMT_UYVY422; -+ srcFormat = AV_PIX_FMT_UYVY422; - srcTop[0] = im->plane[0]; - srcStrideTop[0] = im->stride[0] * 2; - srcBot[0] = im->plane[0] + im->stride[0]; -@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I - - m_context = sws_getCachedContext(m_context, - im->width, im->height >> 1, (AVPixelFormat)srcFormat, -- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 }; - uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 }; - int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu - #endif - { - m_sw_context = sws_getCachedContext(m_sw_context, -- im->width, im->height, PIX_FMT_YUV420P, -- im->width, im->height, PIX_FMT_RGBA, -+ im->width, im->height, AV_PIX_FMT_YUV420P, -+ im->width, im->height, AV_PIX_FMT_RGBA, - SWS_FAST_BILINEAR, NULL, NULL, NULL); - - uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp -@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer() - UnInit(); - } - --static enum PixelFormat PixelFormatFromFormat(ERenderFormat format) -+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format) - { -- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12; -- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P; -- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10; -- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16; -- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12; -- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422; -- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422; -- return PIX_FMT_NONE; -+ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12; -+ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P; -+ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10; -+ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16; -+ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12; -+ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422; -+ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422; -+ return AV_PIX_FMT_NONE; - } - - void CWinRenderer::ManageTextures() -@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags) - - void CWinRenderer::RenderSW() - { -- enum PixelFormat format = PixelFormatFromFormat(m_format); -+ enum AVPixelFormat format = PixelFormatFromFormat(m_format); - - // 1. convert yuv to rgb - m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx, - m_sourceWidth, m_sourceHeight, format, -- m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - - YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer]; - -Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp -+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp -@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi - uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch, - CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */) - { -- struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA, -- out_width, out_height, PIX_FMT_BGRA, -- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL); -+ struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA, -+ out_width, out_height, AV_PIX_FMT_BGRA, -+ CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL); - - uint8_t *src[] = { in_pixels, 0, 0, 0 }; - int srcStride[] = { (int)in_pitch, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp -+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp -@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas - return false; - - // Due to a bug in swsscale we need to allocate one extra line of data -- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) -+ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) - return false; - } - -@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas - - // We got the video frame, render it into the picture buffer - struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt, -- m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); -+ m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); - - sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height, - m_pFrameRGB->data, m_pFrameRGB->linesize ); diff --git a/srcpkgs/kodi-rpi/patches/versioncheck.patch b/srcpkgs/kodi-rpi/patches/versioncheck.patch new file mode 120000 index 0000000000..5f2d4e169d --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/versioncheck.patch @@ -0,0 +1 @@ +../../kodi/patches/versioncheck.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 21610a64cc..2c86d9c526 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,16 +1,16 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi -version=16.1 -revision=5 +version=17.1 +revision=1 patch_args="-Np1" -_codename="Jarvis" +_codename="Krypton" wrksrc="xbmc-${version}-${_codename}" short_desc="A software media player and entertainment hub for digital media (RPi)" maintainer="Juan RP " homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" -checksum=7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 +checksum=303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee nopie=yes only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" @@ -100,8 +100,7 @@ do_configure() { --with-ffmpeg=shared \ ac_cv_path_JAVA_EXE=/bin/true - - sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i lib/libdvd/libdvd{nav,read}/Makefile + sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i tools/depends/target/libdvd{nav,read}/Makefile } do_build() { make ${makejobs} From e6264533c0f51d1921d5c43ddd5eb2c7244c8747 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 19:14:39 +0200 Subject: [PATCH 0665/1145] kodi-rpi: fix musl cross compile --- srcpkgs/kodi-rpi/patches/fix-musl-cross.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/kodi-rpi/patches/fix-musl-cross.patch diff --git a/srcpkgs/kodi-rpi/patches/fix-musl-cross.patch b/srcpkgs/kodi-rpi/patches/fix-musl-cross.patch new file mode 100644 index 0000000000..587ad0c213 --- /dev/null +++ b/srcpkgs/kodi-rpi/patches/fix-musl-cross.patch @@ -0,0 +1,20 @@ +--- a/configure.ac.orig 2017-05-21 19:04:34.705518286 +0200 ++++ b/configure.ac 2017-05-21 19:05:10.431442782 +0200 +@@ -611,7 +611,7 @@ case $host in + CORE_SYSTEM_NAME=linux + ARCH="powerpc64-linux" + ;; +- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) ++ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*) + target_platform=target_linux + CORE_SYSTEM_NAME=linux + ARCH="arm" +@@ -621,7 +621,7 @@ case $host in + use_gl=no + USE_STATIC_FFMPEG=1 + ;; +- aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*) ++ aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*|aarch64*-*-linux-musl*) + target_platform=target_linux + ARCH="aarch64" + use_arch="aarch64" From 05c5cf4fba4c350ac0209ac71d70c2be0746ec3a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 May 2017 21:28:04 +0200 Subject: [PATCH 0666/1145] kodi-rpi: broken --- srcpkgs/kodi-rpi/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 2c86d9c526..9af076fc31 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -12,6 +12,8 @@ license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" checksum=303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee +broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/2841/steps/shell_3/logs/stdio" + nopie=yes only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" From ca58bb8c394e79e9598e82d5021abc5c6c9834a1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 20:51:56 +0000 Subject: [PATCH 0667/1145] tiff: update to 4.0.8. --- srcpkgs/tiff/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template index 2a4ae7962f..cf031b1f61 100644 --- a/srcpkgs/tiff/template +++ b/srcpkgs/tiff/template @@ -1,6 +1,6 @@ # Template build file for 'tiff'. pkgname=tiff -version=4.0.7 +version=4.0.8 revision=1 build_style=gnu-configure configure_args="--enable-cxx --without-x" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="BSD" homepage="http://libtiff.maptools.org/" distfiles="http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" -checksum=9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 +checksum=59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 pre_configure() { autoreconf -fi From 36990e026ff722f45e87f7482335197609ba5fd8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 20:56:03 +0000 Subject: [PATCH 0668/1145] ncmpcpp: update to 0.8. --- srcpkgs/ncmpcpp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index becd8dc2fa..d43676e314 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp -version=0.7.7 -revision=5 +version=0.8 +revision=1 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode @@ -14,7 +14,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://ncmpcpp.rybczak.net/" distfiles="http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2" -checksum=b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef +checksum=2f0f2a1c0816119430880be6932e5eb356b7875dfa140e2453a5a802909f465a # Required by waddwstr() with ncurses on musl CXXFLAGS="-D_XOPEN_SOURCE=600" From f102a821324b501afd3a02d7afc3830f096bcfcc Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 20:57:19 +0000 Subject: [PATCH 0669/1145] pcsc-ccid: update to 1.4.27. --- srcpkgs/pcsc-ccid/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template index 19621cca6b..549ad0aa57 100644 --- a/srcpkgs/pcsc-ccid/template +++ b/srcpkgs/pcsc-ccid/template @@ -3,7 +3,7 @@ # in distfiles also changes. You will have to look at # the download page and find it in the download link. pkgname=pcsc-ccid -version=1.4.26 +version=1.4.27 revision=1 wrksrc=ccid-${version} build_style=gnu-configure @@ -14,8 +14,8 @@ short_desc="PC/SC driver to support CCID compliant readers" maintainer="Jürgen Buchmüller " license="LGPL-2.1" homepage="http://pcsclite.alioth.debian.org/ccid.html" -distfiles="https://alioth.debian.org/frs/download.php/file/4205/ccid-${version}.tar.bz2" -checksum=3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f +distfiles="https://alioth.debian.org/frs/download.php/file/4218/ccid-${version}.tar.bz2" +checksum=a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137 post_install() { vinstall src/92_pcscd_ccid.rules 644 usr/lib/udev/rules.d/ From 1c849aa93aa251c983c5843c93329953df020c17 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 18 May 2017 17:07:09 +0000 Subject: [PATCH 0670/1145] New package: perl-Glib-Object-Introspection-0.042 --- srcpkgs/perl-Glib-Object-Introspection/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-Glib-Object-Introspection/template diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template new file mode 100644 index 0000000000..50bcee0187 --- /dev/null +++ b/srcpkgs/perl-Glib-Object-Introspection/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Glib-Object-Introspection' +pkgname=perl-Glib-Object-Introspection +version=0.042 +revision=1 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +nocross=yes +hostmakedepends="perl" +makedepends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib libgirepository-devel" +depends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib" +short_desc="Dynamically create Perl language bindings" +maintainer="Michael Gehring " +license="LGPL-3" +homepage="http://search.cpan.org/~tsch/Glib-Object-Introspection/" +distfiles="http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/Glib-Object-Introspection-${version}.tar.gz" +checksum=0101aa45417a80a066fae198e37dc9814abf24afab454d72909070ab5c8293d9 From d6d7d1483817e593683318045f32799496a726b7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 22:21:06 +0000 Subject: [PATCH 0671/1145] gmusicbrowser: switch to gstreamer1 --- srcpkgs/gmusicbrowser/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gmusicbrowser/template b/srcpkgs/gmusicbrowser/template index fe60bf8253..c2c19b3daf 100644 --- a/srcpkgs/gmusicbrowser/template +++ b/srcpkgs/gmusicbrowser/template @@ -1,13 +1,13 @@ # Template file for 'gmusicbrowser' pkgname=gmusicbrowser version=1.1.15 -revision=4 +revision=5 noarch=yes nocross=yes hostmakedepends="perl" -makedepends="perl-Gtk2 perl-GStreamer-Interfaces" -depends="perl-Gtk2 desktop-file-utils mpg123 perl-GStreamer-Interfaces - gst-plugins-base gst-plugins-good" +makedepends="perl-Gtk2 perl-Glib-Object-Introspection" +depends="desktop-file-utils mpg123 perl-Glib-Object-Introspection + gst-plugins-base1 gst-plugins-good1 gst-libav" short_desc="Open-source jukebox for large collections" maintainer="Logen K " license="GPL-3" From 51fcbb4022bee8f587a7780e6a6db47cb7c7922f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:29:55 +0000 Subject: [PATCH 0672/1145] perl-GStreamer-Interfaces: remove (gstreamer 0.x) --- srcpkgs/perl-GStreamer-Interfaces/template | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 srcpkgs/perl-GStreamer-Interfaces/template diff --git a/srcpkgs/perl-GStreamer-Interfaces/template b/srcpkgs/perl-GStreamer-Interfaces/template deleted file mode 100644 index f664480f5f..0000000000 --- a/srcpkgs/perl-GStreamer-Interfaces/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'perl-GStreamer-Interfaces' -pkgname=perl-GStreamer-Interfaces -version=0.06 -revision=2 -_author=TSCH -wrksrc=${pkgname#perl-}-${version} -build_style=perl-module -hostmakedepends="perl" -makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib perl-GStreamer - gstreamer-devel gst-plugins-base-devel" -depends="perl-GStreamer" -short_desc="Interfaces for perl-GStreamer" -maintainer="Jürgen Buchmüller " -license="GPL-2 Artistic" -homepage="http://search.cpan.org/dist/GStreamer-Interfaces" -distfiles="http://www.cpan.org/authors/id/${_author:0:1}/${_author:0:2}/${_author}/${pkgname#perl-}-${version}.tar.gz" -checksum=fe0ea7305d6e33ef854fd3de7908b6985d562a111cf0694374b4fb09caeeb16b From 357dee3593f9f44bff26eb650a227fc08a5d58f4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:30:19 +0000 Subject: [PATCH 0673/1145] perl-Gstreamer: remove (gstreamer 0.x) --- srcpkgs/perl-GStreamer/template | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 srcpkgs/perl-GStreamer/template diff --git a/srcpkgs/perl-GStreamer/template b/srcpkgs/perl-GStreamer/template deleted file mode 100644 index a78cac96a2..0000000000 --- a/srcpkgs/perl-GStreamer/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'perl-GStreamer' -pkgname=perl-GStreamer -version=0.20 -revision=2 -_author=XAOC -wrksrc="${pkgname#perl-}-${version}" -build_style=perl-module -hostmakedepends="perl" -makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib gstreamer-devel" -depends="perl>=5.20 perl-Glib" -short_desc="Perl interface to the GStreamer library" -maintainer="Jürgen Buchmüller " -homepage="http://gtk2-perl.sourceforge.net/doc/pod/GStreamer.html" -license="GPL-2 Artistic" -distfiles="http://www.cpan.org/authors/id/${_author:0:1}/${_author:0:2}/${_author}/GStreamer-${version}.tar.gz" -checksum=5469e0433481cecef67d988eb039d719a229bfd6884d0d90cda69fef7f4bf8b7 From 335a129d5388bd5405d2b4fbabf89e28f2a32e60 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:54:17 +0000 Subject: [PATCH 0674/1145] gst-python: remove (gstreamer 0.x) --- srcpkgs/gst-python-devel | 1 - srcpkgs/gst-python/template | 35 ----------------------------------- srcpkgs/gst-python/update | 1 - 3 files changed, 37 deletions(-) delete mode 120000 srcpkgs/gst-python-devel delete mode 100644 srcpkgs/gst-python/template delete mode 100644 srcpkgs/gst-python/update diff --git a/srcpkgs/gst-python-devel b/srcpkgs/gst-python-devel deleted file mode 120000 index cb1c2984a9..0000000000 --- a/srcpkgs/gst-python-devel +++ /dev/null @@ -1 +0,0 @@ -gst-python \ No newline at end of file diff --git a/srcpkgs/gst-python/template b/srcpkgs/gst-python/template deleted file mode 100644 index 75b7d28467..0000000000 --- a/srcpkgs/gst-python/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'gst-python'. -pkgname=gst-python -version=0.10.22 -revision=8 -lib32disabled=yes -build_style=gnu-configure -configure_args="--disable-static --with-libpython-dir=${XBPS_CROSS_BASE}/usr/lib/python2.7/config" -hostmakedepends="pkg-config python" -makedepends="glib-devel python-devel pygtk-devel - libxml2-devel gstreamer-devel gst-plugins-base-devel" -depends="pygtk" -pycompile_module="gst-0.10" -short_desc="Python bindings for GStreamer 0.10" -maintainer="Juan RP " -license="LGPL-2.1" -homepage="http://gstreamer.freedesktop.org" -distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.bz2" -checksum=8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 - -pre_configure() { - if [ "$CROSS_BUILD" ]; then - sed -i -e "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure - fi -} - -gst-python-devel_package() { - lib32disabled=yes - depends="${sourcepkg}-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/gst-python - } -} diff --git a/srcpkgs/gst-python/update b/srcpkgs/gst-python/update deleted file mode 100644 index 923fcac1f4..0000000000 --- a/srcpkgs/gst-python/update +++ /dev/null @@ -1 +0,0 @@ -ignore="1.*" From 3609795b1603df230b00756ee2ae09f757bf6943 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:54:52 +0000 Subject: [PATCH 0675/1145] gst-ffmpeg: remove (gstreamer 0.x) --- ...4897e325349dacf2546674e0510bb72ecb50.patch | 52 ------------------- ...adaf346bc5e38183427b2bd11084c11d1c8b.patch | 22 -------- srcpkgs/gst-ffmpeg/template | 21 -------- srcpkgs/gst-ffmpeg/update | 1 - 4 files changed, 96 deletions(-) delete mode 100644 srcpkgs/gst-ffmpeg/patches/ffmpeg.git-5f654897e325349dacf2546674e0510bb72ecb50.patch delete mode 100644 srcpkgs/gst-ffmpeg/patches/ffmpeg.git-9a83adaf346bc5e38183427b2bd11084c11d1c8b.patch delete mode 100644 srcpkgs/gst-ffmpeg/template delete mode 100644 srcpkgs/gst-ffmpeg/update diff --git a/srcpkgs/gst-ffmpeg/patches/ffmpeg.git-5f654897e325349dacf2546674e0510bb72ecb50.patch b/srcpkgs/gst-ffmpeg/patches/ffmpeg.git-5f654897e325349dacf2546674e0510bb72ecb50.patch deleted file mode 100644 index 6720bbba47..0000000000 --- a/srcpkgs/gst-ffmpeg/patches/ffmpeg.git-5f654897e325349dacf2546674e0510bb72ecb50.patch +++ /dev/null @@ -1,52 +0,0 @@ -Subject: [PATCH 1/1] A cmp instruction with two constants is invalid, thus - "g" constraint is not correct but must be "rm" instead. - -Signed-off-by: Reimar Däffinger -Signed-off-by: Michael Niedermayer ---- - libavcodec/x86/h264_qpel_mmx.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libavcodec/x86/h264_qpel_mmx.c b/libavcodec/x86/h264_qpel_mmx.c -index d8ceca1..f5af44e 100644 ---- gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -+++ gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -@@ -398,7 +398,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst, - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ static av_always_inline void OPNAME ## h264_qpel8or16_hv1_lowpass_ ## MMX(int16_ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ static av_noinline void OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst, - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ static av_always_inline void put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp, u - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" --- -1.7.10 - diff --git a/srcpkgs/gst-ffmpeg/patches/ffmpeg.git-9a83adaf346bc5e38183427b2bd11084c11d1c8b.patch b/srcpkgs/gst-ffmpeg/patches/ffmpeg.git-9a83adaf346bc5e38183427b2bd11084c11d1c8b.patch deleted file mode 100644 index 490673ec6e..0000000000 --- a/srcpkgs/gst-ffmpeg/patches/ffmpeg.git-9a83adaf346bc5e38183427b2bd11084c11d1c8b.patch +++ /dev/null @@ -1,22 +0,0 @@ -This is equivalent to -http://git.videolan.org/?p=ffmpeg.git;a=patch;h=9a83adaf346bc5e38183427b2bd11084c11d1c8b - ---- gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S 2011-11-02 16:16:24.000000000 +0100 -+++ gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S 2015-07-11 19:49:51.024078695 +0200 -@@ -37,14 +37,14 @@ - ldrb r10, [r4], #1 - 1: - ldrsh r9, [r0], #2 @ mask[band] -- movw r8, #0x1fe0 -+ mov r8, #0xff0 - sub r9, r9, r12 @ - snr_offset - mov r11, r10 - ldrb r10, [r4], #1 @ band_start_tab[band++] - subs r9, r9, r5 @ - floor - movlt r9, #0 - cmp r10, r3 @ - end -- and r9, r9, r8 @ & 0x1fe0 -+ and r9, r9, r8, lsl #1 @ & 0x1fe0 - subgt r8, r3, r11 - suble r8, r10, r11 - add r9, r9, r5 @ + floor => m diff --git a/srcpkgs/gst-ffmpeg/template b/srcpkgs/gst-ffmpeg/template deleted file mode 100644 index 2ee83f60ee..0000000000 --- a/srcpkgs/gst-ffmpeg/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'gst-ffmpeg' -pkgname=gst-ffmpeg -version=0.10.13 -revision=6 -lib32disabled=yes -build_style=gnu-configure -configure_args="--with-ffmpeg-extra-configure=--enable-runtime-cpudetect" -hostmakedepends="pkg-config yasm python" -makedepends="zlib-devel orc-devel glib-devel gstreamer-devel gst-plugins-base-devel libxml2-devel" -short_desc="GStreamer FFmpeg plugins" -maintainer="Juan RP " -license="GPL-2" -homepage="http://gstreamer.freedesktop.org" -distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.bz2" -checksum=76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62 - -pre_configure() { - # Fix cross compiling for arm* where os=linuxeabihf - sed -i ${wrksrc}/gst-libs/ext/libav/configure \ - -e "s;linux);linux*);" -} diff --git a/srcpkgs/gst-ffmpeg/update b/srcpkgs/gst-ffmpeg/update deleted file mode 100644 index f4f610d94f..0000000000 --- a/srcpkgs/gst-ffmpeg/update +++ /dev/null @@ -1 +0,0 @@ -ignore="0.11.*" From 74defa08fd7cebb90e57016a300b3575e8929273 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:56:10 +0000 Subject: [PATCH 0676/1145] gst-editing-services: remove (gstreamer 0.x) --- common/shlibs | 1 - srcpkgs/gst-editing-services-devel | 1 - srcpkgs/gst-editing-services/template | 24 ------------------------ srcpkgs/gst-editing-services/update | 2 -- 4 files changed, 28 deletions(-) delete mode 120000 srcpkgs/gst-editing-services-devel delete mode 100644 srcpkgs/gst-editing-services/template delete mode 100644 srcpkgs/gst-editing-services/update diff --git a/common/shlibs b/common/shlibs index c660f3974d..d791115ba0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2316,7 +2316,6 @@ libax25.so.0 libax25-0.0.12rc4_1 libax25io.so.0 libax25-0.0.12rc4_1 libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 -libges-0.10.so.0 gst-editing-services-0.10.1_1 libykneomgr.so.0 libykneomgr-0.1.8_1 libopenshot-audio.so.3 libopenshot-audio-0.0.6_1 libopenshot.so.9 libopenshot-0.1.2_1 diff --git a/srcpkgs/gst-editing-services-devel b/srcpkgs/gst-editing-services-devel deleted file mode 120000 index 40e555f190..0000000000 --- a/srcpkgs/gst-editing-services-devel +++ /dev/null @@ -1 +0,0 @@ -gst-editing-services \ No newline at end of file diff --git a/srcpkgs/gst-editing-services/template b/srcpkgs/gst-editing-services/template deleted file mode 100644 index 6f485adf4c..0000000000 --- a/srcpkgs/gst-editing-services/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'gst-editing-services' -pkgname=gst-editing-services -version=0.10.1 -revision=1 -wrksrc="${pkgname/gst/gstreamer}-${version}" -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="glib-devel gst-plugins-base-devel" -short_desc="GStreamer 0.10 Editing Services" -maintainer="Toyam Cox " -license="LGPL-2" -homepage="http://gstreamer.freedesktop.org/modules/${pkgname}.html" -distfiles="https://gstreamer.freedesktop.org/src/${pkgname}/${pkgname/gst/gstreamer}-${version}.tar.gz" -checksum=410a282989fcc3bfcd5ab8df5ba102570df55e64cf1424f936119d5e303c4895 - -gst-editing-services-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/gst-editing-services/update b/srcpkgs/gst-editing-services/update deleted file mode 100644 index e43a73c8c8..0000000000 --- a/srcpkgs/gst-editing-services/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=gstreamer-editing-services -ignore="1.*" From 4a63f843ef7da4c63ea982bcbc52b86b190df6a8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:57:44 +0000 Subject: [PATCH 0677/1145] gst-plugins-bad: remove (gstreamer 0.x) --- common/shlibs | 2 - srcpkgs/gst-plugins-bad-devel | 1 - .../patches/drop-vpx-compat-defs.patch | 26 ------------- .../patches/fix-CESA-2016-0002.patch | 22 ----------- .../patches/libmodplug-0.8.8.5.patch | 11 ------ srcpkgs/gst-plugins-bad/template | 37 ------------------- srcpkgs/gst-plugins-bad/update | 1 - 7 files changed, 100 deletions(-) delete mode 120000 srcpkgs/gst-plugins-bad-devel delete mode 100644 srcpkgs/gst-plugins-bad/patches/drop-vpx-compat-defs.patch delete mode 100644 srcpkgs/gst-plugins-bad/patches/fix-CESA-2016-0002.patch delete mode 100644 srcpkgs/gst-plugins-bad/patches/libmodplug-0.8.8.5.patch delete mode 100644 srcpkgs/gst-plugins-bad/template delete mode 100644 srcpkgs/gst-plugins-bad/update diff --git a/common/shlibs b/common/shlibs index d791115ba0..ac6d3bfd9c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -687,8 +687,6 @@ libgmime-2.6.so.0 gmime-2.6.4_1 libtotem-plparser.so.18 totem-pl-parser-3.10.0_1 libtotem-plparser-mini.so.18 totem-pl-parser-3.10.0_1 libgladeui-2.so.6 libgladeui3-3.10.0_1 -libgstcodecparsers-0.10.so.23 gst-plugins-bad-0.10.23_1 -libgstbasevideo-0.10.so.23 gst-plugins-bad-0.10.23_1 libtdb.so.1 libtdb-1.2.2_1 libgssdp-1.0.so.3 gssdp-0.9.0_1 libgupnp-1.0.so.4 gupnp-0.18.0_1 diff --git a/srcpkgs/gst-plugins-bad-devel b/srcpkgs/gst-plugins-bad-devel deleted file mode 120000 index 59d84b631c..0000000000 --- a/srcpkgs/gst-plugins-bad-devel +++ /dev/null @@ -1 +0,0 @@ -gst-plugins-bad \ No newline at end of file diff --git a/srcpkgs/gst-plugins-bad/patches/drop-vpx-compat-defs.patch b/srcpkgs/gst-plugins-bad/patches/drop-vpx-compat-defs.patch deleted file mode 100644 index 573c958b5c..0000000000 --- a/srcpkgs/gst-plugins-bad/patches/drop-vpx-compat-defs.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ext/vp8/gstvp8utils.h 2015-04-21 03:31:33.134952881 +0300 -+++ ext/vp8/gstvp8utils.h 2015-04-21 03:32:45.553520671 +0300 -@@ -25,23 +25,6 @@ - - G_BEGIN_DECLS - --/* Some compatibility defines for older libvpx versions */ --#ifndef VPX_IMG_FMT_I420 --#define VPX_IMG_FMT_I420 IMG_FMT_I420 --#endif -- --#ifndef VPX_PLANE_Y --#define VPX_PLANE_Y PLANE_Y --#endif -- --#ifndef VPX_PLANE_U --#define VPX_PLANE_U PLANE_U --#endif -- --#ifndef VPX_PLANE_V --#define VPX_PLANE_V PLANE_V --#endif -- - const char * gst_vpx_error_name (vpx_codec_err_t status); - - G_END_DECLS diff --git a/srcpkgs/gst-plugins-bad/patches/fix-CESA-2016-0002.patch b/srcpkgs/gst-plugins-bad/patches/fix-CESA-2016-0002.patch deleted file mode 100644 index b9f3839c0a..0000000000 --- a/srcpkgs/gst-plugins-bad/patches/fix-CESA-2016-0002.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gst/vmnc/vmncdec.c -+++ gst/vmnc/vmncdec.c -@@ -370,7 +370,7 @@ vmnc_handle_wmvi_rectangle (GstVMncDec * - - if (dec->imagedata) - g_free (dec->imagedata); -- dec->imagedata = g_malloc (dec->format.width * dec->format.height * -+ dec->imagedata = g_malloc0 (dec->format.width * dec->format.height * - dec->format.bytes_per_pixel); - GST_DEBUG_OBJECT (dec, "Allocated image data at %p", dec->imagedata); - -@@ -901,6 +901,10 @@ vmnc_handle_packet (GstVMncDec * dec, co - GST_WARNING_OBJECT (dec, "Rectangle out of range, type %d", r.type); - return ERROR_INVALID; - } -+ } else if (r.width > 16384 || r.height > 16384) { -+ GST_WARNING_OBJECT (dec, "Width or height too high: %ux%u", r.width, -+ r.height); -+ return ERROR_INVALID; - } - - switch (r.type) { diff --git a/srcpkgs/gst-plugins-bad/patches/libmodplug-0.8.8.5.patch b/srcpkgs/gst-plugins-bad/patches/libmodplug-0.8.8.5.patch deleted file mode 100644 index 5ba7b4114b..0000000000 --- a/srcpkgs/gst-plugins-bad/patches/libmodplug-0.8.8.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/modplug/gstmodplug.cc.orig 2014-04-03 12:41:52.051813074 +0200 -+++ ext/modplug/gstmodplug.cc 2014-04-03 12:42:08.906719756 +0200 -@@ -50,7 +50,7 @@ - #define WORDS_BIGENDIAN 0 - #endif - --#include -+#include - #include - - #include "gstmodplug.h" diff --git a/srcpkgs/gst-plugins-bad/template b/srcpkgs/gst-plugins-bad/template deleted file mode 100644 index 7cacccca15..0000000000 --- a/srcpkgs/gst-plugins-bad/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'gst-plugins-bad'. -pkgname=gst-plugins-bad -version=0.10.23 -revision=23 -lib32disabled=yes -build_style=gnu-configure -configure_args="--enable-experimental --disable-static --disable-nsf" -hostmakedepends="automake libtool pkg-config intltool glib-devel gettext-devel" -makedepends="gettext-devel libpng-devel alsa-lib-devel celt-devel libressl-devel - gst-plugins-base-devel libdca-devel orc-devel libmms-devel exempi-devel - libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel - faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel - xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel - libvpx-devel libvdpau-devel libgsm-devel librtmp-devel" -# Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36. -depends="gst-plugins-base>=0.10.36" -short_desc="GStreamer plugins from the bad set" -maintainer="Juan RP " -license="GPL-2, LGPL-2.1" -homepage="http://gstreamer.freedesktop.org" -distfiles="$homepage/src/$pkgname/$pkgname-$version.tar.xz" -checksum=03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - -gst-plugins-bad-devel_package() { - depends="gst-plugins-base-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share/gtk-doc - } -} diff --git a/srcpkgs/gst-plugins-bad/update b/srcpkgs/gst-plugins-bad/update deleted file mode 100644 index 806bb82385..0000000000 --- a/srcpkgs/gst-plugins-bad/update +++ /dev/null @@ -1 +0,0 @@ -ignore="0.11.* 1.*" From e0736e83c6f84a819d90dc08180d73c5127ddc8b Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:58:37 +0000 Subject: [PATCH 0678/1145] gst-plugins-ugly: remove (gstreamer 0.x) --- .../patches/cdio-cd-text-api.patch | 183 ------------------ srcpkgs/gst-plugins-ugly/template | 19 -- srcpkgs/gst-plugins-ugly/update | 1 - 3 files changed, 203 deletions(-) delete mode 100644 srcpkgs/gst-plugins-ugly/patches/cdio-cd-text-api.patch delete mode 100644 srcpkgs/gst-plugins-ugly/template delete mode 100644 srcpkgs/gst-plugins-ugly/update diff --git a/srcpkgs/gst-plugins-ugly/patches/cdio-cd-text-api.patch b/srcpkgs/gst-plugins-ugly/patches/cdio-cd-text-api.patch deleted file mode 100644 index 864ef8a3c3..0000000000 --- a/srcpkgs/gst-plugins-ugly/patches/cdio-cd-text-api.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 -From: Leon Merten Lohse -Date: Thu, 03 May 2012 22:50:30 +0000 -Subject: cdio: compensate for libcdio's recent cd-text api changes - -https://bugzilla.gnome.org/show_bug.cgi?id=675112 - -Conflicts: - - ext/cdio/gstcdiocddasrc.c ---- -diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c -index 2f58d18..483ebf5 100644 ---- ext/cdio/gstcdio.c -+++ ext/cdio/gstcdio.c -@@ -30,12 +30,16 @@ - GST_DEBUG_CATEGORY (gst_cdio_debug); - - void --gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, -+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, - cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) - { - const gchar *txt; - -+#if LIBCDIO_VERSION_NUM > 83 -+ txt = cdtext_get_const (cdtext, field, track); -+#else - txt = cdtext_get_const (field, cdtext); -+#endif - if (txt == NULL || *txt == '\0') { - GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); - return; -@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, - } - - GstTagList * -+#if LIBCDIO_VERSION_NUM > 83 -+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) -+{ -+ GstTagList *tags = NULL; -+ -+#else - gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) - { - GstTagList *tags = NULL; -@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) - GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); - return NULL; - } -+#endif - -- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, -+ GST_TAG_ARTIST, &tags); -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, -+ &tags); - - return tags; - } - - void -+#if LIBCDIO_VERSION_NUM > 83 -+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, -+ GstTagList * tags) -+{ -+#else - gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) - { - cdtext_t *t; -@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) - GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); - return; - } -+#endif - -- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); -- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); -- -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, -+ GST_TAG_ALBUM_ARTIST, &tags); -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, -+ &tags); -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, -+ &tags); - GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); - } - -diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h -index ef31ed0..c6da580 100644 ---- ext/cdio/gstcdio.h -+++ ext/cdio/gstcdio.h -@@ -24,22 +24,38 @@ - #include - #include - #include -+#include -+ -+#if LIBCDIO_VERSION_NUM <= 83 -+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER -+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE -+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE -+#endif - - GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); - #define GST_CAT_DEFAULT gst_cdio_debug - - void gst_cdio_add_cdtext_field (GstObject * src, - cdtext_t * cdtext, -+ track_t track, - cdtext_field_t field, - const gchar * gst_tag, - GstTagList ** p_tags); - - GstTagList * gst_cdio_get_cdtext (GstObject * src, -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t * t, -+#else - CdIo * cdio, -+#endif - track_t track); - - void gst_cdio_add_cdtext_album_tags (GstObject * src, -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t * t, -+#else - CdIo * cdio, -+#endif - GstTagList * tags); - - #endif /* __GST_CDIO_H__ */ -diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c -index 615a0c8..830839e 100644 ---- ext/cdio/gstcdiocddasrc.c -+++ ext/cdio/gstcdiocddasrc.c -@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - GstCdioCddaSrc *src; - discmode_t discmode; - gint first_track, num_tracks, i; -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext_t *cdtext; -+#endif - - src = GST_CDIO_CDDA_SRC (audiocdsrc); - -@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - if (src->read_speed != -1) - cdio_set_speed (src->cdio, src->read_speed); - -+#if LIBCDIO_VERSION_NUM > 83 -+ cdtext = cdio_get_cdtext (src->cdio); -+ -+ if (NULL == cdtext) -+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); -+ else -+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, -+ cddabasesrc->tags); -+#else - gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, - cddabasesrc->tags); -+#endif - - GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); - -@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) - * the right thing here (for cddb id calculations etc. as well) */ - track.start = cdio_get_track_lsn (src->cdio, i + first_track); - track.end = track.start + len_sectors - 1; /* -1? */ -+#if LIBCDIO_VERSION_NUM > 83 -+ if (NULL != cdtext) -+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, -+ i + first_track); -+#else - track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, - i + first_track); -+#endif - - gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/gst-plugins-ugly/template b/srcpkgs/gst-plugins-ugly/template deleted file mode 100644 index 026f34034a..0000000000 --- a/srcpkgs/gst-plugins-ugly/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'gst-plugins-ugly'. -pkgname=gst-plugins-ugly -version=0.10.19 -revision=8 -lib32disabled=yes -build_style=gnu-configure -configure_args="--enable-experimental" -# XXX: add required pkgs for the amr, sid plugins. -hostmakedepends="pkg-config intltool" -makedepends=" - glib-devel libxml2-devel gstreamer-devel gst-plugins-base-devel - libcdio-devel libdvdread-devel x264-devel libmad-devel - orc-devel liba52-devel libmpeg2-devel lame-devel" -short_desc="GStreamer plugins from the ugly set" -maintainer="Juan RP " -license="GPL-2, LGPL-2.1" -homepage="http://gstreamer.freedesktop.org" -distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz" -checksum=4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 diff --git a/srcpkgs/gst-plugins-ugly/update b/srcpkgs/gst-plugins-ugly/update deleted file mode 100644 index 806bb82385..0000000000 --- a/srcpkgs/gst-plugins-ugly/update +++ /dev/null @@ -1 +0,0 @@ -ignore="0.11.* 1.*" From 98acc59d67d700ea643794ee5123ca8ab81ee2a1 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 07:59:24 +0000 Subject: [PATCH 0679/1145] gst-plugins-good: remove (gstreamer 0.x) --- .../patches/CESA-2016-0004.patch | 298 ------------------ srcpkgs/gst-plugins-good/template | 33 -- srcpkgs/gst-plugins-good/update | 1 - 3 files changed, 332 deletions(-) delete mode 100644 srcpkgs/gst-plugins-good/patches/CESA-2016-0004.patch delete mode 100644 srcpkgs/gst-plugins-good/template delete mode 100644 srcpkgs/gst-plugins-good/update diff --git a/srcpkgs/gst-plugins-good/patches/CESA-2016-0004.patch b/srcpkgs/gst-plugins-good/patches/CESA-2016-0004.patch deleted file mode 100644 index 1bcffeee52..0000000000 --- a/srcpkgs/gst-plugins-good/patches/CESA-2016-0004.patch +++ /dev/null @@ -1,298 +0,0 @@ -From ec66c7c584f0b41c98e93758d9b53bd6dd582df2 Mon Sep 17 00:00:00 2001 -From: Matthew Waters -Date: Tue, 22 Nov 2016 19:05:00 +1100 -Subject: flxdec: add some write bounds checking - -Without checking the bounds of the frame we are writing into, we can -write off the end of the destination buffer. - -https://scarybeastsecurity.blogspot.dk/2016/11/0day-exploit-advancing-exploitation.html - -https://bugzilla.gnome.org/show_bug.cgi?id=774834 - ---- gst/flx/gstflxdec.c.orig Fri Dec 30 14:59:09 2011 -+++ gst/flx/gstflxdec.c Wed Nov 23 11:18:08 2016 -@@ -70,9 +70,9 @@ static gboolean gst_flxdec_src_event_handler (GstPad * - static gboolean gst_flxdec_sink_event_handler (GstPad * pad, GstEvent * event); - - static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint); --static void flx_decode_brun (GstFlxDec *, guchar *, guchar *); --static void flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *); --static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *); -+static gboolean flx_decode_brun (GstFlxDec *, guchar *, guchar *); -+static gboolean flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *); -+static gboolean flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *); - - #define rndalign(off) ((off) + ((off) & 1)) - -@@ -225,13 +225,14 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstEvent - return ret; - } - --static void -+static gboolean - flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data, - guchar * dest) - { - FlxFrameChunk *hdr; -+ gboolean ret = TRUE; - -- g_return_if_fail (data != NULL); -+ g_return_val_if_fail (data != NULL, FALSE); - - while (count--) { - hdr = (FlxFrameChunk *) data; -@@ -250,17 +251,17 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, g - break; - - case FLX_BRUN: -- flx_decode_brun (flxdec, data, dest); -+ ret = flx_decode_brun (flxdec, data, dest); - data += rndalign (hdr->size) - FlxFrameChunkSize; - break; - - case FLX_LC: -- flx_decode_delta_fli (flxdec, data, dest); -+ ret = flx_decode_delta_fli (flxdec, data, dest); - data += rndalign (hdr->size) - FlxFrameChunkSize; - break; - - case FLX_SS2: -- flx_decode_delta_flc (flxdec, data, dest); -+ ret = flx_decode_delta_flc (flxdec, data, dest); - data += rndalign (hdr->size) - FlxFrameChunkSize; - break; - -@@ -278,7 +279,12 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, g - data += rndalign (hdr->size) - FlxFrameChunkSize; - break; - } -+ -+ if (!ret) -+ break; - } -+ -+ return ret; - } - - -@@ -311,13 +317,13 @@ flx_decode_color (GstFlxDec * flxdec, guchar * data, g - } - } - --static void -+static gboolean - flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) - { - gulong count, lines, row; - guchar x; - -- g_return_if_fail (flxdec != NULL); -+ g_return_val_if_fail (flxdec != NULL, FALSE); - - lines = flxdec->hdr.height; - while (lines--) { -@@ -335,12 +341,21 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, gu - if (count > 0x7f) { - /* literal run */ - count = 0x100 - count; -+ if ((glong) row - (glong) count < 0) { -+ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); -+ return FALSE; -+ } - row -= count; - - while (count--) - *dest++ = *data++; - - } else { -+ if ((glong) row - (glong) count < 0) { -+ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); -+ return FALSE; -+ } -+ - /* replicate run */ - row -= count; - x = *data++; -@@ -350,16 +365,18 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, gu - } - } - } -+ -+ return TRUE; - } - --static void -+static gboolean - flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) - { - gulong count, packets, lines, start_line; - guchar *start_p, x; - -- g_return_if_fail (flxdec != NULL); -- g_return_if_fail (flxdec->delta != NULL); -+ g_return_val_if_fail (flxdec != NULL, FALSE); -+ g_return_val_if_fail (flxdec->delta != NULL, FALSE); - - /* use last frame for delta */ - memcpy (dest, GST_BUFFER_DATA (flxdec->delta), -@@ -367,6 +384,10 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * dat - - start_line = (data[0] + (data[1] << 8)); - lines = (data[2] + (data[3] << 8)); -+ if (start_line + lines > flxdec->hdr.height) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. too many lines."); -+ return FALSE; -+ } - data += 4; - - /* start position of delta */ -@@ -379,7 +400,8 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * dat - - while (packets--) { - /* skip count */ -- dest += *data++; -+ guchar skip = *data++; -+ dest += skip; - - /* RLE count */ - count = *data++; -@@ -387,12 +409,24 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * dat - if (count > 0x7f) { - /* literal run */ - count = 0x100 - count; -- x = *data++; - -+ if (skip + count > flxdec->hdr.width) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. " -+ "line too long."); -+ return FALSE; -+ } -+ -+ x = *data++; - while (count--) - *dest++ = x; - - } else { -+ if (skip + count > flxdec->hdr.width) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. " -+ "line too long."); -+ return FALSE; -+ } -+ - /* replicate run */ - while (count--) - *dest++ = *data++; -@@ -401,22 +435,28 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * dat - start_p += flxdec->hdr.width; - dest = start_p; - } -+ -+ return TRUE; - } - --static void -+static gboolean - flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) - { - gulong count, lines, start_l, opcode; - guchar *start_p; - -- g_return_if_fail (flxdec != NULL); -- g_return_if_fail (flxdec->delta != NULL); -+ g_return_val_if_fail (flxdec != NULL, FALSE); -+ g_return_val_if_fail (flxdec->delta != NULL, FALSE); - - /* use last frame for delta */ - memcpy (dest, GST_BUFFER_DATA (flxdec->delta), - GST_BUFFER_SIZE (flxdec->delta)); - - lines = (data[0] + (data[1] << 8)); -+ if (lines > flxdec->hdr.height) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. too many lines."); -+ return FALSE; -+ } - data += 2; - - start_p = dest; -@@ -429,9 +469,15 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * dat - while ((opcode = (data[0] + (data[1] << 8))) & 0xc000) { - data += 2; - if ((opcode & 0xc000) == 0xc000) { -- /* skip count */ -- start_l += (0x10000 - opcode); -- dest += flxdec->hdr.width * (0x10000 - opcode); -+ /* line skip count */ -+ gulong skip = (0x10000 - opcode); -+ if (skip > flxdec->hdr.height) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " -+ "skip line count too big."); -+ return FALSE; -+ } -+ start_l += skip; -+ dest += flxdec->hdr.width * skip; - } else { - /* last pixel */ - dest += flxdec->hdr.width; -@@ -443,7 +489,8 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * dat - /* last opcode is the packet count */ - while (opcode--) { - /* skip count */ -- dest += *data++; -+ guchar skip = *data++; -+ dest += skip; - - /* RLE count */ - count = *data++; -@@ -451,12 +498,25 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * dat - if (count > 0x7f) { - /* replicate word run */ - count = 0x100 - count; -+ -+ if (skip + count > flxdec->hdr.width) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " -+ "line too long."); -+ return FALSE; -+ } -+ - while (count--) { - *dest++ = data[0]; - *dest++ = data[1]; - } - data += 2; - } else { -+ if (skip + count > flxdec->hdr.width) { -+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " -+ "line too long."); -+ return FALSE; -+ } -+ - /* literal word run */ - while (count--) { - *dest++ = *data++; -@@ -466,6 +526,8 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * dat - } - lines--; - } -+ -+ return TRUE; - } - - static GstFlowReturn -@@ -593,9 +655,13 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf) - break; - - /* decode chunks */ -- flx_decode_chunks (flxdec, -- ((FlxFrameType *) chunk)->chunks, -- chunk + FlxFrameTypeSize, GST_BUFFER_DATA (flxdec->frame)); -+ if (!flx_decode_chunks (flxdec, -+ ((FlxFrameType *) chunk)->chunks, -+ chunk + FlxFrameTypeSize, GST_BUFFER_DATA (flxdec->frame))) { -+ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, -+ ("%s", "Could not decode chunk"), NULL); -+ return GST_FLOW_ERROR; -+ } - - /* save copy of the current frame for possible delta. */ - memcpy (GST_BUFFER_DATA (flxdec->delta), diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template deleted file mode 100644 index 65c49991de..0000000000 --- a/srcpkgs/gst-plugins-good/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'gst-plugins-good'. -pkgname=gst-plugins-good -version=0.10.31 -revision=11 -build_style=gnu-configure -configure_args="--with-gudev --with-libv4l2 --enable-experimental - --disable-schemas-install --disable-aalib --disable-esd --disable-hal - --disable-libcaca --disable-libdv --disable-dv1394 --disable-shout2 - --with-gconf-schema-file-dir=/usr/share/gconf/schemas --enable-speex" -# XXX: build libcaca, libdv, dv1394 and shout2 modules. -hostmakedepends="pkg-config intltool glib-devel" -makedepends="libpng-devel libxml2-devel - libgudev-devel libflac-devel libXdamage-devel gtk+-devel taglib-devel - libsoup-gnome-devel gst-plugins-base-devel GConf-devel pulseaudio-devel - orc-devel wavpack-devel v4l-utils-devel jack-devel speex-devel" -short_desc="GStreamer set of well-maintained good plug-ins" -maintainer="Juan RP " -homepage="http://gstreamer.freedesktop.org/" -license="LGPL-2.1" -distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz" -checksum=77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 - -pre_configure() { - sed -i -e "/input:/d" sys/v4l2/gstv4l2bufferpool.c - sed -i -e "/case V4L2_CID_HCENTER/d" -e "/case V4L2_CID_VCENTER/d" sys/v4l2/v4l2_calls.c -} - -post_install() { - # remove gconf schemas completely - if [ -d ${DESTDIR}/usr/share/gconf ]; then - rm -r ${DESTDIR}/usr/share/gconf - fi -} diff --git a/srcpkgs/gst-plugins-good/update b/srcpkgs/gst-plugins-good/update deleted file mode 100644 index 806bb82385..0000000000 --- a/srcpkgs/gst-plugins-good/update +++ /dev/null @@ -1 +0,0 @@ -ignore="0.11.* 1.*" From 13b5709d87fd091c9a25b736317798813af80c2a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 08:00:36 +0000 Subject: [PATCH 0680/1145] gst-plugins-base: remove (gstreamer 0.x) --- common/shlibs | 13 --------- srcpkgs/gst-plugins-base-devel | 1 - srcpkgs/gst-plugins-base/template | 47 ------------------------------- srcpkgs/gst-plugins-base/update | 1 - 4 files changed, 62 deletions(-) delete mode 120000 srcpkgs/gst-plugins-base-devel delete mode 100644 srcpkgs/gst-plugins-base/template delete mode 100644 srcpkgs/gst-plugins-base/update diff --git a/common/shlibs b/common/shlibs index ac6d3bfd9c..545a4a04c9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -180,19 +180,6 @@ libgstbase-0.10.so.0 gstreamer-0.10.22_1 libgstdataprotocol-0.10.so.0 gstreamer-0.10.22_1 libgstcontroller-0.10.so.0 gstreamer-0.10.22_1 libgstnet-0.10.so.0 gstreamer-0.10.22_1 -libgstfft-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstaudio-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstapp-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstsdp-0.10.so.0 gst-plugins-base-0.10.22_1 -libgsttag-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstinterfaces-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstriff-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstcdda-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstnetbuffer-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstrtsp-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstvideo-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstpbutils-0.10.so.0 gst-plugins-base-0.10.22_1 -libgstrtp-0.10.so.0 gst-plugins-base-0.10.22_1 libgdbm.so.4 gdbm-1.10_1_1 libgdbm_compat.so.4 gdbm-1.10_1_1 libintl.so.8 gettext-libs-0.19.2_1 diff --git a/srcpkgs/gst-plugins-base-devel b/srcpkgs/gst-plugins-base-devel deleted file mode 120000 index 1f1773adba..0000000000 --- a/srcpkgs/gst-plugins-base-devel +++ /dev/null @@ -1 +0,0 @@ -gst-plugins-base \ No newline at end of file diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template deleted file mode 100644 index 9776060bb6..0000000000 --- a/srcpkgs/gst-plugins-base/template +++ /dev/null @@ -1,47 +0,0 @@ -# Template file for 'gst-plugins-base'. -pkgname=gst-plugins-base -version=0.10.36 -revision=10 -build_style=gnu-configure -configure_args="--with-gudev --enable-experimental --disable-gnome_vfs - --disable-ivorbis --disable-static $(vopt_enable cdparanoia)" -hostmakedepends="automake libtool gettext-devel glib-devel - gtk-doc orc-devel pkg-config $(vopt_if gir gobject-introspection)" -makedepends="alsa-lib-devel gstreamer-devel libgudev-devel libtheora-devel - libvisual-devel libvorbis-devel libXv-devel pango-devel orc-devel - $(vopt_if cdparanoia libcdparanoia-devel)" -short_desc="GStreamer Base Plug-ins" -maintainer="Juan RP " -homepage="http://gstreamer.freedesktop.org/" -license="GPL-2, LGPL-2.1" -distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz" -checksum=1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a - -if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - CFLAGS="-msse2" -fi - -# Package build options -build_options="cdparanoia gir" -# Disable options for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="cdparanoia gir" -fi - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - -gst-plugins-base-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share/gtk-doc - if [ "$build_option_gir" ]; then - vmove "usr/share/gir*" - fi - } -} diff --git a/srcpkgs/gst-plugins-base/update b/srcpkgs/gst-plugins-base/update deleted file mode 100644 index 806bb82385..0000000000 --- a/srcpkgs/gst-plugins-base/update +++ /dev/null @@ -1 +0,0 @@ -ignore="0.11.* 1.*" From 835b40ca9258b1f7e465b104cde3b16b4171a1fa Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 16 May 2017 08:16:05 +0000 Subject: [PATCH 0681/1145] gstreamer: remove --- common/shlibs | 6 --- srcpkgs/gstreamer-devel | 1 - .../patches/fix_bison_grammar_y.patch | 11 ----- srcpkgs/gstreamer/template | 43 ------------------- srcpkgs/gstreamer/update | 1 - 5 files changed, 62 deletions(-) delete mode 120000 srcpkgs/gstreamer-devel delete mode 100644 srcpkgs/gstreamer/patches/fix_bison_grammar_y.patch delete mode 100644 srcpkgs/gstreamer/template delete mode 100644 srcpkgs/gstreamer/update diff --git a/common/shlibs b/common/shlibs index 545a4a04c9..75ea8b4157 100644 --- a/common/shlibs +++ b/common/shlibs @@ -174,12 +174,6 @@ libxfconf-0.so.2 xfconf-4.9.1_1 libxfce4util.so.7 libxfce4util-4.12.1_1 libxfce4panel-1.0.so.4 xfce4-panel-4.9.2_1 libxfce4panel-2.0.so.4 xfce4-panel-4.12.0_1 -libgstcheck-0.10.so.0 gstreamer-0.10.22_1 -libgstreamer-0.10.so.0 gstreamer-0.10.22_1 -libgstbase-0.10.so.0 gstreamer-0.10.22_1 -libgstdataprotocol-0.10.so.0 gstreamer-0.10.22_1 -libgstcontroller-0.10.so.0 gstreamer-0.10.22_1 -libgstnet-0.10.so.0 gstreamer-0.10.22_1 libgdbm.so.4 gdbm-1.10_1_1 libgdbm_compat.so.4 gdbm-1.10_1_1 libintl.so.8 gettext-libs-0.19.2_1 diff --git a/srcpkgs/gstreamer-devel b/srcpkgs/gstreamer-devel deleted file mode 120000 index 037f2c4907..0000000000 --- a/srcpkgs/gstreamer-devel +++ /dev/null @@ -1 +0,0 @@ -gstreamer \ No newline at end of file diff --git a/srcpkgs/gstreamer/patches/fix_bison_grammar_y.patch b/srcpkgs/gstreamer/patches/fix_bison_grammar_y.patch deleted file mode 100644 index f47142d287..0000000000 --- a/srcpkgs/gstreamer/patches/fix_bison_grammar_y.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gst/parse/grammar.y 2011-12-30 02:14:35.000000000 +0100 -+++ gst/parse/grammar.y 2015-08-04 17:40:31.981404808 +0200 -@@ -36,7 +36,7 @@ - - typedef void* yyscan_t; - --int priv_gst_parse_yylex (void * yylval_param , yyscan_t yyscanner); -+int priv_gst_parse_yylex (void * yylval_param); - int priv_gst_parse_yylex_init (yyscan_t scanner); - int priv_gst_parse_yylex_destroy (yyscan_t scanner); - struct yy_buffer_state * priv_gst_parse_yy_scan_string (char* , yyscan_t); diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template deleted file mode 100644 index 028daa4edc..0000000000 --- a/srcpkgs/gstreamer/template +++ /dev/null @@ -1,43 +0,0 @@ -# Template file for 'gstreamer'. -pkgname=gstreamer -version=0.10.36 -revision=8 -build_style=gnu-configure -configure_args="--disable-valgrind --enable-docbook $(vopt_enable gir introspection)" -hostmakedepends="automake libtool gettext-devel pkg-config flex python perl - docbook-xsl glib-devel $(vopt_if gir gobject-introspection)" -makedepends="libxml2-devel libglib-devel" -short_desc="Core GStreamer libraries and elements" -maintainer="Juan RP " -homepage="http://gstreamer.freedesktop.org/" -license="LGPL-2.1" -distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz" -checksum=9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da - -# Package build options -build_options="gir" - -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi - -pre_configure() { - autoreconf -if -} - -gstreamer-devel_package() { - depends="${makedepends} gstreamer>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc - vmove usr/share/aclocal - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - } -} diff --git a/srcpkgs/gstreamer/update b/srcpkgs/gstreamer/update deleted file mode 100644 index 806bb82385..0000000000 --- a/srcpkgs/gstreamer/update +++ /dev/null @@ -1 +0,0 @@ -ignore="0.11.* 1.*" From 5770bbaa19522365652eeca3b42763ce44d3aea3 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 23:14:31 +0000 Subject: [PATCH 0682/1145] execline: update to 2.3.0.1. --- srcpkgs/execline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index a6583e7c32..78d0d1645e 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.3.0.0 +version=2.3.0.1 revision=1 build_style=gnu-configure makedepends="skalibs-devel" @@ -10,7 +10,7 @@ maintainer="bougyman " license="ISC" homepage="http://skarnet.org/software/execline/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=a0ec43b8feba299cc1e5c65b1978ed76571afa595bc53165373e29a57468f425 +checksum=2bf65aaaf808718952e05c2221b4e9472271e53ebd915c8d1d49a3e992583bf4 conflicts="ImageMagick" # /usr/bin/import CFLAGS="-fPIC" From b19a3ecf6f489e36d8c44ac40cff88760a227f03 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 23:14:34 +0000 Subject: [PATCH 0683/1145] skalibs: update to 2.5.1.0. --- srcpkgs/skalibs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index 0d9b080f90..ef32f5d010 100644 --- a/srcpkgs/skalibs/template +++ b/srcpkgs/skalibs/template @@ -1,6 +1,6 @@ # Template file for 'skalibs' pkgname=skalibs -version=2.5.0.0 +version=2.5.1.0 revision=1 nocross=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="bougyman " license="ISC" homepage="http://skarnet.org/software/skalibs/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=38408ff6d0aec581010ecf9e49703ec5f4c8887bbe68717ec087634a7ade849c +checksum=fe45621528bf17ef669218a0a5a0b9a88cd40b0de06b15d40123b5816a696560 CFLAGS="-D_DEFAULT_SOURCE" From b9dc61b9a54dd9d1ca00afa6c395e43b96473a6d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 23:14:37 +0000 Subject: [PATCH 0684/1145] s6: update to 2.5.1.0. --- srcpkgs/s6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template index 8f9c1d3450..6527506edf 100644 --- a/srcpkgs/s6/template +++ b/srcpkgs/s6/template @@ -1,6 +1,6 @@ # Template file for 's6' pkgname=s6 -version=2.5.0.0 +version=2.5.1.0 revision=1 build_style=gnu-configure makedepends="execline-devel skalibs-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="ISC" homepage="http://skarnet.org/software/s6/" distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz" -checksum=11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 +checksum=73cd4c1975905db92122a7c7eebd0c480d046624426800b3bcc5a432e6af27cd post_install() { vlicense COPYING From e798ba9da421cb68cc64d265c254d63951a4d8e5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 21 May 2017 23:14:41 +0000 Subject: [PATCH 0685/1145] s6-networking: update to 2.3.0.1. --- srcpkgs/s6-networking/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 34fd32d07a..b2a75e2c25 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,7 +1,7 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.3.0.0 -revision=2 +version=2.3.0.1 +revision=1 build_style=gnu-configure makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel" configure_args="--libdir=/usr/lib --enable-ssl=libressl" @@ -10,7 +10,7 @@ maintainer="lemmi " license="ISC" homepage="http://skarnet.org/software/${pkgname}/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=1a21d6f3e29eaa50a8de8cddd1e60372fb36c024f2a0c1afc4c9b704b4e3e6dd +checksum=67c4beab39377b60bb996000a336c764adf4b5456c0283a8fd27657b15e9c6d6 post_install() { vlicense COPYING From f79cfa4a93ad86821a7903b7ac3edc4921069563 Mon Sep 17 00:00:00 2001 From: mollusk Date: Sun, 21 May 2017 18:19:00 -0700 Subject: [PATCH 0686/1145] deluge: update to 1.3.15 --- srcpkgs/deluge/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index 78389daa54..49f8c14b40 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,7 +1,7 @@ # Template file for 'deluge' pkgname=deluge -version=1.3.14 -revision=3 +version=1.3.15 +revision=1 noarch=yes build_style=python2-module pycompile_module="deluge" @@ -14,7 +14,7 @@ maintainer="Alexey Rochev " homepage="http://deluge-torrent.org/" license="GPL-3" distfiles="http://download.deluge-torrent.org/source/${pkgname}-${version}.tar.gz" -checksum=2167376518ed888b7c8b0f2d81db175c688745692a97d872aad91df00c20991b +checksum=2bd239fc7ec0427302677abb86f927299aed4f043eca5d8a1bab2986b3659666 post_install() { vsv deluged From 7b02b61f51e444bd4861c5eee1e8c71f4fbf4688 Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Thu, 18 May 2017 02:15:16 -0300 Subject: [PATCH 0687/1145] xbanish: update to 1.5 Closes: #6426 [via git-merge-pr] --- srcpkgs/xbanish/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xbanish/template b/srcpkgs/xbanish/template index 0506e5920f..6c1b16c972 100644 --- a/srcpkgs/xbanish/template +++ b/srcpkgs/xbanish/template @@ -1,7 +1,7 @@ # Template file for 'xbanish' pkgname=xbanish -version=1.4 -revision=2 +version=1.5 +revision=1 build_style=gnu-makefile makedepends="libXfixes-devel libXt-devel libXi-devel libX11-devel" short_desc="Banish the mouse cursor when typing, show it again when the mouse moves" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="BSD" homepage="https://github.com/jcs/xbanish" distfiles="https://github.com/jcs/xbanish/archive/v${version}.tar.gz" -checksum=df90d1fe2c2215e0bdfd3b6a3151ac29553248abd293f428760f8015e82d8c64 +checksum=d10007a468227bb11549ee341c84ff4b4f1e2f49a3d03a971d5a35a56b117cbc pre_build() { export LIBS="$LDFLAGS" From 8f51638eb4c1cb5a599890e04c15698f9512af8e Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Sun, 21 May 2017 23:04:17 -0400 Subject: [PATCH 0688/1145] xbanish: make xlint happy --- srcpkgs/xbanish/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbanish/template b/srcpkgs/xbanish/template index 6c1b16c972..964fe8b210 100644 --- a/srcpkgs/xbanish/template +++ b/srcpkgs/xbanish/template @@ -15,7 +15,7 @@ pre_build() { export LIBS="$LDFLAGS" } -do_install(){ +do_install() { vbin xbanish vman xbanish.1 head -27 xbanish.c > LICENSE From 1c2265b71ef3cc734b2ccf2fa727615af969c1a1 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 08:14:08 +0200 Subject: [PATCH 0689/1145] gst-plugins-bad1: remove obsolete mpg123-devel bdep "The mpg123 plugin containing a libmpg123 based audio decoder element has been moved from -bad to -ugly." (GStreamer 1.8 Release Notes) --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 1eff869b73..bf360ca9fd 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -12,7 +12,7 @@ makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel - libvdpau-devel libgsm-devel librtmp-devel libass-devel mpg123-devel + libvdpau-devel libgsm-devel librtmp-devel libass-devel soundtouch-devel opus-devel libwebp-devel wayland-devel libwayland-egl libsrtp-devel libopenal-devel gtk+3-devel" depends="gst-plugins-base1>=${version}" From 8036606e7f29ca6df6587f22f1ce713adff295d4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 08:20:10 +0200 Subject: [PATCH 0690/1145] gst-plugins-bad1: restore libvpx for armv6 --- srcpkgs/gst-plugins-bad1/template | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index bf360ca9fd..97d6279009 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -12,7 +12,7 @@ makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel - libvdpau-devel libgsm-devel librtmp-devel libass-devel + libvdpau-devel libgsm-devel librtmp-devel libass-devel libvpx-devel soundtouch-devel opus-devel libwebp-devel wayland-devel libwayland-egl libsrtp-devel libopenal-devel gtk+3-devel" depends="gst-plugins-base1>=${version}" @@ -23,13 +23,6 @@ homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" checksum=11b73cfff1b315a8e9be1756435ea84937e7cb90afbab0e8e6975367dbfb8534 -case "$XBPS_TARGET_MACHINE" in - armv6*) # libvpx can't be built for armv6l - ;; - *) makedepends+=" libvpx-devel" - ;; -esac - pre_configure() { NOCONFIGURE=1 ./autogen.sh } From 328467e5aa85194293847dcb2a33c27bff5b0d76 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 08:25:11 +0200 Subject: [PATCH 0691/1145] gst-plugins-ugly1: enable mpg123 plugin --- srcpkgs/gst-plugins-ugly1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index d95a7dade0..3ef6beafe5 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 version=1.12.0 -revision=1 +revision=2 lib32disabled=yes wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure @@ -9,7 +9,7 @@ configure_args="--enable-experimental" # XXX add required pkgs for the amr, sid plugins. hostmakedepends="pkg-config intltool python" makedepends="glib-devel libxml2-devel gst-plugins-base1-devel - libcdio-devel libdvdread-devel libmad-devel x264-devel + libcdio-devel libdvdread-devel libmad-devel x264-devel mpg123-devel orc-devel liba52-devel libmpeg2-devel lame-devel" depends="orc>=0.4.18 gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the ugly set (1.x)" From 7a6add0ea4e98ebe5c95613d570c316c8d1cc1be Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 08:32:55 +0200 Subject: [PATCH 0692/1145] gmusicbrowser: fix depends - fix startup by re-adding perl-Gtk2 - fix gstreamer depends --- srcpkgs/gmusicbrowser/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gmusicbrowser/template b/srcpkgs/gmusicbrowser/template index c2c19b3daf..17a1e6811e 100644 --- a/srcpkgs/gmusicbrowser/template +++ b/srcpkgs/gmusicbrowser/template @@ -1,13 +1,12 @@ # Template file for 'gmusicbrowser' pkgname=gmusicbrowser version=1.1.15 -revision=5 +revision=6 noarch=yes nocross=yes hostmakedepends="perl" -makedepends="perl-Gtk2 perl-Glib-Object-Introspection" -depends="desktop-file-utils mpg123 perl-Glib-Object-Introspection - gst-plugins-base1 gst-plugins-good1 gst-libav" +depends="perl-Gtk2 perl-Glib-Object-Introspection gst-plugins-good1 + gst-plugins-bad1 gst-plugins-ugly1" short_desc="Open-source jukebox for large collections" maintainer="Logen K " license="GPL-3" From 77260db76992f3d7e789b5b208d72b59f40c10d6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 10:45:37 +0200 Subject: [PATCH 0693/1145] xarchiver: update to 0.5.4.10 --- srcpkgs/xarchiver/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template index 08c035653a..db28157905 100644 --- a/srcpkgs/xarchiver/template +++ b/srcpkgs/xarchiver/template @@ -1,6 +1,6 @@ # Template file for 'xarchiver' pkgname=xarchiver -version=0.5.4.8 +version=0.5.4.10 revision=1 build_style=gnu-configure wrksrc="xarchiver-xarchiver-${version}" @@ -11,5 +11,5 @@ short_desc="GTK+2 lightweight desktop independent archive manager" homepage="https://github.com/ib/xarchiver" license="GPL-2" maintainer="Juan RP " -distfiles="${homepage}/archive/xarchiver-${version}.tar.gz" -checksum=ff6922aee9ee92035779a56d89958d3d19ac5343adc8d1defd65d512b6f50dd2 +distfiles="${homepage}/archive/${version}.tar.gz" +checksum=bb452d8ef4eabb52ab1313b3867156ea5030b75f9e59c59c7ef487c8db9dbea4 From 98048d049c66863a564153d04de026cf5ec317b6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 10:45:46 +0200 Subject: [PATCH 0694/1145] xfce4-dict: update to 0.8.0 --- srcpkgs/xfce4-dict/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template index 68fd065519..f43d6ff4d8 100644 --- a/srcpkgs/xfce4-dict/template +++ b/srcpkgs/xfce4-dict/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-dict' pkgname=xfce4-dict -version=0.7.2 +version=0.8.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" @@ -10,4 +10,4 @@ maintainer="Alexander Mamay " license="GPL-2" homepage="http://goodies.xfce.org/projects/applications/xfce4-dict" distfiles="http://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=e5a2b3ec2a665f53534f57cfeb8b2a4ad28d56c13cf8503b4b329377683b11c7 +checksum=3a2fa72a3fe1816e16a50327fac1926bb0167a905c9b1e313a2bf5e3163ea32a From e9f0aefbf30e6007052b48054344739c237825b4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 10:45:52 +0200 Subject: [PATCH 0695/1145] xfce4-pulseaudio-plugin: update to 0.2.5 --- srcpkgs/xfce4-pulseaudio-plugin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template index 5bb616a356..d3fc5df3eb 100644 --- a/srcpkgs/xfce4-pulseaudio-plugin/template +++ b/srcpkgs/xfce4-pulseaudio-plugin/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-pulseaudio-plugin' pkgname=xfce4-pulseaudio-plugin -version=0.2.4 +version=0.2.5 revision=1 build_style=gnu-configure hostmakedepends="gettext-devel glib-devel intltool pkg-config xfce4-dev-tools" @@ -11,7 +11,7 @@ maintainer="Steve Prybylski " license="GPL-2" homepage="http://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin" distfiles="http://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=8d9330ddf1d44a864a36d566cce4b76d4f859c5984bba7653d7dc39aa24d5c3e +checksum=087441331240f8fca6cbcc2839251ad7e8d624fed7b4b7b4cd4e6938cb26c0b2 pre_configure() { NOCONFIGURE=1 xdt-autogen From 40bec29165cc898e8b597332ef8a9ff05b412b50 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 10:48:02 +0200 Subject: [PATCH 0696/1145] libetpan: update to 1.8 Fix CVE-2017-8825. --- srcpkgs/libetpan/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template index 3f5f36cc05..a47546c039 100644 --- a/srcpkgs/libetpan/template +++ b/srcpkgs/libetpan/template @@ -1,25 +1,26 @@ # Template file for 'libetpan' pkgname=libetpan -version=1.7.2 -revision=3 +version=1.8 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl - --with-curl --with-zlib --with-sasl" + --with-zlib --with-sasl" hostmakedepends="libtool automake" makedepends="db-devel expat-devel libressl-devel zlib-devel libsasl-devel libcurl-devel" short_desc="Mail Framework library for C language" maintainer="Jakub Skrzypnik " -license="BSD" +license="3-clause-BSD" homepage="http://www.etpan.org/libetpan.html" distfiles="https://github.com/dinhviethoa/libetpan/archive/${version}.tar.gz" -checksum=32797282a420f3174f4a679548e20fa2bb4acb404b827d62c2f44d3de4eb3120 +checksum=4e67a7b4abadcf3cc16fa16e1621a68e54d489dadfd9a7d1f960c172e953b6eb pre_configure() { NOCONFIGURE=1 ./autogen.sh } post_install() { + sed -i "s|\(-specs=.*hardened-ld\)||" ${DESTDIR}/usr/bin/libetpan-config vlicense COPYRIGHT } From ac168774c0bc71991dbe8ad07127f1ae225aaaa9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 10:50:43 +0200 Subject: [PATCH 0697/1145] xarchiver: remove old wrksrc --- srcpkgs/xarchiver/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template index db28157905..1d4b9ab6cc 100644 --- a/srcpkgs/xarchiver/template +++ b/srcpkgs/xarchiver/template @@ -3,7 +3,6 @@ pkgname=xarchiver version=0.5.4.10 revision=1 build_style=gnu-configure -wrksrc="xarchiver-xarchiver-${version}" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel" depends="xdg-utils desktop-file-utils hicolor-icon-theme" From bdc7854caa0c4e1afe3456e3c4a193ab11780028 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 10:54:02 +0200 Subject: [PATCH 0698/1145] xarchiver: fix build --- srcpkgs/xarchiver/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template index 1d4b9ab6cc..f666c079c7 100644 --- a/srcpkgs/xarchiver/template +++ b/srcpkgs/xarchiver/template @@ -3,6 +3,7 @@ pkgname=xarchiver version=0.5.4.10 revision=1 build_style=gnu-configure +configure_args="--disable-doc" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel" depends="xdg-utils desktop-file-utils hicolor-icon-theme" From d619cf5f63711748d7ef3d075196b434d40c08b7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 12:10:50 +0200 Subject: [PATCH 0699/1145] python-SQLAlchemy: update to 1.1.10 --- 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 9433949ce9..6f1c933e5d 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.1.9 +version=1.1.10 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=b65cdc73cd348448ef0164f6c77d45a9f27ca575d3c5d71ccc33adf684bc6ef0 +checksum=dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3 post_install() { vlicense LICENSE From 060958f750ae70f55619335111361be1a77afbbd Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 12:13:50 +0200 Subject: [PATCH 0700/1145] python-chardet: update to 3.0.3 --- srcpkgs/python-chardet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template index 8c24c0a55c..8ca8a6424b 100644 --- a/srcpkgs/python-chardet/template +++ b/srcpkgs/python-chardet/template @@ -1,6 +1,6 @@ # Template file for 'python-chardet' pkgname=python-chardet -version=3.0.2 +version=3.0.3 revision=1 noarch=yes wrksrc="chardet-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/chardet/chardet" license="LGPL-2.1" distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz" -checksum=4f7832e7c583348a9eddd927ee8514b3bf717c061f57b21dbe7697211454d9bb +checksum=77df6d712a6037ed6f247ad1dd67faca506f64bc1295d43533e9212a101f28cb alternatives="chardet:chardetect:/usr/bin/chardetect2" python3-chardet_package() { From b9630aea0bb4c54937789eb5a97d3c647bf9bbe6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 22 May 2017 12:13:57 +0200 Subject: [PATCH 0701/1145] python-pbr: update to 3.0.1 --- srcpkgs/python-pbr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template index 98e10e93d2..b936350efe 100644 --- a/srcpkgs/python-pbr/template +++ b/srcpkgs/python-pbr/template @@ -1,6 +1,6 @@ # Template file for 'python-pbr' pkgname=python-pbr -version=3.0.0 +version=3.0.1 revision=1 noarch=yes wrksrc="pbr-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://docs.openstack.org/developer/pbr/" license="Apache-2.0" distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz" -checksum=568f988af109114fbfa0525dcb6836b069838360d11732736ecc82e4c15d5c12 +checksum=d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91 alternatives="pbr:pbr:/usr/bin/pbr2" python3-pbr_package() { From 5a8ac3ac814e58dee313f9c4634447f77be8d45e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 12:19:08 +0200 Subject: [PATCH 0702/1145] tinyxml: rebuild with gcc-6 --- srcpkgs/tinyxml/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template index 2989c9a70a..58574a7620 100644 --- a/srcpkgs/tinyxml/template +++ b/srcpkgs/tinyxml/template @@ -1,7 +1,7 @@ # Template file for 'tinyxml' pkgname=tinyxml version=2.6.2 -revision=8 +revision=9 wrksrc="${pkgname}" short_desc="A simple, small, C++ XML parser" maintainer="Juan RP " From f7cd601f816ad9633b91b96128fa04bd2d49e800 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 12:54:32 +0200 Subject: [PATCH 0703/1145] rpi-userland: add missing libraries to common/shlibs --- common/shlibs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/shlibs b/common/shlibs index 75ea8b4157..e0b4f3558d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1145,6 +1145,10 @@ libmmal.so rpi-userland-0.0.0.0.20150907_1 libmmal_core.so rpi-userland-0.0.0.0.20150907_1 libmmal_util.so rpi-userland-0.0.0.0.20150907_1 libOpenVG.so rpi-userland-0.0.0.0.20150907_1 +libmmal_vc_client.so rpi-userland-20170427_1 +libmmal_components.so rpi-userland-20170427_1 +libvcsm.so rpi-userland-20170427_1 +libcontainers.so rpi-userland-20170427_1 liblockdev.so.1 lockdev-1.0.3_1 libcec.so.4 libcec-4.0.2_1 librump.so.0 netbsd-rumpkernel-20130321_1 From c8137de9e9147e6b04993c118090fa18a69f3c7a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 12:55:19 +0200 Subject: [PATCH 0704/1145] kodi: switch to cmake buildsystem --- srcpkgs/kodi/template | 66 ++++++++++--------------------------------- 1 file changed, 15 insertions(+), 51 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 6c337b66d9..2c491fd96b 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,8 @@ # Template file for 'kodi' pkgname=kodi version=17.1 -revision=2 +revision=3 +build_style=cmake patch_args="-Np1" _codename="Krypton" wrksrc="xbmc-${version}-${_codename}" @@ -11,11 +12,11 @@ homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" checksum=303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee +build_wrksrc=project/cmake lib32disabled=yes only_for_archs="i686 i686-musl x86_64 x86_64-musl" -# XXX add support for afp. hostmakedepends=" automake libtool pkg-config gperf cmake zip unzip nasm yasm python-devel gettext-devel libltdl-devel curl" @@ -31,72 +32,35 @@ makedepends=" taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel libcec-devel dcadec-devel crossguid" + # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs>=1.9.7 libplist>=1.12" depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo" # musl builds need generated addons (no java). +# gold broken with musl case "$XBPS_MACHINE" in - *-musl) _kodi_nojava=yes;; - *) hostmakedepends+=" swig openjdk-jre";; + *-musl) _kodi_nojava=yes; configure_args+=" -DENABLE_LDGOLD=Off";; + *) hostmakedepends+=" swig openjdk-jre";; esac -# The patch fix-curl-750-compatibility.patch patches the kodi code to build against curl >= 7.50.0 -# since there were some forward declarations that conflicted after the changes in that curl release. -# The upstream pull request can be found at https://github.com/xbmc/xbmc/pull/10160 -# Any updates to this package should bear the upstream PR in mind. - -# XXX http://build.voidlinux.eu/builders/x86_64_builder/builds/10520/steps/shell_3/logs/stdio -CXXFLAGS="-fpermissive" - pre_configure() { # Copy generated files to avoid requiring java. if [ -n "${_kodi_nojava}" ]; then - $XBPS_FETCH_CMD http://repo.voidlinux.eu/distfiles/kodi-${version}-generated-addons.tar.xz - tar xf kodi-${version}-generated-addons.tar.xz -C ${wrksrc} - for f in xbmc/interfaces/python/generated/*.cpp; do - touch ${f/.cpp/.xml} - done - BOOTSTRAP_STANDALONE=1 make JAVA=/bin/true SWIG=/bin/true -f codegenerator.mk + mkdir -p build/build/swig + + # THESE FILES MUST BE UPDATED WITH EVERY VERSION BUMP! + cp -r $FILESDIR/swig.nojava-$version/* -t build/build/swig + cp $FILESDIR/CMakeCache.txt.nojava build/CMakeCache.txt + + echo "set(FOUND_SWIG Yes)" > modules/FindSWIG.cmake else . /etc/profile.d/10_openjdk.sh - BOOTSTRAP_STANDALONE=1 make -f codegenerator.mk fi - BOOTSTRAP_STANDALONE=1 make -f bootstrap.mk } -do_configure() { - # Do not ship version check. - rm -rf addons/service.xbmc.versioncheck - # kodi fails to find it's userdata if it's configured with --libfir=/usr/lib32, see - # https://github.com/voidlinux/void-packages/issues/3302 - if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then - configure_args=${configure_args/--libdir=\/usr\/lib32/} - fi - - ./configure ${configure_args} \ - --disable-debug --enable-optimizations --enable-gl \ - --enable-sdl --enable-vdpau --enable-vaapi --enable-joystick \ - --enable-xrandr --enable-rsxs --enable-projectm --enable-x11 \ - --enable-pulse --enable-dvdcss --enable-optical-drive \ - --enable-rtmp --enable-samba --enable-nfs --enable-ssh \ - --enable-airplay --enable-ffmpeg-libvorbis --enable-udev \ - --enable-avahi --enable-libbluray \ - --enable-texturepacker --enable-external-libraries \ - --with-ffmpeg=shared \ - ac_cv_path_JAVA_EXE=/bin/true \ - ac_cv_path_SWIG_EXE=/bin/true -} -do_build() { - for f in xbmc/interfaces/python/generated/*.cpp; do - touch ${f/.cpp/.xml} - done - make ${makejobs} -} -do_install() { - make DESTDIR=${DESTDIR} install - vinstall tools/TexturePacker/TexturePacker 755 usr/lib/kodi +post_install() { # remove unused stuff rm -rf ${DESTDIR}/usr/include find ${DESTDIR}/usr/lib -name "*.cmake" -delete From cf8ced68d847a854f9778d8ec5c8612c67793752 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 12:56:58 +0200 Subject: [PATCH 0705/1145] kodi-rpi: switch to cmake buildsystem --- srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava | 1 + srcpkgs/kodi-rpi/files/swig.nojava-17.1 | 1 + srcpkgs/kodi-rpi/patches | 1 + .../patches/add-missing-includes.patch | 1 - .../disable-static-texturepacker-build.patch | 1 - srcpkgs/kodi-rpi/patches/fix-fileemu.patch | 1 - srcpkgs/kodi-rpi/patches/fix-musl-cross.patch | 20 --- srcpkgs/kodi-rpi/patches/fix-musl.patch | 1 - .../kodi-rpi/patches/fortify-source-fix.patch | 1 - .../patches/jsonschemabuilder-cross.patch | 11 -- .../kodi-rpi/patches/remove-filewrap.patch | 1 - .../patches/set-default-stacksize.patch | 1 - srcpkgs/kodi-rpi/patches/versioncheck.patch | 1 - srcpkgs/kodi-rpi/template | 133 +++++++++--------- 14 files changed, 72 insertions(+), 103 deletions(-) create mode 120000 srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava create mode 120000 srcpkgs/kodi-rpi/files/swig.nojava-17.1 create mode 120000 srcpkgs/kodi-rpi/patches delete mode 120000 srcpkgs/kodi-rpi/patches/add-missing-includes.patch delete mode 120000 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch delete mode 120000 srcpkgs/kodi-rpi/patches/fix-fileemu.patch delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl-cross.patch delete mode 120000 srcpkgs/kodi-rpi/patches/fix-musl.patch delete mode 120000 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch delete mode 100644 srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch delete mode 120000 srcpkgs/kodi-rpi/patches/remove-filewrap.patch delete mode 120000 srcpkgs/kodi-rpi/patches/set-default-stacksize.patch delete mode 120000 srcpkgs/kodi-rpi/patches/versioncheck.patch diff --git a/srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava b/srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava new file mode 120000 index 0000000000..6d60129ddc --- /dev/null +++ b/srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava @@ -0,0 +1 @@ +../../kodi/files/CMakeCache.txt.nojava \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-17.1 b/srcpkgs/kodi-rpi/files/swig.nojava-17.1 new file mode 120000 index 0000000000..6af34674cc --- /dev/null +++ b/srcpkgs/kodi-rpi/files/swig.nojava-17.1 @@ -0,0 +1 @@ +../../kodi/files/swig.nojava-17.1 \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches b/srcpkgs/kodi-rpi/patches new file mode 120000 index 0000000000..95c1fe40f1 --- /dev/null +++ b/srcpkgs/kodi-rpi/patches @@ -0,0 +1 @@ +../kodi/patches \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch deleted file mode 120000 index d28799cb63..0000000000 --- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/add-missing-includes.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch deleted file mode 120000 index fa11d3a8c4..0000000000 --- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/disable-static-texturepacker-build.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch deleted file mode 120000 index e88377b37d..0000000000 --- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/fix-fileemu.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/fix-musl-cross.patch b/srcpkgs/kodi-rpi/patches/fix-musl-cross.patch deleted file mode 100644 index 587ad0c213..0000000000 --- a/srcpkgs/kodi-rpi/patches/fix-musl-cross.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac.orig 2017-05-21 19:04:34.705518286 +0200 -+++ b/configure.ac 2017-05-21 19:05:10.431442782 +0200 -@@ -611,7 +611,7 @@ case $host in - CORE_SYSTEM_NAME=linux - ARCH="powerpc64-linux" - ;; -- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) -+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*) - target_platform=target_linux - CORE_SYSTEM_NAME=linux - ARCH="arm" -@@ -621,7 +621,7 @@ case $host in - use_gl=no - USE_STATIC_FFMPEG=1 - ;; -- aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*) -+ aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*|aarch64*-*-linux-musl*) - target_platform=target_linux - ARCH="aarch64" - use_arch="aarch64" diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch deleted file mode 120000 index c82751fe9c..0000000000 --- a/srcpkgs/kodi-rpi/patches/fix-musl.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/fix-musl.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch deleted file mode 120000 index c5c5222e72..0000000000 --- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/fortify-source-fix.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch b/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch deleted file mode 100644 index 39ccfff44d..0000000000 --- a/srcpkgs/kodi-rpi/patches/jsonschemabuilder-cross.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/depends/native/JsonSchemaBuilder/Makefile.orig 2015-02-06 16:03:11.758503904 +0100 -+++ b/tools/depends/native/JsonSchemaBuilder/Makefile 2015-02-06 16:03:29.557107942 +0100 -@@ -15,7 +15,7 @@ endif - - SOURCE=$(ROOT_DIR)/src - --CONFIGURE=./configure --prefix=$(PREFIX) -+CONFIGURE=CC=cc CXX=g++ CFLAGS= CXXFLAGS= ./configure --prefix=$(PREFIX) - APP=$(SOURCE)/JsonSchemaBuilder - APPBIN=$(PREFIX)/bin/JsonSchemaBuilder - diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch deleted file mode 120000 index b87f6a4cc9..0000000000 --- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/remove-filewrap.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/set-default-stacksize.patch b/srcpkgs/kodi-rpi/patches/set-default-stacksize.patch deleted file mode 120000 index 2f45576916..0000000000 --- a/srcpkgs/kodi-rpi/patches/set-default-stacksize.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/set-default-stacksize.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/patches/versioncheck.patch b/srcpkgs/kodi-rpi/patches/versioncheck.patch deleted file mode 120000 index 5f2d4e169d..0000000000 --- a/srcpkgs/kodi-rpi/patches/versioncheck.patch +++ /dev/null @@ -1 +0,0 @@ -../../kodi/patches/versioncheck.patch \ No newline at end of file diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 9af076fc31..6783ec49fe 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -2,6 +2,7 @@ pkgname=kodi-rpi version=17.1 revision=1 +build_style=cmake patch_args="-Np1" _codename="Krypton" wrksrc="xbmc-${version}-${_codename}" @@ -11,8 +12,7 @@ homepage="http://www.kodi.tv/" license="GPL-2" distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz" checksum=303f3903cbb57ccc2961f09cf3746505542bcb129a464f0687d7ca8601cebbee - -broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/2841/steps/shell_3/logs/stdio" +build_wrksrc=project/cmake nopie=yes only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" @@ -20,7 +20,7 @@ only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" hostmakedepends=" automake libtool pkg-config gperf cmake zip unzip nasm yasm gettext-devel libltdl-devel python-devel libmysqlclient-devel - SDL2_image-devel lzo-devel swig" + SDL2_image-devel lzo-devel" makedepends=" eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel @@ -29,19 +29,34 @@ makedepends=" libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel libxslt-devel libuuid-devel giflib-devel - libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel crossguid" + libcec-devel libmicrohttpd-devel libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel crossguid cmake" + +# gold broken with musl +case "$XBPS_MACHINE" in + *-musl) configure_args+=" -DENABLE_LDGOLD=Off";; +esac + +configure_args=" + -DCORE_SYSTEM_NAME=rbpi + -DENABLE_OPENGL=OFF + -DENABLE_OPENGLES=ON + -DENABLE_X11=OFF + -DENABLE_INTERNAL_CROSSGUID=OFF + -DENABLE_VAAPI=OFF + -DENABLE_VDPAU=OFF + -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc +" +case "$XBPS_TARGET_MACHINE" in + armv6*) configure_args+=" -DWITH_CPU=arm1176jzf-s";; + armv7*) configure_args+=" -DWITH_CPU=cortex-a7";; + aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";; +esac # The following dependencies are dlopen(3)ed. depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs>=1.9.7 libplist>=1.12 libssh" depends+=" hicolor-icon-theme desktop-file-utils" -# musl builds need generated addons (no java). -case "$XBPS_MACHINE" in - *-musl) _kodi_nojava=yes;; - *) hostmakedepends+=" openjdk-jre";; -esac - provides="kodi-${version}_${revision}" # Create xbmc system user to launch xbmc-standalone. @@ -50,65 +65,55 @@ xbmc_homedir="/var/lib/xbmc" xbmc_groups="audio,input,video" pre_configure() { + find ../.. -type f | \ + grep "configure\.ac\|Makefile\|cmake\|config\.site" | \ + xargs sed -i -e "s;-isystem;-I;g" + # Copy generated files to avoid requiring java. - if [ -n "${_kodi_nojava}" ]; then - $XBPS_FETCH_CMD http://repo.voidlinux.eu/distfiles/kodi-${version}-generated-addons.tar.xz - tar xf kodi-${version}-generated-addons.tar.xz -C ${wrksrc} - BOOTSTRAP_STANDALONE=1 make JAVA=/bin/true -f codegenerator.mk - else - . /etc/profile.d/10_openjdk.sh - BOOTSTRAP_STANDALONE=1 make -f codegenerator.mk + mkdir -p build/build/swig + + # THESE FILES MUST BE UPDATED WITH EVERY VERSION BUMP! + # (See kodi template) + cp -r $FILESDIR/swig.nojava-$version/* -t build/build/swig + cp $FILESDIR/CMakeCache.txt.nojava build/CMakeCache.txt + + echo "set(FOUND_SWIG Yes)" > modules/FindSWIG.cmake + + if [ "$CROSS_BUILD" ]; then + for i in JsonSchemaBuilder TexturePacker; do + cat > modules/Find$i.cmake < Date: Mon, 22 May 2017 13:16:51 +0200 Subject: [PATCH 0706/1145] kodi: add missing files --- srcpkgs/kodi/files/CMakeCache.txt.nojava | 10 + .../swig.nojava-17.1/AddonModuleXbmc.i.cpp | 9256 +++++ .../swig.nojava-17.1/AddonModuleXbmc.i.xml | 7917 +++++ .../AddonModuleXbmcaddon.i.cpp | 496 + .../AddonModuleXbmcaddon.i.xml | 1010 + .../swig.nojava-17.1/AddonModuleXbmcgui.i.cpp | 13308 ++++++++ .../swig.nojava-17.1/AddonModuleXbmcgui.i.xml | 27851 ++++++++++++++++ .../AddonModuleXbmcplugin.i.cpp | 915 + .../AddonModuleXbmcplugin.i.xml | 2077 ++ .../swig.nojava-17.1/AddonModuleXbmcvfs.i.cpp | 1598 + .../swig.nojava-17.1/AddonModuleXbmcvfs.i.xml | 1804 + .../AddonModuleXbmcwsgi.i.cpp | 1286 + .../AddonModuleXbmcwsgi.i.xml | 2254 ++ 13 files changed, 69782 insertions(+) create mode 100644 srcpkgs/kodi/files/CMakeCache.txt.nojava create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.cpp create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.xml create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.cpp create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.xml create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.cpp create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.xml create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.cpp create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.xml create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.cpp create mode 100644 srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.xml diff --git a/srcpkgs/kodi/files/CMakeCache.txt.nojava b/srcpkgs/kodi/files/CMakeCache.txt.nojava new file mode 100644 index 0000000000..9ddfa7ff5e --- /dev/null +++ b/srcpkgs/kodi/files/CMakeCache.txt.nojava @@ -0,0 +1,10 @@ +Java_IDLJ_EXECUTABLE:FILEPATH=/bin/true +Java_JARSIGNER_EXECUTABLE:FILEPATH=/bin/true +Java_JAR_EXECUTABLE:FILEPATH=/bin/true +Java_JAVAC_EXECUTABLE:FILEPATH=/bin/true +Java_JAVADOC_EXECUTABLE:FILEPATH=/bin/true +Java_JAVAH_EXECUTABLE:FILEPATH=/bin/true +Java_JAVA_EXECUTABLE:FILEPATH=/bin/true +SWIG_EXECUTABLE:FILEPATH=/bin/true +SWIG_DIR:FILEPATH=/var/empty + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp new file mode 100644 index 0000000000..f0063ae909 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp @@ -0,0 +1,9256 @@ + + +/* + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +// ************************************************************************ +// This file was generated by xbmc compile process. DO NOT EDIT!! +// It was created by running the code generator on the spec file for +// the module "xbmc" on the template file PythonSwig.template.cpp +// ************************************************************************ + + + +#include +#include +#include "interfaces/python/LanguageHook.h" +#include "interfaces/python/swig.h" +#include "interfaces/python/PyContext.h" + + +#include "interfaces/legacy/Player.h" +#include "interfaces/legacy/RenderCapture.h" +#include "interfaces/legacy/Keyboard.h" +#include "interfaces/legacy/ModuleXbmc.h" +#include "interfaces/legacy/Monitor.h" + +using namespace XBMCAddon; +using namespace xbmc; + +#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif + + +namespace PythonBindings +{ + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::Player + TypeInfo TyXBMCAddon_xbmc_Player_Type(typeid(XBMCAddon::xbmc::Player)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::RenderCapture + TypeInfo TyXBMCAddon_xbmc_RenderCapture_Type(typeid(XBMCAddon::xbmc::RenderCapture)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::InfoTagMusic + TypeInfo TyXBMCAddon_xbmc_InfoTagMusic_Type(typeid(XBMCAddon::xbmc::InfoTagMusic)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::InfoTagRadioRDS + TypeInfo TyXBMCAddon_xbmc_InfoTagRadioRDS_Type(typeid(XBMCAddon::xbmc::InfoTagRadioRDS)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::InfoTagVideo + TypeInfo TyXBMCAddon_xbmc_InfoTagVideo_Type(typeid(XBMCAddon::xbmc::InfoTagVideo)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::Keyboard + TypeInfo TyXBMCAddon_xbmc_Keyboard_Type(typeid(XBMCAddon::xbmc::Keyboard)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::PlayList + TypeInfo TyXBMCAddon_xbmc_PlayList_Type(typeid(XBMCAddon::xbmc::PlayList)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmc::Monitor + TypeInfo TyXBMCAddon_xbmc_Monitor_Type(typeid(XBMCAddon::xbmc::Monitor)); + //========================================================================= + + //========================================================================= + // These variables define the type XBMCAddon::xbmcgui::ListItem from another module + extern TypeInfo TyXBMCAddon_xbmcgui_ListItem_Type; + //========================================================================= + + //========================================================================= + // These variables define the type XBMCAddon::xbmc::PlayListItem from another module + extern TypeInfo TyXBMCAddon_xbmc_PlayListItem_Type; + //========================================================================= + + + + //========================================================================= + // This class is the Director for XBMCAddon::xbmc::Player. + // It provides the "reverse bridge" from C++ to Python to support + // cross-language polymorphism. + //========================================================================= + class XBMCAddon_xbmc_Player_Director : public Director, public XBMCAddon::xbmc::Player + { + public: + + inline XBMCAddon_xbmc_Player_Director(int playerCore ) : XBMCAddon::xbmc::Player( playerCore ) { } + + virtual void onPlayBackStarted( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackStarted",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackEnded( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackEnded",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackStopped( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackStopped",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackPaused( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackPaused",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackResumed( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackResumed",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onQueueNextItem( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onQueueNextItem",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackSpeedChanged( int speed ) + { + PyObject* pyspeed = NULL; + pyspeed = Py_BuildValue((char*)"i", speed); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackSpeedChanged",(char*)"(O)", pyspeed ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackSeek( int time, int seekOffset ) + { + PyObject* pytime = NULL; + pytime = Py_BuildValue((char*)"i", time); + PyObject* pyseekOffset = NULL; + pyseekOffset = Py_BuildValue((char*)"i", seekOffset); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackSeek",(char*)"(OO)", pytime , pyseekOffset ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onPlayBackSeekChapter( int chapter ) + { + PyObject* pychapter = NULL; + pychapter = Py_BuildValue((char*)"i", chapter); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onPlayBackSeekChapter",(char*)"(O)", pychapter ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + }; + + //========================================================================= + // This class is the Director for XBMCAddon::xbmc::Monitor. + // It provides the "reverse bridge" from C++ to Python to support + // cross-language polymorphism. + //========================================================================= + class XBMCAddon_xbmc_Monitor_Director : public Director, public XBMCAddon::xbmc::Monitor + { + public: + + inline XBMCAddon_xbmc_Monitor_Director() : XBMCAddon::xbmc::Monitor() { } + + virtual void onSettingsChanged( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onSettingsChanged",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onScreensaverActivated( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onScreensaverActivated",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onScreensaverDeactivated( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onScreensaverDeactivated",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDPMSActivated( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDPMSActivated",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDPMSDeactivated( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDPMSDeactivated",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onScanStarted( XBMCAddon::String const library ) + { + PyObject* pylibrary = NULL; + pylibrary = PyString_FromStringAndSize(library.c_str(), library.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onScanStarted",(char*)"(O)", pylibrary ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onScanFinished( XBMCAddon::String const library ) + { + PyObject* pylibrary = NULL; + pylibrary = PyString_FromStringAndSize(library.c_str(), library.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onScanFinished",(char*)"(O)", pylibrary ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDatabaseScanStarted( XBMCAddon::String const database ) + { + PyObject* pydatabase = NULL; + pydatabase = PyString_FromStringAndSize(database.c_str(), database.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDatabaseScanStarted",(char*)"(O)", pydatabase ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDatabaseUpdated( XBMCAddon::String const database ) + { + PyObject* pydatabase = NULL; + pydatabase = PyString_FromStringAndSize(database.c_str(), database.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDatabaseUpdated",(char*)"(O)", pydatabase ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onCleanStarted( XBMCAddon::String const library ) + { + PyObject* pylibrary = NULL; + pylibrary = PyString_FromStringAndSize(library.c_str(), library.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onCleanStarted",(char*)"(O)", pylibrary ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onCleanFinished( XBMCAddon::String const library ) + { + PyObject* pylibrary = NULL; + pylibrary = PyString_FromStringAndSize(library.c_str(), library.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onCleanFinished",(char*)"(O)", pylibrary ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onAbortRequested( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onAbortRequested",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onNotification( XBMCAddon::String const sender, XBMCAddon::String const method, XBMCAddon::String const data ) + { + PyObject* pysender = NULL; + pysender = PyString_FromStringAndSize(sender.c_str(), sender.length()); + PyObject* pymethod = NULL; + pymethod = PyString_FromStringAndSize(method.c_str(), method.length()); + PyObject* pydata = NULL; + pydata = PyString_FromStringAndSize(data.c_str(), data.length()); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onNotification",(char*)"(OOO)", pysender , pymethod , pydata ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + }; + + static PyObject* xbmc_log (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "msg", + "level", + NULL}; + + char * msg ; + int level = lLOGDEBUG; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s|i", + (char**)keywords, + &msg, + &level + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::log( msg, level ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::log\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::log\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_shutdown (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::shutdown( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::shutdown\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::shutdown\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_restart (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::restart( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::restart\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::restart\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_executescript (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "script", + NULL}; + + char * script ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &script + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::executescript( script ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::executescript\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::executescript\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_executebuiltin (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "function", + "wait", + NULL}; + + char * function ; + bool wait = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s|b", + (char**)keywords, + &function, + &wait + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::executebuiltin( function, wait ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::executebuiltin\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::executebuiltin\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_executeJSONRPC (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "jsonrpccommand", + NULL}; + + char * jsonrpccommand ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &jsonrpccommand + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::executeJSONRPC( jsonrpccommand ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::executeJSONRPC\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::executeJSONRPC\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_sleep (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "timemillis", + NULL}; + + long timemillis ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &timemillis + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::sleep( timemillis ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::sleep\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::sleep\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_getLocalizedString (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + int id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &id + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getLocalizedString( id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getLocalizedString\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getLocalizedString\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyUnicode_DecodeUTF8(apiResult.c_str(),apiResult.size(),"replace"); + + return result; + } + + static PyObject* xbmc_getSkinDir (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getSkinDir( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getSkinDir\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getSkinDir\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getLanguage (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "format", + "region", + NULL}; + + int format = CLangCodeExpander::ENGLISH_NAME; + bool region = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|ib", + (char**)keywords, + &format, + ®ion + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getLanguage( format, region ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getLanguage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getLanguage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getIPAddress (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getIPAddress( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getIPAddress\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getIPAddress\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getDVDState (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (long )XBMCAddon::xbmc::getDVDState( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getDVDState\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getDVDState\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmc_getFreeMem (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (long )XBMCAddon::xbmc::getFreeMem( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getFreeMem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getFreeMem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmc_getInfoLabel (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "cLine", + NULL}; + + char * cLine ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &cLine + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getInfoLabel( cLine ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getInfoLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getInfoLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getInfoImage (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "infotag", + NULL}; + + char * infotag ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &infotag + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getInfoImage( infotag ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getInfoImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getInfoImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_playSFX (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "filename", + "useCached", + NULL}; + + char * filename ; + bool useCached = true; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s|b", + (char**)keywords, + &filename, + &useCached + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::playSFX( filename, useCached ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::playSFX\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::playSFX\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_stopSFX (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::stopSFX( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::stopSFX\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::stopSFX\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_enableNavSounds (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "yesNo", + NULL}; + + bool yesNo ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &yesNo + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::enableNavSounds( yesNo ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::enableNavSounds\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::enableNavSounds\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_getCondVisibility (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "condition", + NULL}; + + char * condition ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &condition + )) + { + return NULL; + } + + bool apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmc::getCondVisibility( condition ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getCondVisibility\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getCondVisibility\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_getGlobalIdleTime (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (int )XBMCAddon::xbmc::getGlobalIdleTime( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getGlobalIdleTime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getGlobalIdleTime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_getCacheThumbName (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmc::getCacheThumbName"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getCacheThumbName( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getCacheThumbName\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getCacheThumbName\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_makeLegalFilename (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "filename", + "fatX", + NULL}; + + std::string filename ; + PyObject* pyfilename = NULL; + bool fatX = true; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|b", + (char**)keywords, + &pyfilename, + &fatX + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pyfilename) PyXBMCGetUnicodeString(filename,pyfilename,false,"filename","XBMCAddon::xbmc::makeLegalFilename"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::makeLegalFilename( filename, fatX ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::makeLegalFilename\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::makeLegalFilename\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_translatePath (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmc::translatePath"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::translatePath( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::translatePath\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::translatePath\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getCleanMovieTitle (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + "usefoldername", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + bool usefoldername = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|b", + (char**)keywords, + &pypath, + &usefoldername + )) + { + return NULL; + } + + Tuple< XBMCAddon::String ,XBMCAddon::String > apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmc::getCleanMovieTitle"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (Tuple< XBMCAddon::String ,XBMCAddon::String > )XBMCAddon::xbmc::getCleanMovieTitle( path, usefoldername ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getCleanMovieTitle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getCleanMovieTitle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + int vecSize = apiResult.GetNumValuesSet(); + result = PyTuple_New(vecSize); + { + PyObject* pyentry1; + + if (vecSize > 0) + { + std::string & entry1 = apiResult.first(); + { + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + } + PyTuple_SetItem(result, 0, pyentry1); + } + + + if (vecSize > 1) + { + std::string & entry1 = apiResult.second(); + { + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + } + PyTuple_SetItem(result, 1, pyentry1); + } + + } + + return result; + } + + static PyObject* xbmc_validatePath (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmc::validatePath"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::validatePath( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::validatePath\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::validatePath\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getRegion (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + char * id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &id + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getRegion( id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getRegion\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getRegion\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_getSupportedMedia (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "mediaType", + NULL}; + + char * mediaType ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &mediaType + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getSupportedMedia( mediaType ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getSupportedMedia\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getSupportedMedia\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_skinHasImage (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "image", + NULL}; + + char * image ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &image + )) + { + return NULL; + } + + bool apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmc::skinHasImage( image ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::skinHasImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::skinHasImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_startServer (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iTyp", + "bStart", + "bWait", + NULL}; + + int iTyp ; + bool bStart ; + bool bWait = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ib|b", + (char**)keywords, + &iTyp, + &bStart, + &bWait + )) + { + return NULL; + } + + bool apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmc::startServer( iTyp, bStart, bWait ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::startServer\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::startServer\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_audioSuspend (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::audioSuspend( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::audioSuspend\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::audioSuspend\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_audioResume (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmc::audioResume( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::audioResume\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::audioResume\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_getUserAgent (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::getUserAgent( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::getUserAgent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::getUserAgent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_convertLanguage (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "language", + "format", + NULL}; + + char * language ; + int format ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"si", + (char**)keywords, + &language, + &format + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmc::convertLanguage( language, format ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::convertLanguage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::convertLanguage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + int playerCore = 0; + if (!PyArg_ParseTuple( + args, + + (char*)"|i", + + &playerCore + )) + { + return NULL; + } + + XBMCAddon::xbmc::Player * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::Player *)(&(TyXBMCAddon_xbmc_Player_Type.pythonType) != pytype) ? new XBMCAddon_xbmc_Player_Director( playerCore ) : new XBMCAddon::xbmc::Player( playerCore ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::Player\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::Player\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + if (&(TyXBMCAddon_xbmc_Player_Type.pythonType) != pytype) + ((XBMCAddon_xbmc_Player_Director*)apiResult)->setPyObjectForDirector(result); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_play (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "item", + "listitem", + "windowed", + "startpos", + NULL}; + + Alternative< XBMCAddon::String ,PlayList const * > item = Player::defaultPlayParameter; + PyObject* pyitem = NULL; + XBMCAddon::xbmcgui::ListItem * listitem = NULL; + PyObject* pylistitem = NULL; + bool windowed = false; + int startpos = -1; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|OObi", + (char**)keywords, + &pyitem, + &pylistitem, + &windowed, + &startpos + )) + { + return NULL; + } + + + try + { + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_1 = pyitem; + try + { + std::string entry0_1; + if (pyentry_1) PyXBMCGetUnicodeString(entry0_1,pyentry_1,false,"entry0_1","play"); + item.former() = entry0_1; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + PlayList * entry1_1; + entry1_1 = (PlayList *)retrieveApiInstance(pyentry_1,"p.PlayList","XBMCAddon::xbmc::","play"); + item.later() = entry1_1; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.PlayList" ); + } + } + } + listitem = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pylistitem,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmc::","play"); + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"play","XBMCAddon::xbmc::Player"))-> play( item, listitem, windowed, startpos ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"play\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"play\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_stop (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"stop","XBMCAddon::xbmc::Player"))-> stop( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"stop\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"stop\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_pause (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"pause","XBMCAddon::xbmc::Player"))-> pause( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"pause\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"pause\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_playnext (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"playnext","XBMCAddon::xbmc::Player"))-> playnext( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"playnext\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"playnext\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_playprevious (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"playprevious","XBMCAddon::xbmc::Player"))-> playprevious( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"playprevious\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"playprevious\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_playselected (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "selected", + NULL}; + + int selected ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &selected + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"playselected","XBMCAddon::xbmc::Player"))-> playselected( selected ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"playselected\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"playselected\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackStarted (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackStarted","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackStarted( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackStarted\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackStarted\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackEnded (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackEnded","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackEnded( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackEnded\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackEnded\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackStopped (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackStopped","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackStopped( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackStopped\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackStopped\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackPaused (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackPaused","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackPaused( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackPaused\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackPaused\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackResumed (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackResumed","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackResumed( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackResumed\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackResumed\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onQueueNextItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onQueueNextItem","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onQueueNextItem( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onQueueNextItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onQueueNextItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackSpeedChanged (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "speed", + NULL}; + + int speed ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &speed + )) + { + return NULL; + } + + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackSpeedChanged","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackSpeedChanged( speed ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackSpeedChanged\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackSpeedChanged\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackSeek (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "time", + "seekOffset", + NULL}; + + int time ; + int seekOffset ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ii", + (char**)keywords, + &time, + &seekOffset + )) + { + return NULL; + } + + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackSeek","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackSeek( time, seekOffset ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackSeek\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackSeek\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_onPlayBackSeekChapter (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "chapter", + NULL}; + + int chapter ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &chapter + )) + { + return NULL; + } + + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"onPlayBackSeekChapter","XBMCAddon::xbmc::Player"))-> XBMCAddon::xbmc::Player::onPlayBackSeekChapter( chapter ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onPlayBackSeekChapter\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onPlayBackSeekChapter\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_isPlaying (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"isPlaying","XBMCAddon::xbmc::Player"))-> isPlaying( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isPlaying\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isPlaying\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_isPlayingAudio (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"isPlayingAudio","XBMCAddon::xbmc::Player"))-> isPlayingAudio( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isPlayingAudio\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isPlayingAudio\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_isPlayingVideo (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"isPlayingVideo","XBMCAddon::xbmc::Player"))-> isPlayingVideo( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isPlayingVideo\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isPlayingVideo\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_isPlayingRDS (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"isPlayingRDS","XBMCAddon::xbmc::Player"))-> isPlayingRDS( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isPlayingRDS\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isPlayingRDS\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getPlayingFile (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getPlayingFile","XBMCAddon::xbmc::Player"))-> getPlayingFile( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPlayingFile\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPlayingFile\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getTime (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + double apiResult; + try + { + + apiResult = (double )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getTime","XBMCAddon::xbmc::Player"))-> getTime( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyFloat_FromDouble(apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_seekTime (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "seekTime", + NULL}; + + double seekTime ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"d", + (char**)keywords, + &seekTime + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"seekTime","XBMCAddon::xbmc::Player"))-> seekTime( seekTime ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"seekTime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"seekTime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_setSubtitles (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "subtitleFile", + NULL}; + + char * subtitleFile ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &subtitleFile + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"setSubtitles","XBMCAddon::xbmc::Player"))-> setSubtitles( subtitleFile ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setSubtitles\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setSubtitles\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_showSubtitles (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "bVisible", + NULL}; + + bool bVisible ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &bVisible + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"showSubtitles","XBMCAddon::xbmc::Player"))-> showSubtitles( bVisible ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"showSubtitles\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"showSubtitles\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getSubtitles (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getSubtitles","XBMCAddon::xbmc::Player"))-> getSubtitles( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSubtitles\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSubtitles\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getAvailableSubtitleStreams (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::vector< XBMCAddon::String > apiResult; + try + { + + apiResult = (std::vector< XBMCAddon::String > )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getAvailableSubtitleStreams","XBMCAddon::xbmc::Player"))-> getAvailableSubtitleStreams( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAvailableSubtitleStreams\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAvailableSubtitleStreams\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + result = PyList_New(0); + + for (std::vector::iterator iter = apiResult.begin(); iter != apiResult.end(); ++iter) + { + std::string & entry1 = *iter; + PyObject* pyentry1; + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + PyList_Append(result, pyentry1); + Py_DECREF(pyentry1); + } + + + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_setSubtitleStream (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iStream", + NULL}; + + int iStream ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &iStream + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"setSubtitleStream","XBMCAddon::xbmc::Player"))-> setSubtitleStream( iStream ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setSubtitleStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setSubtitleStream\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getVideoInfoTag (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + InfoTagVideo * apiResult; + try + { + + apiResult = (InfoTagVideo *)((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getVideoInfoTag","XBMCAddon::xbmc::Player"))-> getVideoInfoTag( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getVideoInfoTag\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getVideoInfoTag\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getMusicInfoTag (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + InfoTagMusic * apiResult; + try + { + + apiResult = (InfoTagMusic *)((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getMusicInfoTag","XBMCAddon::xbmc::Player"))-> getMusicInfoTag( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getMusicInfoTag\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getMusicInfoTag\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getRadioRDSInfoTag (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + InfoTagRadioRDS * apiResult; + try + { + + apiResult = (InfoTagRadioRDS *)((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getRadioRDSInfoTag","XBMCAddon::xbmc::Player"))-> getRadioRDSInfoTag( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getRadioRDSInfoTag\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getRadioRDSInfoTag\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getTotalTime (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + double apiResult; + try + { + + apiResult = (double )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getTotalTime","XBMCAddon::xbmc::Player"))-> getTotalTime( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTotalTime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTotalTime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyFloat_FromDouble(apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getAvailableAudioStreams (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::vector< XBMCAddon::String > apiResult; + try + { + + apiResult = (std::vector< XBMCAddon::String > )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getAvailableAudioStreams","XBMCAddon::xbmc::Player"))-> getAvailableAudioStreams( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAvailableAudioStreams\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAvailableAudioStreams\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + result = PyList_New(0); + + for (std::vector::iterator iter = apiResult.begin(); iter != apiResult.end(); ++iter) + { + std::string & entry1 = *iter; + PyObject* pyentry1; + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + PyList_Append(result, pyentry1); + Py_DECREF(pyentry1); + } + + + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_setAudioStream (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iStream", + NULL}; + + int iStream ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &iStream + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"setAudioStream","XBMCAddon::xbmc::Player"))-> setAudioStream( iStream ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setAudioStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setAudioStream\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_getAvailableVideoStreams (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::vector< XBMCAddon::String > apiResult; + try + { + + apiResult = (std::vector< XBMCAddon::String > )((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"getAvailableVideoStreams","XBMCAddon::xbmc::Player"))-> getAvailableVideoStreams( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAvailableVideoStreams\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAvailableVideoStreams\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + result = PyList_New(0); + + for (std::vector::iterator iter = apiResult.begin(); iter != apiResult.end(); ++iter) + { + std::string & entry1 = *iter; + PyObject* pyentry1; + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + PyList_Append(result, pyentry1); + Py_DECREF(pyentry1); + } + + + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Player_setVideoStream (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iStream", + NULL}; + + int iStream ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &iStream + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"setVideoStream","XBMCAddon::xbmc::Player"))-> setVideoStream( iStream ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setVideoStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setVideoStream\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmc::RenderCapture * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::RenderCapture *)new XBMCAddon::xbmc::RenderCapture( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::RenderCapture\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::RenderCapture\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_getWidth (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"getWidth","XBMCAddon::xbmc::RenderCapture"))-> getWidth( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getWidth\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getWidth\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_getHeight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"getHeight","XBMCAddon::xbmc::RenderCapture"))-> getHeight( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getHeight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getHeight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_getAspectRatio (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + float apiResult; + try + { + + apiResult = (float )((XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"getAspectRatio","XBMCAddon::xbmc::RenderCapture"))-> getAspectRatio( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAspectRatio\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAspectRatio\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"f", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_getImageFormat (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + char * apiResult; + try + { + + apiResult = (char *)((XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"getImageFormat","XBMCAddon::xbmc::RenderCapture"))-> getImageFormat( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getImageFormat\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getImageFormat\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromString(apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_getImage (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "msecs", + NULL}; + + unsigned int msecs = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|I", + (char**)keywords, + &msecs + )) + { + return NULL; + } + + XbmcCommons::Buffer apiResult; + try + { + + apiResult = (XbmcCommons::Buffer )((XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"getImage","XBMCAddon::xbmc::RenderCapture"))-> getImage( msecs ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyByteArray_FromStringAndSize((char*)apiResult.curPosition(),apiResult.remaining()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_RenderCapture_capture (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "width", + "height", + NULL}; + + int width ; + int height ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ii", + (char**)keywords, + &width, + &height + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"capture","XBMCAddon::xbmc::RenderCapture"))-> capture( width, height ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"capture\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"capture\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmc::InfoTagMusic * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::InfoTagMusic *)new XBMCAddon::xbmc::InfoTagMusic( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::InfoTagMusic\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::InfoTagMusic\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getURL (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getURL","XBMCAddon::xbmc::InfoTagMusic"))-> getURL( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getURL\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getURL\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getTitle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getTitle","XBMCAddon::xbmc::InfoTagMusic"))-> getTitle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTitle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTitle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getArtist (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getArtist","XBMCAddon::xbmc::InfoTagMusic"))-> getArtist( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getArtist\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getArtist\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getAlbum (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getAlbum","XBMCAddon::xbmc::InfoTagMusic"))-> getAlbum( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAlbum\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAlbum\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getAlbumArtist (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getAlbumArtist","XBMCAddon::xbmc::InfoTagMusic"))-> getAlbumArtist( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAlbumArtist\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAlbumArtist\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getGenre (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getGenre","XBMCAddon::xbmc::InfoTagMusic"))-> getGenre( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getGenre\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getGenre\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getDuration (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getDuration","XBMCAddon::xbmc::InfoTagMusic"))-> getDuration( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getDuration\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getDuration\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getRating (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getRating","XBMCAddon::xbmc::InfoTagMusic"))-> getRating( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getRating\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getRating\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getUserRating (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getUserRating","XBMCAddon::xbmc::InfoTagMusic"))-> getUserRating( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getUserRating\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getUserRating\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getTrack (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getTrack","XBMCAddon::xbmc::InfoTagMusic"))-> getTrack( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTrack\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTrack\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getDisc (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getDisc","XBMCAddon::xbmc::InfoTagMusic"))-> getDisc( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getDisc\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getDisc\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getReleaseDate (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getReleaseDate","XBMCAddon::xbmc::InfoTagMusic"))-> getReleaseDate( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getReleaseDate\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getReleaseDate\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getListeners (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getListeners","XBMCAddon::xbmc::InfoTagMusic"))-> getListeners( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getListeners\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getListeners\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getPlayCount (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getPlayCount","XBMCAddon::xbmc::InfoTagMusic"))-> getPlayCount( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPlayCount\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPlayCount\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getLastPlayed (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getLastPlayed","XBMCAddon::xbmc::InfoTagMusic"))-> getLastPlayed( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLastPlayed\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLastPlayed\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getComment (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getComment","XBMCAddon::xbmc::InfoTagMusic"))-> getComment( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getComment\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getComment\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagMusic_getLyrics (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"getLyrics","XBMCAddon::xbmc::InfoTagMusic"))-> getLyrics( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLyrics\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLyrics\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmc::InfoTagRadioRDS * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::InfoTagRadioRDS *)new XBMCAddon::xbmc::InfoTagRadioRDS( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::InfoTagRadioRDS\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::InfoTagRadioRDS\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getTitle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getTitle","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getTitle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTitle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTitle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getBand (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getBand","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getBand( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getBand\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getBand\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getArtist (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getArtist","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getArtist( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getArtist\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getArtist\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getComposer (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getComposer","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getComposer( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getComposer\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getComposer\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getConductor (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getConductor","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getConductor( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getConductor\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getConductor\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getAlbum (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getAlbum","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getAlbum( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAlbum\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAlbum\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getComment (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getComment","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getComment( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getComment\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getComment\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getAlbumTrackNumber (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getAlbumTrackNumber","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getAlbumTrackNumber( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAlbumTrackNumber\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAlbumTrackNumber\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoNews (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoNews","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoNews( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoNews\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoNews\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoNewsLocal (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoNewsLocal","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoNewsLocal( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoNewsLocal\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoNewsLocal\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoSport (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoSport","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoSport( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoSport\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoSport\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoStock (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoStock","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoStock( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoStock\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoStock\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoWeather (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoWeather","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoWeather( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoWeather\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoWeather\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoHoroscope (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoHoroscope","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoHoroscope( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoHoroscope\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoHoroscope\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoCinema (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoCinema","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoCinema( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoCinema\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoCinema\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoLottery (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoLottery","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoLottery( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoLottery\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoLottery\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoOther (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getInfoOther","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getInfoOther( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getInfoOther\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getInfoOther\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getEditorialStaff (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getEditorialStaff","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getEditorialStaff( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getEditorialStaff\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getEditorialStaff\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgStation (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getProgStation","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getProgStation( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProgStation\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProgStation\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgStyle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getProgStyle","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getProgStyle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProgStyle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProgStyle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgHost (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getProgHost","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getProgHost( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProgHost\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProgHost\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgWebsite (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getProgWebsite","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getProgWebsite( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProgWebsite\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProgWebsite\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgNow (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getProgNow","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getProgNow( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProgNow\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProgNow\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgNext (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getProgNext","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getProgNext( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProgNext\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProgNext\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getPhoneHotline (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getPhoneHotline","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getPhoneHotline( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPhoneHotline\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPhoneHotline\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getEMailHotline (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getEMailHotline","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getEMailHotline( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getEMailHotline\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getEMailHotline\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getPhoneStudio (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getPhoneStudio","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getPhoneStudio( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPhoneStudio\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPhoneStudio\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getEMailStudio (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getEMailStudio","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getEMailStudio( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getEMailStudio\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getEMailStudio\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getSMSStudio (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"getSMSStudio","XBMCAddon::xbmc::InfoTagRadioRDS"))-> getSMSStudio( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSMSStudio\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSMSStudio\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmc::InfoTagVideo * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::InfoTagVideo *)new XBMCAddon::xbmc::InfoTagVideo( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::InfoTagVideo\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::InfoTagVideo\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getDbId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getDbId","XBMCAddon::xbmc::InfoTagVideo"))-> getDbId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getDbId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getDbId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getDirector (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getDirector","XBMCAddon::xbmc::InfoTagVideo"))-> getDirector( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getDirector\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getDirector\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getWritingCredits (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getWritingCredits","XBMCAddon::xbmc::InfoTagVideo"))-> getWritingCredits( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getWritingCredits\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getWritingCredits\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getGenre (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getGenre","XBMCAddon::xbmc::InfoTagVideo"))-> getGenre( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getGenre\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getGenre\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getTagLine (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getTagLine","XBMCAddon::xbmc::InfoTagVideo"))-> getTagLine( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTagLine\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTagLine\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getPlotOutline (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getPlotOutline","XBMCAddon::xbmc::InfoTagVideo"))-> getPlotOutline( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPlotOutline\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPlotOutline\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getPlot (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getPlot","XBMCAddon::xbmc::InfoTagVideo"))-> getPlot( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPlot\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPlot\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getPictureURL (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getPictureURL","XBMCAddon::xbmc::InfoTagVideo"))-> getPictureURL( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPictureURL\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPictureURL\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getTitle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getTitle","XBMCAddon::xbmc::InfoTagVideo"))-> getTitle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTitle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTitle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getTVShowTitle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getTVShowTitle","XBMCAddon::xbmc::InfoTagVideo"))-> getTVShowTitle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTVShowTitle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTVShowTitle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getMediaType (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getMediaType","XBMCAddon::xbmc::InfoTagVideo"))-> getMediaType( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getMediaType\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getMediaType\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getVotes (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getVotes","XBMCAddon::xbmc::InfoTagVideo"))-> getVotes( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getVotes\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getVotes\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getCast (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getCast","XBMCAddon::xbmc::InfoTagVideo"))-> getCast( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getCast\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getCast\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getFile (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getFile","XBMCAddon::xbmc::InfoTagVideo"))-> getFile( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getFile\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getFile\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getPath (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getPath","XBMCAddon::xbmc::InfoTagVideo"))-> getPath( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPath\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPath\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getIMDBNumber (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getIMDBNumber","XBMCAddon::xbmc::InfoTagVideo"))-> getIMDBNumber( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getIMDBNumber\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getIMDBNumber\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getSeason (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getSeason","XBMCAddon::xbmc::InfoTagVideo"))-> getSeason( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSeason\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSeason\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getEpisode (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getEpisode","XBMCAddon::xbmc::InfoTagVideo"))-> getEpisode( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getEpisode\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getEpisode\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getYear (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getYear","XBMCAddon::xbmc::InfoTagVideo"))-> getYear( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getYear\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getYear\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getRating (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + double apiResult; + try + { + + apiResult = (double )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getRating","XBMCAddon::xbmc::InfoTagVideo"))-> getRating( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getRating\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getRating\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyFloat_FromDouble(apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getUserRating (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getUserRating","XBMCAddon::xbmc::InfoTagVideo"))-> getUserRating( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getUserRating\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getUserRating\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getPlayCount (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getPlayCount","XBMCAddon::xbmc::InfoTagVideo"))-> getPlayCount( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPlayCount\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPlayCount\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getLastPlayed (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getLastPlayed","XBMCAddon::xbmc::InfoTagVideo"))-> getLastPlayed( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLastPlayed\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLastPlayed\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getOriginalTitle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getOriginalTitle","XBMCAddon::xbmc::InfoTagVideo"))-> getOriginalTitle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getOriginalTitle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getOriginalTitle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getPremiered (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getPremiered","XBMCAddon::xbmc::InfoTagVideo"))-> getPremiered( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPremiered\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPremiered\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getFirstAired (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getFirstAired","XBMCAddon::xbmc::InfoTagVideo"))-> getFirstAired( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getFirstAired\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getFirstAired\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_InfoTagVideo_getTrailer (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"getTrailer","XBMCAddon::xbmc::InfoTagVideo"))-> getTrailer( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getTrailer\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getTrailer\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + std::string line = XBMCAddon::emptyString; + PyObject* pyline = NULL; + std::string heading = XBMCAddon::emptyString; + PyObject* pyheading = NULL; + bool hidden = false; + if (!PyArg_ParseTuple( + args, + + (char*)"|OOb", + + &pyline, + &pyheading, + &hidden + )) + { + return NULL; + } + + XBMCAddon::xbmc::Keyboard * apiResult; + try + { + if (pyline) PyXBMCGetUnicodeString(line,pyline,false,"line","Keyboard"); + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","Keyboard"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::Keyboard *)new XBMCAddon::xbmc::Keyboard( line, heading, hidden ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::Keyboard\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::Keyboard\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_doModal (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "autoclose", + NULL}; + + int autoclose = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|i", + (char**)keywords, + &autoclose + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"doModal","XBMCAddon::xbmc::Keyboard"))-> doModal( autoclose ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"doModal\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"doModal\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_setDefault (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "line", + NULL}; + + std::string line = XBMCAddon::emptyString; + PyObject* pyline = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|O", + (char**)keywords, + &pyline + )) + { + return NULL; + } + + + try + { + if (pyline) PyXBMCGetUnicodeString(line,pyline,false,"line","setDefault"); + + ((XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"setDefault","XBMCAddon::xbmc::Keyboard"))-> setDefault( line ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setDefault\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setDefault\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_setHiddenInput (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "hidden", + NULL}; + + bool hidden = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|b", + (char**)keywords, + &hidden + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"setHiddenInput","XBMCAddon::xbmc::Keyboard"))-> setHiddenInput( hidden ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setHiddenInput\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setHiddenInput\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_setHeading (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyheading + )) + { + return NULL; + } + + + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","setHeading"); + + ((XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"setHeading","XBMCAddon::xbmc::Keyboard"))-> setHeading( heading ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setHeading\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setHeading\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_getText (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"getText","XBMCAddon::xbmc::Keyboard"))-> getText( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getText\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getText\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Keyboard_isConfirmed (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"isConfirmed","XBMCAddon::xbmc::Keyboard"))-> isConfirmed( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isConfirmed\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isConfirmed\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + int playList ; + if (!PyArg_ParseTuple( + args, + + (char*)"i", + + &playList + )) + { + return NULL; + } + + XBMCAddon::xbmc::PlayList * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::PlayList *)new XBMCAddon::xbmc::PlayList( playList ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::PlayList\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::PlayList\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_getPlayListId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"getPlayListId","XBMCAddon::xbmc::PlayList"))-> getPlayListId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPlayListId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPlayListId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_add (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "url", + "listitem", + "index", + NULL}; + + std::string url ; + PyObject* pyurl = NULL; + XBMCAddon::xbmcgui::ListItem * listitem = NULL; + PyObject* pylistitem = NULL; + int index = -1; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|Oi", + (char**)keywords, + &pyurl, + &pylistitem, + &index + )) + { + return NULL; + } + + + try + { + if (pyurl) PyXBMCGetUnicodeString(url,pyurl,false,"url","add"); + listitem = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pylistitem,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmc::","add"); + + ((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"add","XBMCAddon::xbmc::PlayList"))-> add( url, listitem, index ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"add\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"add\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_load (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "filename", + NULL}; + + char * filename ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &filename + )) + { + return NULL; + } + + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"load","XBMCAddon::xbmc::PlayList"))-> load( filename ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"load\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"load\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_remove (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "filename", + NULL}; + + char * filename ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &filename + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"remove","XBMCAddon::xbmc::PlayList"))-> remove( filename ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"remove\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"remove\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_clear (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"clear","XBMCAddon::xbmc::PlayList"))-> clear( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"clear\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"clear\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_size (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"size","XBMCAddon::xbmc::PlayList"))-> size( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"size\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"size\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_shuffle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"shuffle","XBMCAddon::xbmc::PlayList"))-> shuffle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"shuffle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"shuffle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_unshuffle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"unshuffle","XBMCAddon::xbmc::PlayList"))-> unshuffle( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"unshuffle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"unshuffle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_getposition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"getposition","XBMCAddon::xbmc::PlayList"))-> getposition( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getposition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getposition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_PlayList_operatorIndex_ (PyHolder* self , PyObject* pyi ) + { + XBMC_TRACE; + + long i ; XBMCAddon::xbmcgui::ListItem * apiResult; + try + { + i = PyInt_AsLong(pyi); + + apiResult = (XBMCAddon::xbmcgui::ListItem *)((XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"operator []","XBMCAddon::xbmc::PlayList"))-> operator []( i ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"operator []\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"operator []\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmc::Monitor * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmc::Monitor *)(&(TyXBMCAddon_xbmc_Monitor_Type.pythonType) != pytype) ? new XBMCAddon_xbmc_Monitor_Director() : new XBMCAddon::xbmc::Monitor( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmc::Monitor\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmc::Monitor\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + if (&(TyXBMCAddon_xbmc_Monitor_Type.pythonType) != pytype) + ((XBMCAddon_xbmc_Monitor_Director*)apiResult)->setPyObjectForDirector(result); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onSettingsChanged (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onSettingsChanged","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onSettingsChanged( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onSettingsChanged\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onSettingsChanged\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onScreensaverActivated (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onScreensaverActivated","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onScreensaverActivated( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onScreensaverActivated\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onScreensaverActivated\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onScreensaverDeactivated (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onScreensaverDeactivated","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onScreensaverDeactivated( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onScreensaverDeactivated\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onScreensaverDeactivated\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onDPMSActivated (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onDPMSActivated","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onDPMSActivated( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onDPMSActivated\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onDPMSActivated\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onDPMSDeactivated (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onDPMSDeactivated","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onDPMSDeactivated( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onDPMSDeactivated\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onDPMSDeactivated\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onScanStarted (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "library", + NULL}; + + std::string library ; + PyObject* pylibrary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylibrary + )) + { + return NULL; + } + + + try + { + if (pylibrary) PyXBMCGetUnicodeString(library,pylibrary,false,"library","onScanStarted"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onScanStarted","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onScanStarted( library ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onScanStarted\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onScanStarted\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onScanFinished (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "library", + NULL}; + + std::string library ; + PyObject* pylibrary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylibrary + )) + { + return NULL; + } + + + try + { + if (pylibrary) PyXBMCGetUnicodeString(library,pylibrary,false,"library","onScanFinished"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onScanFinished","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onScanFinished( library ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onScanFinished\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onScanFinished\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onDatabaseScanStarted (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "database", + NULL}; + + std::string database ; + PyObject* pydatabase = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pydatabase + )) + { + return NULL; + } + + + try + { + if (pydatabase) PyXBMCGetUnicodeString(database,pydatabase,false,"database","onDatabaseScanStarted"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onDatabaseScanStarted","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onDatabaseScanStarted( database ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onDatabaseScanStarted\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onDatabaseScanStarted\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onDatabaseUpdated (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "database", + NULL}; + + std::string database ; + PyObject* pydatabase = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pydatabase + )) + { + return NULL; + } + + + try + { + if (pydatabase) PyXBMCGetUnicodeString(database,pydatabase,false,"database","onDatabaseUpdated"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onDatabaseUpdated","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onDatabaseUpdated( database ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onDatabaseUpdated\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onDatabaseUpdated\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onCleanStarted (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "library", + NULL}; + + std::string library ; + PyObject* pylibrary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylibrary + )) + { + return NULL; + } + + + try + { + if (pylibrary) PyXBMCGetUnicodeString(library,pylibrary,false,"library","onCleanStarted"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onCleanStarted","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onCleanStarted( library ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onCleanStarted\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onCleanStarted\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onCleanFinished (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "library", + NULL}; + + std::string library ; + PyObject* pylibrary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylibrary + )) + { + return NULL; + } + + + try + { + if (pylibrary) PyXBMCGetUnicodeString(library,pylibrary,false,"library","onCleanFinished"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onCleanFinished","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onCleanFinished( library ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onCleanFinished\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onCleanFinished\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onAbortRequested (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onAbortRequested","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onAbortRequested( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onAbortRequested\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onAbortRequested\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_onNotification (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "sender", + "method", + "data", + NULL}; + + std::string sender ; + PyObject* pysender = NULL; + std::string method ; + PyObject* pymethod = NULL; + std::string data ; + PyObject* pydata = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OOO", + (char**)keywords, + &pysender, + &pymethod, + &pydata + )) + { + return NULL; + } + + + try + { + if (pysender) PyXBMCGetUnicodeString(sender,pysender,false,"sender","onNotification"); + if (pymethod) PyXBMCGetUnicodeString(method,pymethod,false,"method","onNotification"); + if (pydata) PyXBMCGetUnicodeString(data,pydata,false,"data","onNotification"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"onNotification","XBMCAddon::xbmc::Monitor"))-> XBMCAddon::xbmc::Monitor::onNotification( sender, method, data ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onNotification\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onNotification\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_waitForAbort (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "timeout", + NULL}; + + double timeout = -1; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|d", + (char**)keywords, + &timeout + )) + { + return NULL; + } + + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"waitForAbort","XBMCAddon::xbmc::Monitor"))-> waitForAbort( timeout ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"waitForAbort\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"waitForAbort\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmc_XBMCAddon_xbmc_Monitor_abortRequested (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"abortRequested","XBMCAddon::xbmc::Monitor"))-> abortRequested( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"abortRequested\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"abortRequested\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static void xbmc_XBMCAddon_xbmc_Player_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::Player* theObj = (XBMCAddon::xbmc::Player*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Player_Type,"~XBMCAddon::xbmc::Player","XBMCAddon::xbmc::Player"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::Player\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::Player\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_RenderCapture_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::RenderCapture* theObj = (XBMCAddon::xbmc::RenderCapture*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_RenderCapture_Type,"~XBMCAddon::xbmc::RenderCapture","XBMCAddon::xbmc::RenderCapture"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::RenderCapture\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::RenderCapture\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_InfoTagMusic_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::InfoTagMusic* theObj = (XBMCAddon::xbmc::InfoTagMusic*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagMusic_Type,"~XBMCAddon::xbmc::InfoTagMusic","XBMCAddon::xbmc::InfoTagMusic"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::InfoTagMusic\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::InfoTagMusic\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::InfoTagRadioRDS* theObj = (XBMCAddon::xbmc::InfoTagRadioRDS*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type,"~XBMCAddon::xbmc::InfoTagRadioRDS","XBMCAddon::xbmc::InfoTagRadioRDS"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::InfoTagRadioRDS\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::InfoTagRadioRDS\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_InfoTagVideo_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::InfoTagVideo* theObj = (XBMCAddon::xbmc::InfoTagVideo*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_InfoTagVideo_Type,"~XBMCAddon::xbmc::InfoTagVideo","XBMCAddon::xbmc::InfoTagVideo"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::InfoTagVideo\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::InfoTagVideo\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_Keyboard_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::Keyboard* theObj = (XBMCAddon::xbmc::Keyboard*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Keyboard_Type,"~XBMCAddon::xbmc::Keyboard","XBMCAddon::xbmc::Keyboard"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::Keyboard\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::Keyboard\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_PlayList_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::PlayList* theObj = (XBMCAddon::xbmc::PlayList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_PlayList_Type,"~XBMCAddon::xbmc::PlayList","XBMCAddon::xbmc::PlayList"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::PlayList\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::PlayList\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmc_XBMCAddon_xbmc_Monitor_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmc::Monitor* theObj = (XBMCAddon::xbmc::Monitor*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmc_Monitor_Type,"~XBMCAddon::xbmc::Monitor","XBMCAddon::xbmc::Monitor"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmc::Monitor\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmc::Monitor\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::Player + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_Player_methods[] = { + {(char*)"play", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_play, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"stop", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_stop, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"pause", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_pause, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"playnext", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_playnext, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"playprevious", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_playprevious, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"playselected", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_playselected, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackStarted", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackStarted, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackEnded", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackEnded, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackStopped", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackStopped, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackPaused", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackPaused, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackResumed", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackResumed, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onQueueNextItem", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onQueueNextItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackSpeedChanged", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackSpeedChanged, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackSeek", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackSeek, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onPlayBackSeekChapter", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_onPlayBackSeekChapter, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isPlaying", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_isPlaying, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isPlayingAudio", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_isPlayingAudio, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isPlayingVideo", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_isPlayingVideo, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isPlayingRDS", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_isPlayingRDS, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPlayingFile", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getPlayingFile, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTime", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getTime, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"seekTime", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_seekTime, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setSubtitles", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_setSubtitles, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"showSubtitles", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_showSubtitles, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSubtitles", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getSubtitles, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAvailableSubtitleStreams", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getAvailableSubtitleStreams, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setSubtitleStream", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_setSubtitleStream, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getVideoInfoTag", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getVideoInfoTag, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getMusicInfoTag", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getMusicInfoTag, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getRadioRDSInfoTag", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getRadioRDSInfoTag, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTotalTime", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getTotalTime, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAvailableAudioStreams", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getAvailableAudioStreams, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setAudioStream", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_setAudioStream, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAvailableVideoStreams", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_getAvailableVideoStreams, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setVideoStream", (PyCFunction)xbmc_XBMCAddon_xbmc_Player_setVideoStream, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_Player_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_Player_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.Player"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_Player_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_Player_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_Player_New; + + TyXBMCAddon_xbmc_Player_Type.swigType="p.XBMCAddon::xbmc::Player"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_Player_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::RenderCapture + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_RenderCapture_methods[] = { + {(char*)"getWidth", (PyCFunction)xbmc_XBMCAddon_xbmc_RenderCapture_getWidth, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getHeight", (PyCFunction)xbmc_XBMCAddon_xbmc_RenderCapture_getHeight, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAspectRatio", (PyCFunction)xbmc_XBMCAddon_xbmc_RenderCapture_getAspectRatio, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getImageFormat", (PyCFunction)xbmc_XBMCAddon_xbmc_RenderCapture_getImageFormat, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getImage", (PyCFunction)xbmc_XBMCAddon_xbmc_RenderCapture_getImage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"capture", (PyCFunction)xbmc_XBMCAddon_xbmc_RenderCapture_capture, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_RenderCapture_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_RenderCapture_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.RenderCapture"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_RenderCapture_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_RenderCapture_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_RenderCapture_New; + + TyXBMCAddon_xbmc_RenderCapture_Type.swigType="p.XBMCAddon::xbmc::RenderCapture"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_RenderCapture_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::InfoTagMusic + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_InfoTagMusic_methods[] = { + {(char*)"getURL", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getURL, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTitle", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getTitle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getArtist", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getArtist, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAlbum", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getAlbum, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAlbumArtist", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getAlbumArtist, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getGenre", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getGenre, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getDuration", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getDuration, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getRating", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getRating, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getUserRating", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getUserRating, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTrack", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getTrack, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getDisc", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getDisc, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getReleaseDate", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getReleaseDate, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getListeners", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getListeners, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPlayCount", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getPlayCount, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLastPlayed", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getLastPlayed, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getComment", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getComment, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLyrics", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagMusic_getLyrics, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_InfoTagMusic_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_InfoTagMusic_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.InfoTagMusic"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_InfoTagMusic_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_InfoTagMusic_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_InfoTagMusic_New; + + TyXBMCAddon_xbmc_InfoTagMusic_Type.swigType="p.XBMCAddon::xbmc::InfoTagMusic"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_InfoTagMusic_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::InfoTagRadioRDS + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_InfoTagRadioRDS_methods[] = { + {(char*)"getTitle", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getTitle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getBand", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getBand, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getArtist", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getArtist, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getComposer", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getComposer, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getConductor", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getConductor, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAlbum", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getAlbum, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getComment", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getComment, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAlbumTrackNumber", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getAlbumTrackNumber, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoNews", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoNews, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoNewsLocal", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoNewsLocal, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoSport", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoSport, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoStock", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoStock, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoWeather", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoWeather, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoHoroscope", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoHoroscope, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoCinema", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoCinema, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoLottery", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoLottery, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoOther", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getInfoOther, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getEditorialStaff", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getEditorialStaff, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProgStation", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgStation, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProgStyle", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgStyle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProgHost", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgHost, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProgWebsite", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgWebsite, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProgNow", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgNow, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProgNext", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getProgNext, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPhoneHotline", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getPhoneHotline, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getEMailHotline", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getEMailHotline, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPhoneStudio", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getPhoneStudio, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getEMailStudio", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getEMailStudio, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSMSStudio", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_getSMSStudio, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_InfoTagRadioRDS_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_InfoTagRadioRDS_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.InfoTagRadioRDS"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_InfoTagRadioRDS_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_InfoTagRadioRDS_New; + + TyXBMCAddon_xbmc_InfoTagRadioRDS_Type.swigType="p.XBMCAddon::xbmc::InfoTagRadioRDS"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_InfoTagRadioRDS_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::InfoTagVideo + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_InfoTagVideo_methods[] = { + {(char*)"getDbId", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getDbId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getDirector", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getDirector, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getWritingCredits", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getWritingCredits, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getGenre", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getGenre, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTagLine", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getTagLine, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPlotOutline", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getPlotOutline, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPlot", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getPlot, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPictureURL", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getPictureURL, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTitle", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getTitle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTVShowTitle", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getTVShowTitle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getMediaType", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getMediaType, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getVotes", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getVotes, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCast", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getCast, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getFile", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getFile, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPath", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getPath, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getIMDBNumber", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getIMDBNumber, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSeason", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getSeason, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getEpisode", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getEpisode, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getYear", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getYear, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getRating", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getRating, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getUserRating", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getUserRating, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPlayCount", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getPlayCount, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLastPlayed", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getLastPlayed, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getOriginalTitle", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getOriginalTitle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPremiered", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getPremiered, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getFirstAired", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getFirstAired, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getTrailer", (PyCFunction)xbmc_XBMCAddon_xbmc_InfoTagVideo_getTrailer, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_InfoTagVideo_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_InfoTagVideo_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.InfoTagVideo"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_InfoTagVideo_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_InfoTagVideo_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_InfoTagVideo_New; + + TyXBMCAddon_xbmc_InfoTagVideo_Type.swigType="p.XBMCAddon::xbmc::InfoTagVideo"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_InfoTagVideo_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::Keyboard + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_Keyboard_methods[] = { + {(char*)"doModal", (PyCFunction)xbmc_XBMCAddon_xbmc_Keyboard_doModal, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setDefault", (PyCFunction)xbmc_XBMCAddon_xbmc_Keyboard_setDefault, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setHiddenInput", (PyCFunction)xbmc_XBMCAddon_xbmc_Keyboard_setHiddenInput, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setHeading", (PyCFunction)xbmc_XBMCAddon_xbmc_Keyboard_setHeading, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getText", (PyCFunction)xbmc_XBMCAddon_xbmc_Keyboard_getText, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isConfirmed", (PyCFunction)xbmc_XBMCAddon_xbmc_Keyboard_isConfirmed, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_Keyboard_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_Keyboard_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.Keyboard"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_Keyboard_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_Keyboard_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_Keyboard_New; + + TyXBMCAddon_xbmc_Keyboard_Type.swigType="p.XBMCAddon::xbmc::Keyboard"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_Keyboard_Type); + + } + //========================================================================= + + static Py_ssize_t xbmc_XBMCAddon_xbmc_PlayList_size_(PyObject* self) + { + return (Py_ssize_t)((XBMCAddon::xbmc::PlayList*)retrieveApiInstance(self,&TyXBMCAddon_xbmc_PlayList_Type,"operator []","XBMCAddon::xbmc::PlayList"))-> size(); + } + + //========================================================================= + // tp_as_mapping struct for XBMCAddon::xbmc::PlayList + //========================================================================= + PyMappingMethods xbmc_XBMCAddon_xbmc_PlayList_as_mapping = { + xbmc_XBMCAddon_xbmc_PlayList_size_, /* inquiry mp_length; __len__ */ + (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_operatorIndex_, /* binaryfunc mp_subscript __getitem__ */ + 0, /* objargproc mp_ass_subscript; __setitem__ */ + }; + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::PlayList + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_PlayList_methods[] = { + {(char*)"getPlayListId", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_getPlayListId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"add", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_add, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"load", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_load, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"remove", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_remove, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"clear", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_clear, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"size", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_size, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"shuffle", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_shuffle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"unshuffle", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_unshuffle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getposition", (PyCFunction)xbmc_XBMCAddon_xbmc_PlayList_getposition, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_PlayList_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_PlayList_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.PlayList"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_PlayList_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_PlayList_methods; + pythonType.tp_as_mapping = &xbmc_XBMCAddon_xbmc_PlayList_as_mapping; + + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_PlayList_New; + + TyXBMCAddon_xbmc_PlayList_Type.swigType="p.XBMCAddon::xbmc::PlayList"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_PlayList_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmc::Monitor + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmc_Monitor_methods[] = { + {(char*)"onSettingsChanged", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onSettingsChanged, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onScreensaverActivated", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onScreensaverActivated, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onScreensaverDeactivated", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onScreensaverDeactivated, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onDPMSActivated", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onDPMSActivated, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onDPMSDeactivated", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onDPMSDeactivated, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onScanStarted", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onScanStarted, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onScanFinished", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onScanFinished, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onDatabaseScanStarted", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onDatabaseScanStarted, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onDatabaseUpdated", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onDatabaseUpdated, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onCleanStarted", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onCleanStarted, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onCleanFinished", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onCleanFinished, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onAbortRequested", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onAbortRequested, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onNotification", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_onNotification, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"waitForAbort", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_waitForAbort, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"abortRequested", (PyCFunction)xbmc_XBMCAddon_xbmc_Monitor_abortRequested, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmc_Monitor_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmc_Monitor_Type.pythonType; + pythonType.tp_name = (char*)"xbmc.Monitor"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmc_XBMCAddon_xbmc_Monitor_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmc_Monitor_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmc_XBMCAddon_xbmc_Monitor_New; + + TyXBMCAddon_xbmc_Monitor_Type.swigType="p.XBMCAddon::xbmc::Monitor"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmc_Monitor_Type); + + } + //========================================================================= + + + static PyMethodDef xbmc_methods[] = { + {(char*)"log", (PyCFunction)xbmc_log, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"shutdown", (PyCFunction)xbmc_shutdown, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"restart", (PyCFunction)xbmc_restart, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"executescript", (PyCFunction)xbmc_executescript, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"executebuiltin", (PyCFunction)xbmc_executebuiltin, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"executeJSONRPC", (PyCFunction)xbmc_executeJSONRPC, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"sleep", (PyCFunction)xbmc_sleep, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLocalizedString", (PyCFunction)xbmc_getLocalizedString, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSkinDir", (PyCFunction)xbmc_getSkinDir, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLanguage", (PyCFunction)xbmc_getLanguage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getIPAddress", (PyCFunction)xbmc_getIPAddress, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getDVDState", (PyCFunction)xbmc_getDVDState, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getFreeMem", (PyCFunction)xbmc_getFreeMem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoLabel", (PyCFunction)xbmc_getInfoLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getInfoImage", (PyCFunction)xbmc_getInfoImage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"playSFX", (PyCFunction)xbmc_playSFX, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"stopSFX", (PyCFunction)xbmc_stopSFX, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"enableNavSounds", (PyCFunction)xbmc_enableNavSounds, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCondVisibility", (PyCFunction)xbmc_getCondVisibility, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getGlobalIdleTime", (PyCFunction)xbmc_getGlobalIdleTime, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCacheThumbName", (PyCFunction)xbmc_getCacheThumbName, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"makeLegalFilename", (PyCFunction)xbmc_makeLegalFilename, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"translatePath", (PyCFunction)xbmc_translatePath, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCleanMovieTitle", (PyCFunction)xbmc_getCleanMovieTitle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"validatePath", (PyCFunction)xbmc_validatePath, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getRegion", (PyCFunction)xbmc_getRegion, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSupportedMedia", (PyCFunction)xbmc_getSupportedMedia, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"skinHasImage", (PyCFunction)xbmc_skinHasImage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"startServer", (PyCFunction)xbmc_startServer, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"audioSuspend", (PyCFunction)xbmc_audioSuspend, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"audioResume", (PyCFunction)xbmc_audioResume, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getUserAgent", (PyCFunction)xbmc_getUserAgent, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"convertLanguage", (PyCFunction)xbmc_convertLanguage, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + // This is the call that will call all of the other initializes + // for all of the classes in this module + static void initTypes() + { + static bool typesAlreadyInitialized = false; + if (!typesAlreadyInitialized) + { + typesAlreadyInitialized = true; + + initPyXBMCAddon_xbmc_Player_Type(); + initPyXBMCAddon_xbmc_RenderCapture_Type(); + initPyXBMCAddon_xbmc_InfoTagMusic_Type(); + initPyXBMCAddon_xbmc_InfoTagRadioRDS_Type(); + initPyXBMCAddon_xbmc_InfoTagVideo_Type(); + initPyXBMCAddon_xbmc_Keyboard_Type(); + initPyXBMCAddon_xbmc_PlayList_Type(); + initPyXBMCAddon_xbmc_Monitor_Type(); + if (PyType_Ready(&(TyXBMCAddon_xbmc_Player_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_RenderCapture_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_InfoTagMusic_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_InfoTagRadioRDS_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_InfoTagVideo_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_Keyboard_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_PlayList_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmc_Monitor_Type.pythonType)) < 0) + return; + } + } + + void initModule_xbmc() + { + initTypes(); + + // init general xbmc modules + PyObject* module; + + + Py_INCREF(&(TyXBMCAddon_xbmc_Player_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_RenderCapture_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_InfoTagMusic_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_InfoTagRadioRDS_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_InfoTagVideo_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_Keyboard_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_PlayList_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmc_Monitor_Type.pythonType)); + + module = Py_InitModule((char*)"xbmc", xbmc_methods); + if (module == NULL) return; + + + PyModule_AddObject(module, (char*)"Player", (PyObject*)(&(TyXBMCAddon_xbmc_Player_Type.pythonType))); + PyModule_AddObject(module, (char*)"RenderCapture", (PyObject*)(&(TyXBMCAddon_xbmc_RenderCapture_Type.pythonType))); + PyModule_AddObject(module, (char*)"InfoTagMusic", (PyObject*)(&(TyXBMCAddon_xbmc_InfoTagMusic_Type.pythonType))); + PyModule_AddObject(module, (char*)"InfoTagRadioRDS", (PyObject*)(&(TyXBMCAddon_xbmc_InfoTagRadioRDS_Type.pythonType))); + PyModule_AddObject(module, (char*)"InfoTagVideo", (PyObject*)(&(TyXBMCAddon_xbmc_InfoTagVideo_Type.pythonType))); + PyModule_AddObject(module, (char*)"Keyboard", (PyObject*)(&(TyXBMCAddon_xbmc_Keyboard_Type.pythonType))); + PyModule_AddObject(module, (char*)"PlayList", (PyObject*)(&(TyXBMCAddon_xbmc_PlayList_Type.pythonType))); + PyModule_AddObject(module, (char*)"Monitor", (PyObject*)(&(TyXBMCAddon_xbmc_Monitor_Type.pythonType))); + + // constants + PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:28 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); + PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); + PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); + + // need to handle constants + + PyModule_AddIntConstant(module,"SERVER_WEBSERVER",getSERVER_WEBSERVER()); + PyModule_AddIntConstant(module,"SERVER_AIRPLAYSERVER",getSERVER_AIRPLAYSERVER()); + PyModule_AddIntConstant(module,"SERVER_UPNPSERVER",getSERVER_UPNPSERVER()); + PyModule_AddIntConstant(module,"SERVER_UPNPRENDERER",getSERVER_UPNPRENDERER()); + PyModule_AddIntConstant(module,"SERVER_EVENTSERVER",getSERVER_EVENTSERVER()); + PyModule_AddIntConstant(module,"SERVER_JSONRPCSERVER",getSERVER_JSONRPCSERVER()); + PyModule_AddIntConstant(module,"SERVER_ZEROCONF",getSERVER_ZEROCONF()); + PyModule_AddIntConstant(module,"PLAYLIST_MUSIC",getPLAYLIST_MUSIC()); + PyModule_AddIntConstant(module,"PLAYLIST_VIDEO",getPLAYLIST_VIDEO()); + PyModule_AddIntConstant(module,"TRAY_OPEN",getTRAY_OPEN()); + PyModule_AddIntConstant(module,"DRIVE_NOT_READY",getDRIVE_NOT_READY()); + PyModule_AddIntConstant(module,"TRAY_CLOSED_NO_MEDIA",getTRAY_CLOSED_NO_MEDIA()); + PyModule_AddIntConstant(module,"TRAY_CLOSED_MEDIA_PRESENT",getTRAY_CLOSED_MEDIA_PRESENT()); + PyModule_AddIntConstant(module,"LOGDEBUG",getLOGDEBUG()); + PyModule_AddIntConstant(module,"LOGINFO",getLOGINFO()); + PyModule_AddIntConstant(module,"LOGNOTICE",getLOGNOTICE()); + PyModule_AddIntConstant(module,"LOGWARNING",getLOGWARNING()); + PyModule_AddIntConstant(module,"LOGERROR",getLOGERROR()); + PyModule_AddIntConstant(module,"LOGSEVERE",getLOGSEVERE()); + PyModule_AddIntConstant(module,"LOGFATAL",getLOGFATAL()); + PyModule_AddIntConstant(module,"LOGNONE",getLOGNONE()); + PyModule_AddIntConstant(module,"ISO_639_1",getISO_639_1()); + PyModule_AddIntConstant(module,"ISO_639_2",getISO_639_2()); + PyModule_AddIntConstant(module,"ENGLISH_NAME",getENGLISH_NAME()); + } + +} // end PythonBindings namespace for python type definitions + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml new file mode 100644 index 0000000000..c98cbe2453 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml @@ -0,0 +1,7917 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.cpp new file mode 100644 index 0000000000..f467277989 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.cpp @@ -0,0 +1,496 @@ + + +/* + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +// ************************************************************************ +// This file was generated by xbmc compile process. DO NOT EDIT!! +// It was created by running the code generator on the spec file for +// the module "xbmcaddon" on the template file PythonSwig.template.cpp +// ************************************************************************ + + + +#include +#include +#include "interfaces/python/LanguageHook.h" +#include "interfaces/python/swig.h" +#include "interfaces/python/PyContext.h" + + +#include "interfaces/legacy/Addon.h" + +using namespace XBMCAddon; +using namespace xbmcaddon; + +#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif + + + +namespace PythonBindings +{ + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcaddon::Addon + TypeInfo TyXBMCAddon_xbmcaddon_Addon_Type(typeid(XBMCAddon::xbmcaddon::Addon)); + //========================================================================= + + + + static PyObject* xbmcaddon_XBMCAddon_xbmcaddon_Addon_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + char * id = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|s", + (char**)keywords, + &id + )) + { + return NULL; + } + + XBMCAddon::xbmcaddon::Addon * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcaddon::Addon *)new XBMCAddon::xbmcaddon::Addon( id ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcaddon::Addon\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcaddon::Addon\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcaddon_XBMCAddon_xbmcaddon_Addon_getLocalizedString (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + int id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &id + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcaddon::Addon*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcaddon_Addon_Type,"getLocalizedString","XBMCAddon::xbmcaddon::Addon"))-> getLocalizedString( id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLocalizedString\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLocalizedString\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyUnicode_DecodeUTF8(apiResult.c_str(),apiResult.size(),"replace"); + + return result; + } + + static PyObject* xbmcaddon_XBMCAddon_xbmcaddon_Addon_getSetting (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + char * id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &id + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcaddon::Addon*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcaddon_Addon_Type,"getSetting","XBMCAddon::xbmcaddon::Addon"))-> getSetting( id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSetting\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSetting\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcaddon_XBMCAddon_xbmcaddon_Addon_setSetting (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + "value", + NULL}; + + char * id ; + std::string value ; + PyObject* pyvalue = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"sO", + (char**)keywords, + &id, + &pyvalue + )) + { + return NULL; + } + + + try + { + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,false,"value","setSetting"); + + ((XBMCAddon::xbmcaddon::Addon*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcaddon_Addon_Type,"setSetting","XBMCAddon::xbmcaddon::Addon"))-> setSetting( id, value ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setSetting\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setSetting\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcaddon_XBMCAddon_xbmcaddon_Addon_openSettings (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcaddon::Addon*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcaddon_Addon_Type,"openSettings","XBMCAddon::xbmcaddon::Addon"))-> openSettings( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"openSettings\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"openSettings\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcaddon_XBMCAddon_xbmcaddon_Addon_getAddonInfo (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + char * id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &id + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcaddon::Addon*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcaddon_Addon_Type,"getAddonInfo","XBMCAddon::xbmcaddon::Addon"))-> getAddonInfo( id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAddonInfo\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAddonInfo\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static void xbmcaddon_XBMCAddon_xbmcaddon_Addon_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcaddon::Addon* theObj = (XBMCAddon::xbmcaddon::Addon*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcaddon_Addon_Type,"~XBMCAddon::xbmcaddon::Addon","XBMCAddon::xbmcaddon::Addon"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcaddon::Addon\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcaddon::Addon\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcaddon::Addon + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcaddon_Addon_methods[] = { + {(char*)"getLocalizedString", (PyCFunction)xbmcaddon_XBMCAddon_xbmcaddon_Addon_getLocalizedString, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSetting", (PyCFunction)xbmcaddon_XBMCAddon_xbmcaddon_Addon_getSetting, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setSetting", (PyCFunction)xbmcaddon_XBMCAddon_xbmcaddon_Addon_setSetting, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"openSettings", (PyCFunction)xbmcaddon_XBMCAddon_xbmcaddon_Addon_openSettings, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAddonInfo", (PyCFunction)xbmcaddon_XBMCAddon_xbmcaddon_Addon_getAddonInfo, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcaddon_Addon_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcaddon_Addon_Type.pythonType; + pythonType.tp_name = (char*)"xbmcaddon.Addon"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcaddon_XBMCAddon_xbmcaddon_Addon_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcaddon_Addon_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcaddon_XBMCAddon_xbmcaddon_Addon_New; + + TyXBMCAddon_xbmcaddon_Addon_Type.swigType="p.XBMCAddon::xbmcaddon::Addon"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcaddon_Addon_Type); + + } + //========================================================================= + + + static PyMethodDef xbmcaddon_methods[] = { + {NULL, NULL, 0, NULL} + }; + + // This is the call that will call all of the other initializes + // for all of the classes in this module + static void initTypes() + { + static bool typesAlreadyInitialized = false; + if (!typesAlreadyInitialized) + { + typesAlreadyInitialized = true; + + initPyXBMCAddon_xbmcaddon_Addon_Type(); + if (PyType_Ready(&(TyXBMCAddon_xbmcaddon_Addon_Type.pythonType)) < 0) + return; + } + } + + void initModule_xbmcaddon() + { + initTypes(); + + // init general xbmcaddon modules + PyObject* module; + + + Py_INCREF(&(TyXBMCAddon_xbmcaddon_Addon_Type.pythonType)); + + module = Py_InitModule((char*)"xbmcaddon", xbmcaddon_methods); + if (module == NULL) return; + + + PyModule_AddObject(module, (char*)"Addon", (PyObject*)(&(TyXBMCAddon_xbmcaddon_Addon_Type.pythonType))); + + // constants + PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:17 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); + PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); + PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); + + // need to handle constants + + } + +} // end PythonBindings namespace for python type definitions + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.xml b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.xml new file mode 100644 index 0000000000..c4143ac099 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcaddon.i.xml @@ -0,0 +1,1010 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.cpp new file mode 100644 index 0000000000..891ae07e45 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.cpp @@ -0,0 +1,13308 @@ + + +/* + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +// ************************************************************************ +// This file was generated by xbmc compile process. DO NOT EDIT!! +// It was created by running the code generator on the spec file for +// the module "xbmcgui" on the template file PythonSwig.template.cpp +// ************************************************************************ + + + +#include +#include +#include "interfaces/python/LanguageHook.h" +#include "interfaces/python/swig.h" +#include "interfaces/python/PyContext.h" + + +#include "interfaces/legacy/Dialog.h" +#include "interfaces/legacy/ModuleXbmcgui.h" +#include "interfaces/legacy/Control.h" +#include "interfaces/legacy/Window.h" +#include "interfaces/legacy/WindowDialog.h" +#include "interfaces/legacy/Dialog.h" +#include "interfaces/legacy/WindowXML.h" +#include "input/Key.h" + +using namespace XBMCAddon; +using namespace xbmcgui; + +#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif + + + +namespace PythonBindings +{ + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ListItem + TypeInfo TyXBMCAddon_xbmcgui_ListItem_Type(typeid(XBMCAddon::xbmcgui::ListItem)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::Control + TypeInfo TyXBMCAddon_xbmcgui_Control_Type(typeid(XBMCAddon::xbmcgui::Control)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlSpin + TypeInfo TyXBMCAddon_xbmcgui_ControlSpin_Type(typeid(XBMCAddon::xbmcgui::ControlSpin)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlLabel + TypeInfo TyXBMCAddon_xbmcgui_ControlLabel_Type(typeid(XBMCAddon::xbmcgui::ControlLabel)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlEdit + TypeInfo TyXBMCAddon_xbmcgui_ControlEdit_Type(typeid(XBMCAddon::xbmcgui::ControlEdit)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlList + TypeInfo TyXBMCAddon_xbmcgui_ControlList_Type(typeid(XBMCAddon::xbmcgui::ControlList)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlFadeLabel + TypeInfo TyXBMCAddon_xbmcgui_ControlFadeLabel_Type(typeid(XBMCAddon::xbmcgui::ControlFadeLabel)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlTextBox + TypeInfo TyXBMCAddon_xbmcgui_ControlTextBox_Type(typeid(XBMCAddon::xbmcgui::ControlTextBox)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlImage + TypeInfo TyXBMCAddon_xbmcgui_ControlImage_Type(typeid(XBMCAddon::xbmcgui::ControlImage)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlProgress + TypeInfo TyXBMCAddon_xbmcgui_ControlProgress_Type(typeid(XBMCAddon::xbmcgui::ControlProgress)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlButton + TypeInfo TyXBMCAddon_xbmcgui_ControlButton_Type(typeid(XBMCAddon::xbmcgui::ControlButton)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlGroup + TypeInfo TyXBMCAddon_xbmcgui_ControlGroup_Type(typeid(XBMCAddon::xbmcgui::ControlGroup)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlRadioButton + TypeInfo TyXBMCAddon_xbmcgui_ControlRadioButton_Type(typeid(XBMCAddon::xbmcgui::ControlRadioButton)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::ControlSlider + TypeInfo TyXBMCAddon_xbmcgui_ControlSlider_Type(typeid(XBMCAddon::xbmcgui::ControlSlider)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::Dialog + TypeInfo TyXBMCAddon_xbmcgui_Dialog_Type(typeid(XBMCAddon::xbmcgui::Dialog)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::DialogProgress + TypeInfo TyXBMCAddon_xbmcgui_DialogProgress_Type(typeid(XBMCAddon::xbmcgui::DialogProgress)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::DialogBusy + TypeInfo TyXBMCAddon_xbmcgui_DialogBusy_Type(typeid(XBMCAddon::xbmcgui::DialogBusy)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::DialogProgressBG + TypeInfo TyXBMCAddon_xbmcgui_DialogProgressBG_Type(typeid(XBMCAddon::xbmcgui::DialogProgressBG)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::Action + TypeInfo TyXBMCAddon_xbmcgui_Action_Type(typeid(XBMCAddon::xbmcgui::Action)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::Window + TypeInfo TyXBMCAddon_xbmcgui_Window_Type(typeid(XBMCAddon::xbmcgui::Window)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::WindowDialog + TypeInfo TyXBMCAddon_xbmcgui_WindowDialog_Type(typeid(XBMCAddon::xbmcgui::WindowDialog)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::WindowXML + TypeInfo TyXBMCAddon_xbmcgui_WindowXML_Type(typeid(XBMCAddon::xbmcgui::WindowXML)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcgui::WindowXMLDialog + TypeInfo TyXBMCAddon_xbmcgui_WindowXMLDialog_Type(typeid(XBMCAddon::xbmcgui::WindowXMLDialog)); + //========================================================================= + + //========================================================================= + // These variables define the type XBMCAddon::xbmc::InfoTagVideo from another module + extern TypeInfo TyXBMCAddon_xbmc_InfoTagVideo_Type; + //========================================================================= + + //========================================================================= + // These variables define the type xbmc::InfoTagMusic from another module + extern TypeInfo Tyxbmc_InfoTagMusic_Type; + //========================================================================= + + + + //========================================================================= + // This class is the Director for XBMCAddon::xbmcgui::Window. + // It provides the "reverse bridge" from C++ to Python to support + // cross-language polymorphism. + //========================================================================= + class XBMCAddon_xbmcgui_Window_Director : public Director, public XBMCAddon::xbmcgui::Window + { + public: + + inline XBMCAddon_xbmcgui_Window_Director(int existingWindowId ) : XBMCAddon::xbmcgui::Window( existingWindowId ) { } + + virtual void onAction( XBMCAddon::xbmcgui::Action * action ) + { + PyObject* pyaction = NULL; + pyaction = makePythonInstance(action,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onAction",(char*)"(O)", pyaction ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onControl( XBMCAddon::xbmcgui::Control * control ) + { + PyObject* pycontrol = NULL; + pycontrol = makePythonInstance(control,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onControl",(char*)"(O)", pycontrol ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDoubleClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDoubleClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onFocus( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onFocus",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onInit( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onInit",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + }; + + //========================================================================= + // This class is the Director for XBMCAddon::xbmcgui::WindowDialog. + // It provides the "reverse bridge" from C++ to Python to support + // cross-language polymorphism. + //========================================================================= + class XBMCAddon_xbmcgui_WindowDialog_Director : public Director, public XBMCAddon::xbmcgui::WindowDialog + { + public: + + inline XBMCAddon_xbmcgui_WindowDialog_Director() : XBMCAddon::xbmcgui::WindowDialog() { } + + virtual void onAction( XBMCAddon::xbmcgui::Action * action ) + { + PyObject* pyaction = NULL; + pyaction = makePythonInstance(action,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onAction",(char*)"(O)", pyaction ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onControl( XBMCAddon::xbmcgui::Control * control ) + { + PyObject* pycontrol = NULL; + pycontrol = makePythonInstance(control,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onControl",(char*)"(O)", pycontrol ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDoubleClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDoubleClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onFocus( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onFocus",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onInit( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onInit",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + }; + + //========================================================================= + // This class is the Director for XBMCAddon::xbmcgui::WindowXML. + // It provides the "reverse bridge" from C++ to Python to support + // cross-language polymorphism. + //========================================================================= + class XBMCAddon_xbmcgui_WindowXML_Director : public Director, public XBMCAddon::xbmcgui::WindowXML + { + public: + + inline XBMCAddon_xbmcgui_WindowXML_Director(XBMCAddon::String const & xmlFilename, XBMCAddon::String const & scriptPath, XBMCAddon::String const & defaultSkin, XBMCAddon::String const & defaultRes ) : XBMCAddon::xbmcgui::WindowXML( xmlFilename, scriptPath, defaultSkin, defaultRes ) { } + + virtual void onAction( XBMCAddon::xbmcgui::Action * action ) + { + PyObject* pyaction = NULL; + pyaction = makePythonInstance(action,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onAction",(char*)"(O)", pyaction ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onControl( XBMCAddon::xbmcgui::Control * control ) + { + PyObject* pycontrol = NULL; + pycontrol = makePythonInstance(control,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onControl",(char*)"(O)", pycontrol ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDoubleClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDoubleClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onFocus( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onFocus",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onInit( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onInit",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + }; + + //========================================================================= + // This class is the Director for XBMCAddon::xbmcgui::WindowXMLDialog. + // It provides the "reverse bridge" from C++ to Python to support + // cross-language polymorphism. + //========================================================================= + class XBMCAddon_xbmcgui_WindowXMLDialog_Director : public Director, public XBMCAddon::xbmcgui::WindowXMLDialog + { + public: + + inline XBMCAddon_xbmcgui_WindowXMLDialog_Director(XBMCAddon::String const & xmlFilename, XBMCAddon::String const & scriptPath, XBMCAddon::String const & defaultSkin, XBMCAddon::String const & defaultRes ) : XBMCAddon::xbmcgui::WindowXMLDialog( xmlFilename, scriptPath, defaultSkin, defaultRes ) { } + + virtual void onAction( XBMCAddon::xbmcgui::Action * action ) + { + PyObject* pyaction = NULL; + pyaction = makePythonInstance(action,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onAction",(char*)"(O)", pyaction ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onControl( XBMCAddon::xbmcgui::Control * control ) + { + PyObject* pycontrol = NULL; + pycontrol = makePythonInstance(control,true); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onControl",(char*)"(O)", pycontrol ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onDoubleClick( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onDoubleClick",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onFocus( int controlId ) + { + PyObject* pycontrolId = NULL; + pycontrolId = Py_BuildValue((char*)"i", controlId); + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onFocus",(char*)"(O)", pycontrolId ); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + virtual void onInit( ) + { + XBMCAddon::Python::PyContext pyContext; + PyObject_CallMethod(self,(char*)"onInit",(char*)"()"); + if (PyErr_Occurred()) + throw PythonBindings::PythonToCppException(); + } + + }; + + static PyObject* xbmcgui_getCurrentWindowId (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (long )XBMCAddon::xbmcgui::getCurrentWindowId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::getCurrentWindowId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::getCurrentWindowId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_getCurrentWindowDialogId (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (long )XBMCAddon::xbmcgui::getCurrentWindowDialogId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::getCurrentWindowDialogId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::getCurrentWindowDialogId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + "label2", + "iconImage", + "thumbnailImage", + "path", + NULL}; + + std::string label = XBMCAddon::emptyString; + PyObject* pylabel = NULL; + std::string label2 = XBMCAddon::emptyString; + PyObject* pylabel2 = NULL; + std::string iconImage = XBMCAddon::emptyString; + PyObject* pyiconImage = NULL; + std::string thumbnailImage = XBMCAddon::emptyString; + PyObject* pythumbnailImage = NULL; + std::string path = XBMCAddon::emptyString; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|OOOOO", + (char**)keywords, + &pylabel, + &pylabel2, + &pyiconImage, + &pythumbnailImage, + &pypath + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ListItem * apiResult; + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","ListItem"); + if (pylabel2) PyXBMCGetUnicodeString(label2,pylabel2,false,"label2","ListItem"); + if (pyiconImage) PyXBMCGetUnicodeString(iconImage,pyiconImage,false,"iconImage","ListItem"); + if (pythumbnailImage) PyXBMCGetUnicodeString(thumbnailImage,pythumbnailImage,false,"thumbnailImage","ListItem"); + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","ListItem"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ListItem *)new XBMCAddon::xbmcgui::ListItem( label, label2, iconImage, thumbnailImage, path ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ListItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ListItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getLabel","XBMCAddon::xbmcgui::ListItem"))-> getLabel( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getLabel2 (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getLabel2","XBMCAddon::xbmcgui::ListItem"))-> getLabel2( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLabel2\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLabel2\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + NULL}; + + std::string label ; + PyObject* pylabel = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylabel + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","setLabel"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setLabel","XBMCAddon::xbmcgui::ListItem"))-> setLabel( label ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setLabel2 (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + NULL}; + + std::string label ; + PyObject* pylabel = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylabel + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","setLabel2"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setLabel2","XBMCAddon::xbmcgui::ListItem"))-> setLabel2( label ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setLabel2\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setLabel2\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setIconImage (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iconImage", + NULL}; + + std::string iconImage ; + PyObject* pyiconImage = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyiconImage + )) + { + return NULL; + } + + + try + { + if (pyiconImage) PyXBMCGetUnicodeString(iconImage,pyiconImage,false,"iconImage","setIconImage"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setIconImage","XBMCAddon::xbmcgui::ListItem"))-> setIconImage( iconImage ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setIconImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setIconImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setThumbnailImage (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "thumbFilename", + NULL}; + + std::string thumbFilename ; + PyObject* pythumbFilename = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pythumbFilename + )) + { + return NULL; + } + + + try + { + if (pythumbFilename) PyXBMCGetUnicodeString(thumbFilename,pythumbFilename,false,"thumbFilename","setThumbnailImage"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setThumbnailImage","XBMCAddon::xbmcgui::ListItem"))-> setThumbnailImage( thumbFilename ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setThumbnailImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setThumbnailImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setArt (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "dictionary", + NULL}; + + XBMCAddon::Dictionary< XBMCAddon::StringOrInt > dictionary ; + PyObject* pydictionary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pydictionary + )) + { + return NULL; + } + + + try + { + + { + PyObject *pykey, *pyvalue; + Py_ssize_t pos = 0; + while(PyDict_Next(pydictionary, &pos, &pykey, &pyvalue)) + { + std::string key; + PyXBMCGetUnicodeString(key,pykey,false,"dictionary","setArt"); + std::string value; + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,PyInt_Check(pyvalue) || PyLong_Check(pyvalue) || PyFloat_Check(pyvalue),"value","setArt"); + dictionary[key] = value; + } + } + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setArt","XBMCAddon::xbmcgui::ListItem"))-> setArt( dictionary ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setArt\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setArt\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setUniqueIDs (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "dictionary", + NULL}; + + XBMCAddon::Dictionary< XBMCAddon::StringOrInt > dictionary ; + PyObject* pydictionary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pydictionary + )) + { + return NULL; + } + + + try + { + + { + PyObject *pykey, *pyvalue; + Py_ssize_t pos = 0; + while(PyDict_Next(pydictionary, &pos, &pykey, &pyvalue)) + { + std::string key; + PyXBMCGetUnicodeString(key,pykey,false,"dictionary","setUniqueIDs"); + std::string value; + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,PyInt_Check(pyvalue) || PyLong_Check(pyvalue) || PyFloat_Check(pyvalue),"value","setUniqueIDs"); + dictionary[key] = value; + } + } + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setUniqueIDs","XBMCAddon::xbmcgui::ListItem"))-> setUniqueIDs( dictionary ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setUniqueIDs\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setUniqueIDs\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setRating (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "type", + "rating", + "votes", + "defaultt", + NULL}; + + std::string type ; + PyObject* pytype = NULL; + float rating ; + int votes = 0; + bool defaultt = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"Of|ib", + (char**)keywords, + &pytype, + &rating, + &votes, + &defaultt + )) + { + return NULL; + } + + + try + { + if (pytype) PyXBMCGetUnicodeString(type,pytype,false,"type","setRating"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setRating","XBMCAddon::xbmcgui::ListItem"))-> setRating( type, rating, votes, defaultt ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setRating\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setRating\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getArt (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getArt","XBMCAddon::xbmcgui::ListItem"))-> getArt( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getArt\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getArt\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getUniqueID (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getUniqueID","XBMCAddon::xbmcgui::ListItem"))-> getUniqueID( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getUniqueID\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getUniqueID\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getRating (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + float apiResult; + try + { + + apiResult = (float )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getRating","XBMCAddon::xbmcgui::ListItem"))-> getRating( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getRating\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getRating\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"f", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getVotes (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getVotes","XBMCAddon::xbmcgui::ListItem"))-> getVotes( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getVotes\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getVotes\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_select (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "selected", + NULL}; + + bool selected ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &selected + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"select","XBMCAddon::xbmcgui::ListItem"))-> select( selected ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"select\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"select\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_isSelected (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"isSelected","XBMCAddon::xbmcgui::ListItem"))-> isSelected( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isSelected\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isSelected\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setInfo (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "type", + "infoLabels", + NULL}; + + char * type ; + XBMCAddon::Dictionary< XBMCAddon::xbmcgui::InfoLabelValue > infoLabels ; + PyObject* pyinfoLabels = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"sO", + (char**)keywords, + &type, + &pyinfoLabels + )) + { + return NULL; + } + + + try + { + + { + PyObject *pykey, *pyvalue; + Py_ssize_t pos = 0; + while(PyDict_Next(pyinfoLabels, &pos, &pykey, &pyvalue)) + { + std::string key; + PyXBMCGetUnicodeString(key,pykey,false,"infoLabels","setInfo"); + Alternative< XBMCAddon::StringOrInt ,std::vector< XBMCAddon::xbmcgui::InfoLabelStringOrTuple > > value; + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_1 = pyvalue; + try + { + std::string entry0_1; + if (pyentry_1) PyXBMCGetUnicodeString(entry0_1,pyentry_1,PyInt_Check(pyentry_1) || PyLong_Check(pyentry_1) || PyFloat_Check(pyentry_1),"entry0_1","setInfo"); + value.former() = entry0_1; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + std::vector< XBMCAddon::xbmcgui::InfoLabelStringOrTuple > entry1_1; + + if (pyentry_1) + { + bool isTuple = PyObject_TypeCheck(pyentry_1,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyentry_1,&PyList_Type)) + throw WrongTypeException("The parameter \"entry1_1\" must be either a Tuple or a List."); + + + PyObject *pyentry2 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyentry_1) : PyList_Size(pyentry_1)); + for(int i = 0; i < vecSize; i++) + { + pyentry2 = (isTuple ? PyTuple_GetItem(pyentry_1, i) : PyList_GetItem(pyentry_1, i)); + Alternative< XBMCAddon::StringOrInt ,Tuple< XBMCAddon::String ,XBMCAddon::StringOrInt > > entry2; + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_3 = pyentry2; + try + { + std::string entry0_3; + if (pyentry_3) PyXBMCGetUnicodeString(entry0_3,pyentry_3,PyInt_Check(pyentry_3) || PyLong_Check(pyentry_3) || PyFloat_Check(pyentry_3),"entry0_3","setInfo"); + entry2.former() = entry0_3; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + Tuple< XBMCAddon::String ,XBMCAddon::StringOrInt > entry1_3; + + if(pyentry_3) + { + bool isTuple = PyObject_TypeCheck(pyentry_3,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyentry_3,&PyList_Type)) + throw WrongTypeException("The parameter \"entry1_3\" must be either a Tuple or a List."); + int vecSize = (isTuple ? PyTuple_Size(pyentry_3) : PyList_Size(pyentry_3)); + + if (vecSize > 0) + { + PyObject *pyentry0_4 = NULL; + pyentry0_4 = (isTuple ? PyTuple_GetItem(pyentry_3, 0) : PyList_GetItem(pyentry_3, 0)); + std::string entry0_4; + if (pyentry0_4) PyXBMCGetUnicodeString(entry0_4,pyentry0_4,false,"entry0_4","setInfo"); + entry1_3.first() = entry0_4; + } + + if (vecSize > 1) + { + PyObject *pyentry1_4 = NULL; + pyentry1_4 = (isTuple ? PyTuple_GetItem(pyentry_3, 1) : PyList_GetItem(pyentry_3, 1)); + std::string entry1_4; + if (pyentry1_4) PyXBMCGetUnicodeString(entry1_4,pyentry1_4,PyInt_Check(pyentry1_4) || PyLong_Check(pyentry1_4) || PyFloat_Check(pyentry1_4),"entry1_4","setInfo"); + entry1_3.second() = entry1_4; + } + + } + + entry2.later() = entry1_3; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "Tuple<(XBMCAddon::String,XBMCAddon::StringOrInt)>" ); + } + } + } + entry1_1.push_back(entry2); + } + } + + value.later() = entry1_1; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "std::vector<(XBMCAddon::xbmcgui::InfoLabelStringOrTuple)>" ); + } + } + } + infoLabels[key] = value; + } + } + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setInfo","XBMCAddon::xbmcgui::ListItem"))-> setInfo( type, infoLabels ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setInfo\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setInfo\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setCast (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "actors", + NULL}; + + std::vector< XBMCAddon::Properties > actors ; + PyObject* pyactors = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyactors + )) + { + return NULL; + } + + + try + { + + if (pyactors) + { + bool isTuple = PyObject_TypeCheck(pyactors,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyactors,&PyList_Type)) + throw WrongTypeException("The parameter \"actors\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyactors) : PyList_Size(pyactors)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyactors, i) : PyList_GetItem(pyactors, i)); + XBMCAddon::Dictionary< XBMCAddon::StringOrInt > entry1; + + { + PyObject *pykey, *pyvalue; + Py_ssize_t pos = 0; + while(PyDict_Next(pyentry1, &pos, &pykey, &pyvalue)) + { + std::string key; + PyXBMCGetUnicodeString(key,pykey,false,"entry1","setCast"); + std::string value; + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,PyInt_Check(pyvalue) || PyLong_Check(pyvalue) || PyFloat_Check(pyvalue),"value","setCast"); + entry1[key] = value; + } + } + actors.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setCast","XBMCAddon::xbmcgui::ListItem"))-> setCast( actors ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setCast\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setCast\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_addStreamInfo (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "cType", + "dictionary", + NULL}; + + char * cType ; + XBMCAddon::Dictionary< XBMCAddon::StringOrInt > dictionary ; + PyObject* pydictionary = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"sO", + (char**)keywords, + &cType, + &pydictionary + )) + { + return NULL; + } + + + try + { + + { + PyObject *pykey, *pyvalue; + Py_ssize_t pos = 0; + while(PyDict_Next(pydictionary, &pos, &pykey, &pyvalue)) + { + std::string key; + PyXBMCGetUnicodeString(key,pykey,false,"dictionary","addStreamInfo"); + std::string value; + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,PyInt_Check(pyvalue) || PyLong_Check(pyvalue) || PyFloat_Check(pyvalue),"value","addStreamInfo"); + dictionary[key] = value; + } + } + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"addStreamInfo","XBMCAddon::xbmcgui::ListItem"))-> addStreamInfo( cType, dictionary ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addStreamInfo\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addStreamInfo\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_addContextMenuItems (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "items", + "replaceItems", + NULL}; + + std::vector< Tuple< XBMCAddon::String ,XBMCAddon::String > > items ; + PyObject* pyitems = NULL; + bool replaceItems = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|b", + (char**)keywords, + &pyitems, + &replaceItems + )) + { + return NULL; + } + + + try + { + + if (pyitems) + { + bool isTuple = PyObject_TypeCheck(pyitems,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyitems,&PyList_Type)) + throw WrongTypeException("The parameter \"items\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyitems) : PyList_Size(pyitems)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyitems, i) : PyList_GetItem(pyitems, i)); + Tuple< XBMCAddon::String ,XBMCAddon::String > entry1; + + if(pyentry1) + { + bool isTuple = PyObject_TypeCheck(pyentry1,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyentry1,&PyList_Type)) + throw WrongTypeException("The parameter \"entry1\" must be either a Tuple or a List."); + int vecSize = (isTuple ? PyTuple_Size(pyentry1) : PyList_Size(pyentry1)); + + if (vecSize > 0) + { + PyObject *pyentry0_2 = NULL; + pyentry0_2 = (isTuple ? PyTuple_GetItem(pyentry1, 0) : PyList_GetItem(pyentry1, 0)); + std::string entry0_2; + if (pyentry0_2) PyXBMCGetUnicodeString(entry0_2,pyentry0_2,false,"entry0_2","addContextMenuItems"); + entry1.first() = entry0_2; + } + + if (vecSize > 1) + { + PyObject *pyentry1_2 = NULL; + pyentry1_2 = (isTuple ? PyTuple_GetItem(pyentry1, 1) : PyList_GetItem(pyentry1, 1)); + std::string entry1_2; + if (pyentry1_2) PyXBMCGetUnicodeString(entry1_2,pyentry1_2,false,"entry1_2","addContextMenuItems"); + entry1.second() = entry1_2; + } + + } + + items.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"addContextMenuItems","XBMCAddon::xbmcgui::ListItem"))-> addContextMenuItems( items, replaceItems ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addContextMenuItems\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addContextMenuItems\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setProperty (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + "value", + NULL}; + + char * key ; + std::string value ; + PyObject* pyvalue = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"sO", + (char**)keywords, + &key, + &pyvalue + )) + { + return NULL; + } + + + try + { + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,false,"value","setProperty"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setProperty","XBMCAddon::xbmcgui::ListItem"))-> setProperty( key, value ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getProperty (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getProperty","XBMCAddon::xbmcgui::ListItem"))-> getProperty( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setPath (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","setPath"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setPath","XBMCAddon::xbmcgui::ListItem"))-> setPath( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setPath\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setPath\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setMimeType (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "mimetype", + NULL}; + + std::string mimetype ; + PyObject* pymimetype = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pymimetype + )) + { + return NULL; + } + + + try + { + if (pymimetype) PyXBMCGetUnicodeString(mimetype,pymimetype,false,"mimetype","setMimeType"); + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setMimeType","XBMCAddon::xbmcgui::ListItem"))-> setMimeType( mimetype ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setMimeType\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setMimeType\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setContentLookup (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "enable", + NULL}; + + bool enable ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &enable + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setContentLookup","XBMCAddon::xbmcgui::ListItem"))-> setContentLookup( enable ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setContentLookup\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setContentLookup\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_setSubtitles (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "subtitleFiles", + NULL}; + + std::vector< XBMCAddon::String > subtitleFiles ; + PyObject* pysubtitleFiles = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pysubtitleFiles + )) + { + return NULL; + } + + + try + { + + if (pysubtitleFiles) + { + bool isTuple = PyObject_TypeCheck(pysubtitleFiles,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pysubtitleFiles,&PyList_Type)) + throw WrongTypeException("The parameter \"subtitleFiles\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pysubtitleFiles) : PyList_Size(pysubtitleFiles)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pysubtitleFiles, i) : PyList_GetItem(pysubtitleFiles, i)); + std::string entry1; + if (pyentry1) PyXBMCGetUnicodeString(entry1,pyentry1,false,"entry1","setSubtitles"); + subtitleFiles.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"setSubtitles","XBMCAddon::xbmcgui::ListItem"))-> setSubtitles( subtitleFiles ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setSubtitles\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setSubtitles\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getdescription (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getdescription","XBMCAddon::xbmcgui::ListItem"))-> getdescription( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getdescription\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getdescription\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getduration (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getduration","XBMCAddon::xbmcgui::ListItem"))-> getduration( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getduration\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getduration\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getfilename (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getfilename","XBMCAddon::xbmcgui::ListItem"))-> getfilename( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getfilename\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getfilename\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getPath (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getPath","XBMCAddon::xbmcgui::ListItem"))-> getPath( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPath\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPath\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getVideoInfoTag (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + xbmc::InfoTagVideo * apiResult; + try + { + + apiResult = (xbmc::InfoTagVideo *)((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getVideoInfoTag","XBMCAddon::xbmcgui::ListItem"))-> getVideoInfoTag( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getVideoInfoTag\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getVideoInfoTag\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ListItem_getMusicInfoTag (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + xbmc::InfoTagMusic * apiResult; + try + { + + apiResult = (xbmc::InfoTagMusic *)((XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"getMusicInfoTag","XBMCAddon::xbmcgui::ListItem"))-> getMusicInfoTag( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getMusicInfoTag\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getMusicInfoTag\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_canAcceptMessages (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "actionId", + NULL}; + + int actionId ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &actionId + )) + { + return NULL; + } + + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"canAcceptMessages","XBMCAddon::xbmcgui::Control"))-> canAcceptMessages( actionId ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"canAcceptMessages\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"canAcceptMessages\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_getId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"getId","XBMCAddon::xbmcgui::Control"))-> getId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + + + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_getPosition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::vector< int > apiResult; + try + { + + apiResult = (std::vector< int > )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"getPosition","XBMCAddon::xbmcgui::Control"))-> getPosition( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPosition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPosition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + result = PyList_New(0); + + for (std::vector::iterator iter = apiResult.begin(); iter != apiResult.end(); ++iter) + { + int & entry1 = *iter; + PyObject* pyentry1; + pyentry1 = Py_BuildValue((char*)"i", entry1); + PyList_Append(result, pyentry1); + Py_DECREF(pyentry1); + } + + + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_getX (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"getX","XBMCAddon::xbmcgui::Control"))-> getX( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getX\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getX\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_getY (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"getY","XBMCAddon::xbmcgui::Control"))-> getY( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getY\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getY\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_getHeight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"getHeight","XBMCAddon::xbmcgui::Control"))-> getHeight( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getHeight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getHeight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_getWidth (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"getWidth","XBMCAddon::xbmcgui::Control"))-> getWidth( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getWidth\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getWidth\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setEnabled (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "enabled", + NULL}; + + bool enabled ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &enabled + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setEnabled","XBMCAddon::xbmcgui::Control"))-> setEnabled( enabled ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setEnabled\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setEnabled\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setVisible (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "visible", + NULL}; + + bool visible ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &visible + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setVisible","XBMCAddon::xbmcgui::Control"))-> setVisible( visible ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setVisible\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setVisible\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setVisibleCondition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "visible", + "allowHiddenFocus", + NULL}; + + char * visible ; + bool allowHiddenFocus = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s|b", + (char**)keywords, + &visible, + &allowHiddenFocus + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setVisibleCondition","XBMCAddon::xbmcgui::Control"))-> setVisibleCondition( visible, allowHiddenFocus ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setVisibleCondition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setVisibleCondition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setEnableCondition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "enable", + NULL}; + + char * enable ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &enable + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setEnableCondition","XBMCAddon::xbmcgui::Control"))-> setEnableCondition( enable ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setEnableCondition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setEnableCondition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setAnimations (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "eventAttr", + NULL}; + + std::vector< Tuple< XBMCAddon::String ,XBMCAddon::String > > eventAttr ; + PyObject* pyeventAttr = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyeventAttr + )) + { + return NULL; + } + + + try + { + + if (pyeventAttr) + { + bool isTuple = PyObject_TypeCheck(pyeventAttr,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyeventAttr,&PyList_Type)) + throw WrongTypeException("The parameter \"eventAttr\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyeventAttr) : PyList_Size(pyeventAttr)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyeventAttr, i) : PyList_GetItem(pyeventAttr, i)); + Tuple< XBMCAddon::String ,XBMCAddon::String > entry1; + + if(pyentry1) + { + bool isTuple = PyObject_TypeCheck(pyentry1,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyentry1,&PyList_Type)) + throw WrongTypeException("The parameter \"entry1\" must be either a Tuple or a List."); + int vecSize = (isTuple ? PyTuple_Size(pyentry1) : PyList_Size(pyentry1)); + + if (vecSize > 0) + { + PyObject *pyentry0_2 = NULL; + pyentry0_2 = (isTuple ? PyTuple_GetItem(pyentry1, 0) : PyList_GetItem(pyentry1, 0)); + std::string entry0_2; + if (pyentry0_2) PyXBMCGetUnicodeString(entry0_2,pyentry0_2,false,"entry0_2","setAnimations"); + entry1.first() = entry0_2; + } + + if (vecSize > 1) + { + PyObject *pyentry1_2 = NULL; + pyentry1_2 = (isTuple ? PyTuple_GetItem(pyentry1, 1) : PyList_GetItem(pyentry1, 1)); + std::string entry1_2; + if (pyentry1_2) PyXBMCGetUnicodeString(entry1_2,pyentry1_2,false,"entry1_2","setAnimations"); + entry1.second() = entry1_2; + } + + } + + eventAttr.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setAnimations","XBMCAddon::xbmcgui::Control"))-> setAnimations( eventAttr ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setAnimations\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setAnimations\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setPosition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + NULL}; + + long x ; + long y ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ll", + (char**)keywords, + &x, + &y + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setPosition","XBMCAddon::xbmcgui::Control"))-> setPosition( x, y ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setPosition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setPosition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setWidth (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "width", + NULL}; + + long width ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &width + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setWidth","XBMCAddon::xbmcgui::Control"))-> setWidth( width ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setWidth\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setWidth\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setHeight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "height", + NULL}; + + long height ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &height + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setHeight","XBMCAddon::xbmcgui::Control"))-> setHeight( height ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setHeight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setHeight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_setNavigation (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "up", + "down", + "left", + "right", + NULL}; + + XBMCAddon::xbmcgui::Control * up ; + PyObject* pyup = NULL; + XBMCAddon::xbmcgui::Control * down ; + PyObject* pydown = NULL; + XBMCAddon::xbmcgui::Control * left ; + PyObject* pyleft = NULL; + XBMCAddon::xbmcgui::Control * right ; + PyObject* pyright = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OOOO", + (char**)keywords, + &pyup, + &pydown, + &pyleft, + &pyright + )) + { + return NULL; + } + + + try + { + up = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pyup,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","setNavigation"); + down = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pydown,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","setNavigation"); + left = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pyleft,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","setNavigation"); + right = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pyright,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","setNavigation"); + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"setNavigation","XBMCAddon::xbmcgui::Control"))-> setNavigation( up, down, left, right ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setNavigation\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setNavigation\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_controlUp (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "up", + NULL}; + + XBMCAddon::xbmcgui::Control * up ; + PyObject* pyup = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyup + )) + { + return NULL; + } + + + try + { + up = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pyup,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","controlUp"); + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"controlUp","XBMCAddon::xbmcgui::Control"))-> controlUp( up ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"controlUp\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"controlUp\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_controlDown (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "control", + NULL}; + + XBMCAddon::xbmcgui::Control * control ; + PyObject* pycontrol = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pycontrol + )) + { + return NULL; + } + + + try + { + control = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pycontrol,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","controlDown"); + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"controlDown","XBMCAddon::xbmcgui::Control"))-> controlDown( control ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"controlDown\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"controlDown\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_controlLeft (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "control", + NULL}; + + XBMCAddon::xbmcgui::Control * control ; + PyObject* pycontrol = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pycontrol + )) + { + return NULL; + } + + + try + { + control = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pycontrol,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","controlLeft"); + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"controlLeft","XBMCAddon::xbmcgui::Control"))-> controlLeft( control ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"controlLeft\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"controlLeft\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Control_controlRight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "control", + NULL}; + + XBMCAddon::xbmcgui::Control * control ; + PyObject* pycontrol = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pycontrol + )) + { + return NULL; + } + + + try + { + control = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pycontrol,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","controlRight"); + + ((XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"controlRight","XBMCAddon::xbmcgui::Control"))-> controlRight( control ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"controlRight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"controlRight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlSpin_setTextures (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "up", + "down", + "upFocus", + "downFocus", + "upDisabled", + "downDisabled", + NULL}; + + char * up ; + char * down ; + char * upFocus ; + char * downFocus ; + char * upDisabled ; + char * downDisabled ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ssssss", + (char**)keywords, + &up, + &down, + &upFocus, + &downFocus, + &upDisabled, + &downDisabled + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlSpin*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlSpin_Type,"setTextures","XBMCAddon::xbmcgui::ControlSpin"))-> setTextures( up, down, upFocus, downFocus, upDisabled, downDisabled ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setTextures\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setTextures\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlLabel_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "label", + "font", + "textColor", + "disabledColor", + "alignment", + "hasPath", + "angle", + NULL}; + + long x ; + long y ; + long width ; + long height ; + std::string label ; + PyObject* pylabel = NULL; + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + long alignment = XBFONT_LEFT; + bool hasPath = false; + long angle = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llllO|ssslbl", + (char**)keywords, + &x, + &y, + &width, + &height, + &pylabel, + &font, + &textColor, + &disabledColor, + &alignment, + &hasPath, + &angle + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlLabel * apiResult; + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","ControlLabel"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlLabel *)new XBMCAddon::xbmcgui::ControlLabel( x, y, width, height, label, font, textColor, disabledColor, alignment, hasPath, angle ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlLabel_getLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ControlLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlLabel_Type,"getLabel","XBMCAddon::xbmcgui::ControlLabel"))-> getLabel( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlLabel_setLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + "font", + "textColor", + "disabledColor", + "shadowColor", + "focusedColor", + "label2", + NULL}; + + std::string label = XBMCAddon::emptyString; + PyObject* pylabel = NULL; + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + char * shadowColor = NULL; + char * focusedColor = NULL; + std::string label2 = XBMCAddon::emptyString; + PyObject* pylabel2 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|OsssssO", + (char**)keywords, + &pylabel, + &font, + &textColor, + &disabledColor, + &shadowColor, + &focusedColor, + &pylabel2 + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","setLabel"); + if (pylabel2) PyXBMCGetUnicodeString(label2,pylabel2,false,"label2","setLabel"); + + ((XBMCAddon::xbmcgui::ControlLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlLabel_Type,"setLabel","XBMCAddon::xbmcgui::ControlLabel"))-> setLabel( label, font, textColor, disabledColor, shadowColor, focusedColor, label2 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlEdit_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "label", + "font", + "textColor", + "disabledColor", + "_alignment", + "focusTexture", + "noFocusTexture", + "isPassword", + NULL}; + + long x ; + long y ; + long width ; + long height ; + std::string label ; + PyObject* pylabel = NULL; + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + long _alignment = XBFONT_LEFT; + char * focusTexture = NULL; + char * noFocusTexture = NULL; + bool isPassword = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llllO|ssslssb", + (char**)keywords, + &x, + &y, + &width, + &height, + &pylabel, + &font, + &textColor, + &disabledColor, + &_alignment, + &focusTexture, + &noFocusTexture, + &isPassword + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlEdit * apiResult; + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","ControlEdit"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlEdit *)new XBMCAddon::xbmcgui::ControlEdit( x, y, width, height, label, font, textColor, disabledColor, _alignment, focusTexture, noFocusTexture, isPassword ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlEdit\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlEdit\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlEdit_setLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + "font", + "textColor", + "disabledColor", + "shadowColor", + "focusedColor", + "label2", + NULL}; + + std::string label = XBMCAddon::emptyString; + PyObject* pylabel = NULL; + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + char * shadowColor = NULL; + char * focusedColor = NULL; + std::string label2 = XBMCAddon::emptyString; + PyObject* pylabel2 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|OsssssO", + (char**)keywords, + &pylabel, + &font, + &textColor, + &disabledColor, + &shadowColor, + &focusedColor, + &pylabel2 + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","setLabel"); + if (pylabel2) PyXBMCGetUnicodeString(label2,pylabel2,false,"label2","setLabel"); + + ((XBMCAddon::xbmcgui::ControlEdit*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlEdit_Type,"setLabel","XBMCAddon::xbmcgui::ControlEdit"))-> setLabel( label, font, textColor, disabledColor, shadowColor, focusedColor, label2 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlEdit_getLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ControlEdit*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlEdit_Type,"getLabel","XBMCAddon::xbmcgui::ControlEdit"))-> getLabel( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlEdit_setText (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "text", + NULL}; + + std::string text ; + PyObject* pytext = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pytext + )) + { + return NULL; + } + + + try + { + if (pytext) PyXBMCGetUnicodeString(text,pytext,false,"text","setText"); + + ((XBMCAddon::xbmcgui::ControlEdit*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlEdit_Type,"setText","XBMCAddon::xbmcgui::ControlEdit"))-> setText( text ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setText\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setText\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlEdit_getText (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ControlEdit*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlEdit_Type,"getText","XBMCAddon::xbmcgui::ControlEdit"))-> getText( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getText\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getText\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "font", + "textColor", + "buttonTexture", + "buttonFocusTexture", + "selectedColor", + "_imageWidth", + "_imageHeight", + "_itemTextXOffset", + "_itemTextYOffset", + "_itemHeight", + "_space", + "_alignmentY", + NULL}; + + long x ; + long y ; + long width ; + long height ; + char * font = NULL; + char * textColor = NULL; + char * buttonTexture = NULL; + char * buttonFocusTexture = NULL; + char * selectedColor = NULL; + long _imageWidth = 10; + long _imageHeight = 10; + long _itemTextXOffset = 10; + long _itemTextYOffset = 2; + long _itemHeight = 27; + long _space = 2; + long _alignmentY = XBFONT_CENTER_Y; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll|ssssslllllll", + (char**)keywords, + &x, + &y, + &width, + &height, + &font, + &textColor, + &buttonTexture, + &buttonFocusTexture, + &selectedColor, + &_imageWidth, + &_imageHeight, + &_itemTextXOffset, + &_itemTextYOffset, + &_itemHeight, + &_space, + &_alignmentY + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlList * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlList *)new XBMCAddon::xbmcgui::ControlList( x, y, width, height, font, textColor, buttonTexture, buttonFocusTexture, selectedColor, _imageWidth, _imageHeight, _itemTextXOffset, _itemTextYOffset, _itemHeight, _space, _alignmentY ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlList\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlList\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_addItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "item", + "sendMessage", + NULL}; + + Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > item ; + PyObject* pyitem = NULL; + bool sendMessage = true; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|b", + (char**)keywords, + &pyitem, + &sendMessage + )) + { + return NULL; + } + + + try + { + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_1 = pyitem; + try + { + std::string entry0_1; + if (pyentry_1) PyXBMCGetUnicodeString(entry0_1,pyentry_1,false,"entry0_1","addItem"); + item.former() = entry0_1; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + XBMCAddon::xbmcgui::ListItem * entry1_1; + entry1_1 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry_1,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","addItem"); + item.later() = entry1_1; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.XBMCAddon::xbmcgui::ListItem" ); + } + } + } + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"addItem","XBMCAddon::xbmcgui::ControlList"))-> addItem( item, sendMessage ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_addItems (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "items", + NULL}; + + std::vector< Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > > items ; + PyObject* pyitems = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyitems + )) + { + return NULL; + } + + + try + { + + if (pyitems) + { + bool isTuple = PyObject_TypeCheck(pyitems,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyitems,&PyList_Type)) + throw WrongTypeException("The parameter \"items\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyitems) : PyList_Size(pyitems)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyitems, i) : PyList_GetItem(pyitems, i)); + Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > entry1; + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_2 = pyentry1; + try + { + std::string entry0_2; + if (pyentry_2) PyXBMCGetUnicodeString(entry0_2,pyentry_2,false,"entry0_2","addItems"); + entry1.former() = entry0_2; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + XBMCAddon::xbmcgui::ListItem * entry1_2; + entry1_2 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry_2,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","addItems"); + entry1.later() = entry1_2; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.XBMCAddon::xbmcgui::ListItem" ); + } + } + } + items.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"addItems","XBMCAddon::xbmcgui::ControlList"))-> addItems( items ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addItems\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addItems\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_selectItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "item", + NULL}; + + long item ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &item + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"selectItem","XBMCAddon::xbmcgui::ControlList"))-> selectItem( item ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"selectItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"selectItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_removeItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "index", + NULL}; + + int index ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &index + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"removeItem","XBMCAddon::xbmcgui::ControlList"))-> removeItem( index ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"removeItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"removeItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_reset (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"reset","XBMCAddon::xbmcgui::ControlList"))-> reset( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"reset\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"reset\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_getSpinControl (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::Control * apiResult; + try + { + + apiResult = (XBMCAddon::xbmcgui::Control *)((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"getSpinControl","XBMCAddon::xbmcgui::ControlList"))-> getSpinControl( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSpinControl\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSpinControl\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_getSelectedPosition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"getSelectedPosition","XBMCAddon::xbmcgui::ControlList"))-> getSelectedPosition( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSelectedPosition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSelectedPosition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_getSelectedItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::ListItem * apiResult; + try + { + + apiResult = (XBMCAddon::xbmcgui::ListItem *)((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"getSelectedItem","XBMCAddon::xbmcgui::ControlList"))-> getSelectedItem( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSelectedItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSelectedItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_setImageDimensions (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "imageWidth", + "imageHeight", + NULL}; + + long imageWidth ; + long imageHeight ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ll", + (char**)keywords, + &imageWidth, + &imageHeight + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"setImageDimensions","XBMCAddon::xbmcgui::ControlList"))-> setImageDimensions( imageWidth, imageHeight ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setImageDimensions\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setImageDimensions\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_setItemHeight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "height", + NULL}; + + long height ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &height + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"setItemHeight","XBMCAddon::xbmcgui::ControlList"))-> setItemHeight( height ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setItemHeight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setItemHeight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_setSpace (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "space", + NULL}; + + int space ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &space + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"setSpace","XBMCAddon::xbmcgui::ControlList"))-> setSpace( space ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setSpace\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setSpace\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_setPageControlVisible (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "visible", + NULL}; + + bool visible ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &visible + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"setPageControlVisible","XBMCAddon::xbmcgui::ControlList"))-> setPageControlVisible( visible ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setPageControlVisible\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setPageControlVisible\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_size (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"size","XBMCAddon::xbmcgui::ControlList"))-> size( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"size\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"size\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_getItemHeight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"getItemHeight","XBMCAddon::xbmcgui::ControlList"))-> getItemHeight( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getItemHeight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getItemHeight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_getSpace (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"getSpace","XBMCAddon::xbmcgui::ControlList"))-> getSpace( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getSpace\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getSpace\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_getListItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "index", + NULL}; + + int index ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &index + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ListItem * apiResult; + try + { + + apiResult = (XBMCAddon::xbmcgui::ListItem *)((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"getListItem","XBMCAddon::xbmcgui::ControlList"))-> getListItem( index ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getListItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getListItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlList_setStaticContent (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "items", + NULL}; + + std::vector< XBMCAddon::xbmcgui::ListItem * > * items ; + PyObject* pyitems = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyitems + )) + { + return NULL; + } + + + try + { + + if (pyitems) + { + bool isTuple = PyObject_TypeCheck(pyitems,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyitems,&PyList_Type)) + throw WrongTypeException("The parameter \"items\" must be either a Tuple or a List."); + + items = new std::vector(); + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyitems) : PyList_Size(pyitems)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyitems, i) : PyList_GetItem(pyitems, i)); + XBMCAddon::xbmcgui::ListItem * entry1; + entry1 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry1,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","setStaticContent"); + items->push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"setStaticContent","XBMCAddon::xbmcgui::ControlList"))-> setStaticContent( items ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setStaticContent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setStaticContent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "font", + "textColor", + "_alignment", + NULL}; + + long x ; + long y ; + long width ; + long height ; + char * font = NULL; + char * textColor = NULL; + long _alignment = XBFONT_LEFT; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll|ssl", + (char**)keywords, + &x, + &y, + &width, + &height, + &font, + &textColor, + &_alignment + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlFadeLabel * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlFadeLabel *)new XBMCAddon::xbmcgui::ControlFadeLabel( x, y, width, height, font, textColor, _alignment ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlFadeLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlFadeLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_addLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + NULL}; + + std::string label ; + PyObject* pylabel = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylabel + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","addLabel"); + + ((XBMCAddon::xbmcgui::ControlFadeLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlFadeLabel_Type,"addLabel","XBMCAddon::xbmcgui::ControlFadeLabel"))-> addLabel( label ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_setScrolling (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "scroll", + NULL}; + + bool scroll ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &scroll + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlFadeLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlFadeLabel_Type,"setScrolling","XBMCAddon::xbmcgui::ControlFadeLabel"))-> setScrolling( scroll ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setScrolling\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setScrolling\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_reset (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::ControlFadeLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlFadeLabel_Type,"reset","XBMCAddon::xbmcgui::ControlFadeLabel"))-> reset( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"reset\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"reset\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "font", + "textColor", + NULL}; + + long x ; + long y ; + long width ; + long height ; + char * font = NULL; + char * textColor = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll|ss", + (char**)keywords, + &x, + &y, + &width, + &height, + &font, + &textColor + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlTextBox * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlTextBox *)new XBMCAddon::xbmcgui::ControlTextBox( x, y, width, height, font, textColor ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlTextBox\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlTextBox\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_setText (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "text", + NULL}; + + std::string text ; + PyObject* pytext = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pytext + )) + { + return NULL; + } + + + try + { + if (pytext) PyXBMCGetUnicodeString(text,pytext,false,"text","setText"); + + ((XBMCAddon::xbmcgui::ControlTextBox*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlTextBox_Type,"setText","XBMCAddon::xbmcgui::ControlTextBox"))-> setText( text ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setText\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setText\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_getText (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ControlTextBox*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlTextBox_Type,"getText","XBMCAddon::xbmcgui::ControlTextBox"))-> getText( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getText\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getText\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_reset (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::ControlTextBox*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlTextBox_Type,"reset","XBMCAddon::xbmcgui::ControlTextBox"))-> reset( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"reset\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"reset\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_scroll (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "id", + NULL}; + + long id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &id + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlTextBox*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlTextBox_Type,"scroll","XBMCAddon::xbmcgui::ControlTextBox"))-> scroll( id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"scroll\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"scroll\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_autoScroll (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "delay", + "time", + "repeat", + NULL}; + + int delay ; + int time ; + int repeat ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iii", + (char**)keywords, + &delay, + &time, + &repeat + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlTextBox*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlTextBox_Type,"autoScroll","XBMCAddon::xbmcgui::ControlTextBox"))-> autoScroll( delay, time, repeat ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"autoScroll\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"autoScroll\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlImage_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "filename", + "aspectRatio", + "colorDiffuse", + NULL}; + + long x ; + long y ; + long width ; + long height ; + char * filename ; + long aspectRatio = 0; + char * colorDiffuse = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"lllls|ls", + (char**)keywords, + &x, + &y, + &width, + &height, + &filename, + &aspectRatio, + &colorDiffuse + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlImage * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlImage *)new XBMCAddon::xbmcgui::ControlImage( x, y, width, height, filename, aspectRatio, colorDiffuse ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlImage_setImage (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "imageFilename", + "useCache", + NULL}; + + char * imageFilename ; + bool useCache = true; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s|b", + (char**)keywords, + &imageFilename, + &useCache + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlImage*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlImage_Type,"setImage","XBMCAddon::xbmcgui::ControlImage"))-> setImage( imageFilename, useCache ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setImage\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlImage_setColorDiffuse (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "hexString", + NULL}; + + char * hexString ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &hexString + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlImage*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlImage_Type,"setColorDiffuse","XBMCAddon::xbmcgui::ControlImage"))-> setColorDiffuse( hexString ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setColorDiffuse\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setColorDiffuse\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlProgress_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "texturebg", + "textureleft", + "texturemid", + "textureright", + "textureoverlay", + NULL}; + + long x ; + long y ; + long width ; + long height ; + char * texturebg = NULL; + char * textureleft = NULL; + char * texturemid = NULL; + char * textureright = NULL; + char * textureoverlay = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll|sssss", + (char**)keywords, + &x, + &y, + &width, + &height, + &texturebg, + &textureleft, + &texturemid, + &textureright, + &textureoverlay + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlProgress * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlProgress *)new XBMCAddon::xbmcgui::ControlProgress( x, y, width, height, texturebg, textureleft, texturemid, textureright, textureoverlay ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlProgress\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlProgress\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlProgress_setPercent (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pct", + NULL}; + + float pct ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"f", + (char**)keywords, + &pct + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlProgress_Type,"setPercent","XBMCAddon::xbmcgui::ControlProgress"))-> setPercent( pct ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setPercent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setPercent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlProgress_getPercent (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + float apiResult; + try + { + + apiResult = (float )((XBMCAddon::xbmcgui::ControlProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlProgress_Type,"getPercent","XBMCAddon::xbmcgui::ControlProgress"))-> getPercent( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPercent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPercent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"f", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlButton_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "label", + "focusTexture", + "noFocusTexture", + "textOffsetX", + "textOffsetY", + "alignment", + "font", + "textColor", + "disabledColor", + "angle", + "shadowColor", + "focusedColor", + NULL}; + + long x ; + long y ; + long width ; + long height ; + std::string label ; + PyObject* pylabel = NULL; + char * focusTexture = NULL; + char * noFocusTexture = NULL; + long textOffsetX = 10; + long textOffsetY = 2; + long alignment = (XBFONT_LEFT|XBFONT_CENTER_Y); + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + long angle = 0; + char * shadowColor = NULL; + char * focusedColor = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llllO|sslllssslss", + (char**)keywords, + &x, + &y, + &width, + &height, + &pylabel, + &focusTexture, + &noFocusTexture, + &textOffsetX, + &textOffsetY, + &alignment, + &font, + &textColor, + &disabledColor, + &angle, + &shadowColor, + &focusedColor + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlButton * apiResult; + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","ControlButton"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlButton *)new XBMCAddon::xbmcgui::ControlButton( x, y, width, height, label, focusTexture, noFocusTexture, textOffsetX, textOffsetY, alignment, font, textColor, disabledColor, angle, shadowColor, focusedColor ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlButton\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlButton\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlButton_setLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + "font", + "textColor", + "disabledColor", + "shadowColor", + "focusedColor", + "label2", + NULL}; + + std::string label = XBMCAddon::emptyString; + PyObject* pylabel = NULL; + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + char * shadowColor = NULL; + char * focusedColor = NULL; + std::string label2 = XBMCAddon::emptyString; + PyObject* pylabel2 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|OsssssO", + (char**)keywords, + &pylabel, + &font, + &textColor, + &disabledColor, + &shadowColor, + &focusedColor, + &pylabel2 + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","setLabel"); + if (pylabel2) PyXBMCGetUnicodeString(label2,pylabel2,false,"label2","setLabel"); + + ((XBMCAddon::xbmcgui::ControlButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlButton_Type,"setLabel","XBMCAddon::xbmcgui::ControlButton"))-> setLabel( label, font, textColor, disabledColor, shadowColor, focusedColor, label2 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlButton_setDisabledColor (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "color", + NULL}; + + char * color ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &color + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlButton_Type,"setDisabledColor","XBMCAddon::xbmcgui::ControlButton"))-> setDisabledColor( color ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setDisabledColor\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setDisabledColor\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlButton_getLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ControlButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlButton_Type,"getLabel","XBMCAddon::xbmcgui::ControlButton"))-> getLabel( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyUnicode_DecodeUTF8(apiResult.c_str(),apiResult.size(),"replace"); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlButton_getLabel2 (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::ControlButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlButton_Type,"getLabel2","XBMCAddon::xbmcgui::ControlButton"))-> getLabel2( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getLabel2\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getLabel2\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyUnicode_DecodeUTF8(apiResult.c_str(),apiResult.size(),"replace"); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlGroup_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + NULL}; + + long x ; + long y ; + long width ; + long height ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll", + (char**)keywords, + &x, + &y, + &width, + &height + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlGroup * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlGroup *)new XBMCAddon::xbmcgui::ControlGroup( x, y, width, height ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlGroup\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlGroup\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "label", + "focusOnTexture", + "noFocusOnTexture", + "focusOffTexture", + "noFocusOffTexture", + "focusTexture", + "noFocusTexture", + "textOffsetX", + "textOffsetY", + "_alignment", + "font", + "textColor", + "disabledColor", + "angle", + "shadowColor", + "focusedColor", + "disabledOnTexture", + "disabledOffTexture", + NULL}; + + long x ; + long y ; + long width ; + long height ; + std::string label ; + PyObject* pylabel = NULL; + char * focusOnTexture = NULL; + char * noFocusOnTexture = NULL; + char * focusOffTexture = NULL; + char * noFocusOffTexture = NULL; + char * focusTexture = NULL; + char * noFocusTexture = NULL; + long textOffsetX = 10; + long textOffsetY = 2; + long _alignment = (XBFONT_LEFT|XBFONT_CENTER_Y); + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + long angle = 0; + char * shadowColor = NULL; + char * focusedColor = NULL; + char * disabledOnTexture = NULL; + char * disabledOffTexture = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llllO|sssssslllssslssss", + (char**)keywords, + &x, + &y, + &width, + &height, + &pylabel, + &focusOnTexture, + &noFocusOnTexture, + &focusOffTexture, + &noFocusOffTexture, + &focusTexture, + &noFocusTexture, + &textOffsetX, + &textOffsetY, + &_alignment, + &font, + &textColor, + &disabledColor, + &angle, + &shadowColor, + &focusedColor, + &disabledOnTexture, + &disabledOffTexture + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlRadioButton * apiResult; + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","ControlRadioButton"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlRadioButton *)new XBMCAddon::xbmcgui::ControlRadioButton( x, y, width, height, label, focusOnTexture, noFocusOnTexture, focusOffTexture, noFocusOffTexture, focusTexture, noFocusTexture, textOffsetX, textOffsetY, _alignment, font, textColor, disabledColor, angle, shadowColor, focusedColor, disabledOnTexture, disabledOffTexture ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlRadioButton\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlRadioButton\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_setSelected (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "selected", + NULL}; + + bool selected ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"b", + (char**)keywords, + &selected + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlRadioButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlRadioButton_Type,"setSelected","XBMCAddon::xbmcgui::ControlRadioButton"))-> setSelected( selected ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setSelected\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setSelected\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_isSelected (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmcgui::ControlRadioButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlRadioButton_Type,"isSelected","XBMCAddon::xbmcgui::ControlRadioButton"))-> isSelected( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isSelected\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isSelected\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_setLabel (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "label", + "font", + "textColor", + "disabledColor", + "shadowColor", + "focusedColor", + "label2", + NULL}; + + std::string label = XBMCAddon::emptyString; + PyObject* pylabel = NULL; + char * font = NULL; + char * textColor = NULL; + char * disabledColor = NULL; + char * shadowColor = NULL; + char * focusedColor = NULL; + std::string label2 = XBMCAddon::emptyString; + PyObject* pylabel2 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|OsssssO", + (char**)keywords, + &pylabel, + &font, + &textColor, + &disabledColor, + &shadowColor, + &focusedColor, + &pylabel2 + )) + { + return NULL; + } + + + try + { + if (pylabel) PyXBMCGetUnicodeString(label,pylabel,false,"label","setLabel"); + if (pylabel2) PyXBMCGetUnicodeString(label2,pylabel2,false,"label2","setLabel"); + + ((XBMCAddon::xbmcgui::ControlRadioButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlRadioButton_Type,"setLabel","XBMCAddon::xbmcgui::ControlRadioButton"))-> setLabel( label, font, textColor, disabledColor, shadowColor, focusedColor, label2 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setLabel\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_setRadioDimension (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + NULL}; + + long x ; + long y ; + long width ; + long height ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll", + (char**)keywords, + &x, + &y, + &width, + &height + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlRadioButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlRadioButton_Type,"setRadioDimension","XBMCAddon::xbmcgui::ControlRadioButton"))-> setRadioDimension( x, y, width, height ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setRadioDimension\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setRadioDimension\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlSlider_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "x", + "y", + "width", + "height", + "textureback", + "texture", + "texturefocus", + "orientation", + NULL}; + + long x ; + long y ; + long width ; + long height ; + char * textureback = NULL; + char * texture = NULL; + char * texturefocus = NULL; + int orientation = 1; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"llll|sssi", + (char**)keywords, + &x, + &y, + &width, + &height, + &textureback, + &texture, + &texturefocus, + &orientation + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ControlSlider * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::ControlSlider *)new XBMCAddon::xbmcgui::ControlSlider( x, y, width, height, textureback, texture, texturefocus, orientation ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlSlider\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::ControlSlider\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlSlider_getPercent (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + float apiResult; + try + { + + apiResult = (float )((XBMCAddon::xbmcgui::ControlSlider*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlSlider_Type,"getPercent","XBMCAddon::xbmcgui::ControlSlider"))-> getPercent( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getPercent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getPercent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"f", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_ControlSlider_setPercent (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pct", + NULL}; + + float pct ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"f", + (char**)keywords, + &pct + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::ControlSlider*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlSlider_Type,"setPercent","XBMCAddon::xbmcgui::ControlSlider"))-> setPercent( pct ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setPercent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setPercent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::Dialog * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::Dialog *)new XBMCAddon::xbmcgui::Dialog( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::Dialog\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::Dialog\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_yesno (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "line1", + "line2", + "line3", + "nolabel", + "yeslabel", + "autoclose", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string line1 ; + PyObject* pyline1 = NULL; + std::string line2 = XBMCAddon::emptyString; + PyObject* pyline2 = NULL; + std::string line3 = XBMCAddon::emptyString; + PyObject* pyline3 = NULL; + std::string nolabel = XBMCAddon::emptyString; + PyObject* pynolabel = NULL; + std::string yeslabel = XBMCAddon::emptyString; + PyObject* pyyeslabel = NULL; + int autoclose = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO|OOOOi", + (char**)keywords, + &pyheading, + &pyline1, + &pyline2, + &pyline3, + &pynolabel, + &pyyeslabel, + &autoclose + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","yesno"); + if (pyline1) PyXBMCGetUnicodeString(line1,pyline1,false,"line1","yesno"); + if (pyline2) PyXBMCGetUnicodeString(line2,pyline2,false,"line2","yesno"); + if (pyline3) PyXBMCGetUnicodeString(line3,pyline3,false,"line3","yesno"); + if (pynolabel) PyXBMCGetUnicodeString(nolabel,pynolabel,false,"nolabel","yesno"); + if (pyyeslabel) PyXBMCGetUnicodeString(yeslabel,pyyeslabel,false,"yeslabel","yesno"); + + apiResult = (bool )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"yesno","XBMCAddon::xbmcgui::Dialog"))-> yesno( heading, line1, line2, line3, nolabel, yeslabel, autoclose ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"yesno\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"yesno\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_info (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "item", + NULL}; + + XBMCAddon::xbmcgui::ListItem * item ; + PyObject* pyitem = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyitem + )) + { + return NULL; + } + + bool apiResult; + try + { + item = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyitem,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","info"); + + apiResult = (bool )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"info","XBMCAddon::xbmcgui::Dialog"))-> info( item ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"info\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"info\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_select (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "list", + "autoclose", + "preselect", + "useDetails", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::vector< Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > > list ; + PyObject* pylist = NULL; + int autoclose = 0; + int preselect = -1; + bool useDetails = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO|iib", + (char**)keywords, + &pyheading, + &pylist, + &autoclose, + &preselect, + &useDetails + )) + { + return NULL; + } + + int apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","select"); + + if (pylist) + { + bool isTuple = PyObject_TypeCheck(pylist,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pylist,&PyList_Type)) + throw WrongTypeException("The parameter \"list\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pylist) : PyList_Size(pylist)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pylist, i) : PyList_GetItem(pylist, i)); + Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > entry1; + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_2 = pyentry1; + try + { + std::string entry0_2; + if (pyentry_2) PyXBMCGetUnicodeString(entry0_2,pyentry_2,false,"entry0_2","select"); + entry1.former() = entry0_2; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + XBMCAddon::xbmcgui::ListItem * entry1_2; + entry1_2 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry_2,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","select"); + entry1.later() = entry1_2; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.XBMCAddon::xbmcgui::ListItem" ); + } + } + } + list.push_back(entry1); + } + } + + + apiResult = (int )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"select","XBMCAddon::xbmcgui::Dialog"))-> select( heading, list, autoclose, preselect, useDetails ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"select\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"select\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_contextmenu (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "list", + NULL}; + + std::vector< XBMCAddon::String > list ; + PyObject* pylist = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pylist + )) + { + return NULL; + } + + int apiResult; + try + { + + if (pylist) + { + bool isTuple = PyObject_TypeCheck(pylist,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pylist,&PyList_Type)) + throw WrongTypeException("The parameter \"list\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pylist) : PyList_Size(pylist)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pylist, i) : PyList_GetItem(pylist, i)); + std::string entry1; + if (pyentry1) PyXBMCGetUnicodeString(entry1,pyentry1,false,"entry1","contextmenu"); + list.push_back(entry1); + } + } + + + apiResult = (int )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"contextmenu","XBMCAddon::xbmcgui::Dialog"))-> contextmenu( list ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"contextmenu\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"contextmenu\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_multiselect (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "options", + "autoclose", + "preselect", + "useDetails", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::vector< Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > > options ; + PyObject* pyoptions = NULL; + int autoclose = 0; + std::vector< int > preselect = std::vector< int >(); + PyObject* pypreselect = NULL; + bool useDetails = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO|iOb", + (char**)keywords, + &pyheading, + &pyoptions, + &autoclose, + &pypreselect, + &useDetails + )) + { + return NULL; + } + + std::unique_ptr< std::vector< int > > apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","multiselect"); + + if (pyoptions) + { + bool isTuple = PyObject_TypeCheck(pyoptions,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyoptions,&PyList_Type)) + throw WrongTypeException("The parameter \"options\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyoptions) : PyList_Size(pyoptions)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyoptions, i) : PyList_GetItem(pyoptions, i)); + Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > entry1; + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_2 = pyentry1; + try + { + std::string entry0_2; + if (pyentry_2) PyXBMCGetUnicodeString(entry0_2,pyentry_2,false,"entry0_2","multiselect"); + entry1.former() = entry0_2; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + XBMCAddon::xbmcgui::ListItem * entry1_2; + entry1_2 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry_2,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","multiselect"); + entry1.later() = entry1_2; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.XBMCAddon::xbmcgui::ListItem" ); + } + } + } + options.push_back(entry1); + } + } + + + if (pypreselect) + { + bool isTuple = PyObject_TypeCheck(pypreselect,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pypreselect,&PyList_Type)) + throw WrongTypeException("The parameter \"preselect\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pypreselect) : PyList_Size(pypreselect)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pypreselect, i) : PyList_GetItem(pypreselect, i)); + int entry1; + entry1 = (int)PyInt_AsLong(pyentry1); + preselect.push_back(entry1); + } + } + + + apiResult = (std::unique_ptr< std::vector< int > > )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"multiselect","XBMCAddon::xbmcgui::Dialog"))-> multiselect( heading, options, autoclose, preselect, useDetails ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"multiselect\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"multiselect\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + std::vector< int > * entry1 = apiResult.get(); + + if (entry1 != NULL) + { + + result = PyList_New(0); + + for (std::vector::iterator iter = entry1->begin(); iter != entry1->end(); ++iter) + { + int & entry2 = *iter; + PyObject* pyentry2; + pyentry2 = Py_BuildValue((char*)"i", entry2); + PyList_Append(result, pyentry2); + Py_DECREF(pyentry2); + } + + } + + + + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_ok (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "line1", + "line2", + "line3", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string line1 ; + PyObject* pyline1 = NULL; + std::string line2 = XBMCAddon::emptyString; + PyObject* pyline2 = NULL; + std::string line3 = XBMCAddon::emptyString; + PyObject* pyline3 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO|OO", + (char**)keywords, + &pyheading, + &pyline1, + &pyline2, + &pyline3 + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","ok"); + if (pyline1) PyXBMCGetUnicodeString(line1,pyline1,false,"line1","ok"); + if (pyline2) PyXBMCGetUnicodeString(line2,pyline2,false,"line2","ok"); + if (pyline3) PyXBMCGetUnicodeString(line3,pyline3,false,"line3","ok"); + + apiResult = (bool )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"ok","XBMCAddon::xbmcgui::Dialog"))-> ok( heading, line1, line2, line3 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"ok\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"ok\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_textviewer (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "text", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string text ; + PyObject* pytext = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO", + (char**)keywords, + &pyheading, + &pytext + )) + { + return NULL; + } + + + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","textviewer"); + if (pytext) PyXBMCGetUnicodeString(text,pytext,false,"text","textviewer"); + + ((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"textviewer","XBMCAddon::xbmcgui::Dialog"))-> textviewer( heading, text ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"textviewer\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"textviewer\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_browse (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "type", + "heading", + "shares", + "mask", + "useThumbs", + "treatAsFolder", + "defaultt", + "enableMultiple", + NULL}; + + int type ; + std::string heading ; + PyObject* pyheading = NULL; + std::string shares ; + PyObject* pyshares = NULL; + std::string mask = XBMCAddon::emptyString; + PyObject* pymask = NULL; + bool useThumbs = false; + bool treatAsFolder = false; + std::string defaultt = XBMCAddon::emptyString; + PyObject* pydefaultt = NULL; + bool enableMultiple = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iOO|ObbOb", + (char**)keywords, + &type, + &pyheading, + &pyshares, + &pymask, + &useThumbs, + &treatAsFolder, + &pydefaultt, + &enableMultiple + )) + { + return NULL; + } + + Alternative< XBMCAddon::String ,std::vector< XBMCAddon::String > > apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","browse"); + if (pyshares) PyXBMCGetUnicodeString(shares,pyshares,false,"shares","browse"); + if (pymask) PyXBMCGetUnicodeString(mask,pymask,false,"mask","browse"); + if (pydefaultt) PyXBMCGetUnicodeString(defaultt,pydefaultt,false,"defaultt","browse"); + + apiResult = (Alternative< XBMCAddon::String ,std::vector< XBMCAddon::String > > )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"browse","XBMCAddon::xbmcgui::Dialog"))-> browse( type, heading, shares, mask, useThumbs, treatAsFolder, defaultt, enableMultiple ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"browse\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"browse\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + WhichAlternative pos = apiResult.which(); + + if (pos != XBMCAddon::none) + { + if (pos == XBMCAddon::first) + { + std::string & entry1 = apiResult.former(); + { + result = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + } + } + + if (pos == XBMCAddon::second) + { + std::vector< XBMCAddon::String > & entry1 = apiResult.later(); + { + + result = PyList_New(0); + + for (std::vector::iterator iter = entry1.begin(); iter != entry1.end(); ++iter) + { + std::string & entry2 = *iter; + PyObject* pyentry2; + pyentry2 = PyString_FromStringAndSize(entry2.c_str(), entry2.length()); + PyList_Append(result, pyentry2); + Py_DECREF(pyentry2); + } + + + } + } + + } + else + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_browseSingle (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "type", + "heading", + "shares", + "mask", + "useThumbs", + "treatAsFolder", + "defaultt", + NULL}; + + int type ; + std::string heading ; + PyObject* pyheading = NULL; + std::string shares ; + PyObject* pyshares = NULL; + std::string mask = XBMCAddon::emptyString; + PyObject* pymask = NULL; + bool useThumbs = false; + bool treatAsFolder = false; + std::string defaultt = XBMCAddon::emptyString; + PyObject* pydefaultt = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iOO|ObbO", + (char**)keywords, + &type, + &pyheading, + &pyshares, + &pymask, + &useThumbs, + &treatAsFolder, + &pydefaultt + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","browseSingle"); + if (pyshares) PyXBMCGetUnicodeString(shares,pyshares,false,"shares","browseSingle"); + if (pymask) PyXBMCGetUnicodeString(mask,pymask,false,"mask","browseSingle"); + if (pydefaultt) PyXBMCGetUnicodeString(defaultt,pydefaultt,false,"defaultt","browseSingle"); + + apiResult = (std::string )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"browseSingle","XBMCAddon::xbmcgui::Dialog"))-> browseSingle( type, heading, shares, mask, useThumbs, treatAsFolder, defaultt ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"browseSingle\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"browseSingle\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_browseMultiple (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "type", + "heading", + "shares", + "mask", + "useThumbs", + "treatAsFolder", + "defaultt", + NULL}; + + int type ; + std::string heading ; + PyObject* pyheading = NULL; + std::string shares ; + PyObject* pyshares = NULL; + std::string mask = XBMCAddon::emptyString; + PyObject* pymask = NULL; + bool useThumbs = false; + bool treatAsFolder = false; + std::string defaultt = XBMCAddon::emptyString; + PyObject* pydefaultt = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iOO|ObbO", + (char**)keywords, + &type, + &pyheading, + &pyshares, + &pymask, + &useThumbs, + &treatAsFolder, + &pydefaultt + )) + { + return NULL; + } + + std::vector< XBMCAddon::String > apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","browseMultiple"); + if (pyshares) PyXBMCGetUnicodeString(shares,pyshares,false,"shares","browseMultiple"); + if (pymask) PyXBMCGetUnicodeString(mask,pymask,false,"mask","browseMultiple"); + if (pydefaultt) PyXBMCGetUnicodeString(defaultt,pydefaultt,false,"defaultt","browseMultiple"); + + apiResult = (std::vector< XBMCAddon::String > )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"browseMultiple","XBMCAddon::xbmcgui::Dialog"))-> browseMultiple( type, heading, shares, mask, useThumbs, treatAsFolder, defaultt ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"browseMultiple\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"browseMultiple\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + result = PyList_New(0); + + for (std::vector::iterator iter = apiResult.begin(); iter != apiResult.end(); ++iter) + { + std::string & entry1 = *iter; + PyObject* pyentry1; + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + PyList_Append(result, pyentry1); + Py_DECREF(pyentry1); + } + + + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_numeric (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "type", + "heading", + "defaultt", + NULL}; + + int type ; + std::string heading ; + PyObject* pyheading = NULL; + std::string defaultt = XBMCAddon::emptyString; + PyObject* pydefaultt = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iO|O", + (char**)keywords, + &type, + &pyheading, + &pydefaultt + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","numeric"); + if (pydefaultt) PyXBMCGetUnicodeString(defaultt,pydefaultt,false,"defaultt","numeric"); + + apiResult = (std::string )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"numeric","XBMCAddon::xbmcgui::Dialog"))-> numeric( type, heading, defaultt ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"numeric\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"numeric\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_notification (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "message", + "icon", + "time", + "sound", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string message ; + PyObject* pymessage = NULL; + std::string icon = XBMCAddon::emptyString; + PyObject* pyicon = NULL; + int time = 0; + bool sound = true; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO|Oib", + (char**)keywords, + &pyheading, + &pymessage, + &pyicon, + &time, + &sound + )) + { + return NULL; + } + + + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","notification"); + if (pymessage) PyXBMCGetUnicodeString(message,pymessage,false,"message","notification"); + if (pyicon) PyXBMCGetUnicodeString(icon,pyicon,false,"icon","notification"); + + ((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"notification","XBMCAddon::xbmcgui::Dialog"))-> notification( heading, message, icon, time, sound ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"notification\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"notification\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Dialog_input (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "defaultt", + "type", + "option", + "autoclose", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string defaultt = XBMCAddon::emptyString; + PyObject* pydefaultt = NULL; + int type = 0; + int option = 0; + int autoclose = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|Oiii", + (char**)keywords, + &pyheading, + &pydefaultt, + &type, + &option, + &autoclose + )) + { + return NULL; + } + + std::string apiResult; + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","input"); + if (pydefaultt) PyXBMCGetUnicodeString(defaultt,pydefaultt,false,"defaultt","input"); + + apiResult = (std::string )((XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"input","XBMCAddon::xbmcgui::Dialog"))-> input( heading, defaultt, type, option, autoclose ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"input\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"input\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgress_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::DialogProgress * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::DialogProgress *)new XBMCAddon::xbmcgui::DialogProgress( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::DialogProgress\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::DialogProgress\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgress_create (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "line1", + "line2", + "line3", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string line1 = XBMCAddon::emptyString; + PyObject* pyline1 = NULL; + std::string line2 = XBMCAddon::emptyString; + PyObject* pyline2 = NULL; + std::string line3 = XBMCAddon::emptyString; + PyObject* pyline3 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|OOO", + (char**)keywords, + &pyheading, + &pyline1, + &pyline2, + &pyline3 + )) + { + return NULL; + } + + + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","create"); + if (pyline1) PyXBMCGetUnicodeString(line1,pyline1,false,"line1","create"); + if (pyline2) PyXBMCGetUnicodeString(line2,pyline2,false,"line2","create"); + if (pyline3) PyXBMCGetUnicodeString(line3,pyline3,false,"line3","create"); + + ((XBMCAddon::xbmcgui::DialogProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgress_Type,"create","XBMCAddon::xbmcgui::DialogProgress"))-> create( heading, line1, line2, line3 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"create\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"create\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgress_update (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "percent", + "line1", + "line2", + "line3", + NULL}; + + int percent ; + std::string line1 = XBMCAddon::emptyString; + PyObject* pyline1 = NULL; + std::string line2 = XBMCAddon::emptyString; + PyObject* pyline2 = NULL; + std::string line3 = XBMCAddon::emptyString; + PyObject* pyline3 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i|OOO", + (char**)keywords, + &percent, + &pyline1, + &pyline2, + &pyline3 + )) + { + return NULL; + } + + + try + { + if (pyline1) PyXBMCGetUnicodeString(line1,pyline1,false,"line1","update"); + if (pyline2) PyXBMCGetUnicodeString(line2,pyline2,false,"line2","update"); + if (pyline3) PyXBMCGetUnicodeString(line3,pyline3,false,"line3","update"); + + ((XBMCAddon::xbmcgui::DialogProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgress_Type,"update","XBMCAddon::xbmcgui::DialogProgress"))-> update( percent, line1, line2, line3 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"update\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"update\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgress_close (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::DialogProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgress_Type,"close","XBMCAddon::xbmcgui::DialogProgress"))-> close( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"close\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"close\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgress_iscanceled (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmcgui::DialogProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgress_Type,"iscanceled","XBMCAddon::xbmcgui::DialogProgress"))-> iscanceled( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"iscanceled\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"iscanceled\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogBusy_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::DialogBusy * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::DialogBusy *)new XBMCAddon::xbmcgui::DialogBusy( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::DialogBusy\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::DialogBusy\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogBusy_create (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::DialogBusy*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogBusy_Type,"create","XBMCAddon::xbmcgui::DialogBusy"))-> create( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"create\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"create\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogBusy_update (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "percent", + NULL}; + + int percent ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &percent + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::DialogBusy*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogBusy_Type,"update","XBMCAddon::xbmcgui::DialogBusy"))-> update( percent ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"update\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"update\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogBusy_close (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::DialogBusy*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogBusy_Type,"close","XBMCAddon::xbmcgui::DialogBusy"))-> close( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"close\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"close\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogBusy_iscanceled (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmcgui::DialogBusy*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogBusy_Type,"iscanceled","XBMCAddon::xbmcgui::DialogBusy"))-> iscanceled( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"iscanceled\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"iscanceled\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::DialogProgressBG * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::DialogProgressBG *)new XBMCAddon::xbmcgui::DialogProgressBG( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::DialogProgressBG\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::DialogProgressBG\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_create (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "heading", + "message", + NULL}; + + std::string heading ; + PyObject* pyheading = NULL; + std::string message = XBMCAddon::emptyString; + PyObject* pymessage = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|O", + (char**)keywords, + &pyheading, + &pymessage + )) + { + return NULL; + } + + + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","create"); + if (pymessage) PyXBMCGetUnicodeString(message,pymessage,false,"message","create"); + + ((XBMCAddon::xbmcgui::DialogProgressBG*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgressBG_Type,"create","XBMCAddon::xbmcgui::DialogProgressBG"))-> create( heading, message ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"create\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"create\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_update (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "percent", + "heading", + "message", + NULL}; + + int percent = 0; + std::string heading = XBMCAddon::emptyString; + PyObject* pyheading = NULL; + std::string message = XBMCAddon::emptyString; + PyObject* pymessage = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|iOO", + (char**)keywords, + &percent, + &pyheading, + &pymessage + )) + { + return NULL; + } + + + try + { + if (pyheading) PyXBMCGetUnicodeString(heading,pyheading,false,"heading","update"); + if (pymessage) PyXBMCGetUnicodeString(message,pymessage,false,"message","update"); + + ((XBMCAddon::xbmcgui::DialogProgressBG*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgressBG_Type,"update","XBMCAddon::xbmcgui::DialogProgressBG"))-> update( percent, heading, message ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"update\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"update\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_close (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::DialogProgressBG*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgressBG_Type,"close","XBMCAddon::xbmcgui::DialogProgressBG"))-> close( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"close\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"close\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_isFinished (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + bool apiResult; + try + { + + apiResult = (bool )((XBMCAddon::xbmcgui::DialogProgressBG*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgressBG_Type,"isFinished","XBMCAddon::xbmcgui::DialogProgressBG"))-> isFinished( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"isFinished\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"isFinished\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Action_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::Action * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::Action *)new XBMCAddon::xbmcgui::Action( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::Action\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::Action\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Action_getId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::Action*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Action_Type,"getId","XBMCAddon::xbmcgui::Action"))-> getId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Action_getButtonCode (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::Action*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Action_Type,"getButtonCode","XBMCAddon::xbmcgui::Action"))-> getButtonCode( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getButtonCode\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getButtonCode\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Action_getAmount1 (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + float apiResult; + try + { + + apiResult = (float )((XBMCAddon::xbmcgui::Action*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Action_Type,"getAmount1","XBMCAddon::xbmcgui::Action"))-> getAmount1( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAmount1\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAmount1\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"f", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Action_getAmount2 (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + float apiResult; + try + { + + apiResult = (float )((XBMCAddon::xbmcgui::Action*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Action_Type,"getAmount2","XBMCAddon::xbmcgui::Action"))-> getAmount2( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getAmount2\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getAmount2\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"f", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + int existingWindowId = -1; + if (!PyArg_ParseTuple( + args, + + (char*)"|i", + + &existingWindowId + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::Window * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::Window *)(&(TyXBMCAddon_xbmcgui_Window_Type.pythonType) != pytype) ? new XBMCAddon_xbmcgui_Window_Director( existingWindowId ) : new XBMCAddon::xbmcgui::Window( existingWindowId ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::Window\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::Window\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + if (&(TyXBMCAddon_xbmcgui_Window_Type.pythonType) != pytype) + ((XBMCAddon_xbmcgui_Window_Director*)apiResult)->setPyObjectForDirector(result); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_onAction (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "action", + NULL}; + + XBMCAddon::xbmcgui::Action * action ; + PyObject* pyaction = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyaction + )) + { + return NULL; + } + + + try + { + action = (XBMCAddon::xbmcgui::Action *)retrieveApiInstance(pyaction,"p.XBMCAddon::xbmcgui::Action","XBMCAddon::xbmcgui::","onAction"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"onAction","XBMCAddon::xbmcgui::Window"))-> XBMCAddon::xbmcgui::Window::onAction( action ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onAction\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onAction\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_onControl (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "control", + NULL}; + + XBMCAddon::xbmcgui::Control * control ; + PyObject* pycontrol = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pycontrol + )) + { + return NULL; + } + + + try + { + control = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pycontrol,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","onControl"); + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"onControl","XBMCAddon::xbmcgui::Window"))-> XBMCAddon::xbmcgui::Window::onControl( control ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onControl\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onControl\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_onClick (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "controlId", + NULL}; + + int controlId ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &controlId + )) + { + return NULL; + } + + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"onClick","XBMCAddon::xbmcgui::Window"))-> XBMCAddon::xbmcgui::Window::onClick( controlId ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onClick\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onClick\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_onDoubleClick (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "controlId", + NULL}; + + int controlId ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &controlId + )) + { + return NULL; + } + + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"onDoubleClick","XBMCAddon::xbmcgui::Window"))-> XBMCAddon::xbmcgui::Window::onDoubleClick( controlId ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onDoubleClick\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onDoubleClick\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_onFocus (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "controlId", + NULL}; + + int controlId ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &controlId + )) + { + return NULL; + } + + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"onFocus","XBMCAddon::xbmcgui::Window"))-> XBMCAddon::xbmcgui::Window::onFocus( controlId ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onFocus\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onFocus\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_onInit (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + // This is a director call comming from python so it explcitly calls the base class method. + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"onInit","XBMCAddon::xbmcgui::Window"))-> XBMCAddon::xbmcgui::Window::onInit( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"onInit\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"onInit\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_show (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"show","XBMCAddon::xbmcgui::Window"))-> show( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"show\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"show\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_setFocus (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pControl", + NULL}; + + XBMCAddon::xbmcgui::Control * pControl ; + PyObject* pypControl = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypControl + )) + { + return NULL; + } + + + try + { + pControl = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pypControl,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","setFocus"); + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"setFocus","XBMCAddon::xbmcgui::Window"))-> setFocus( pControl ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setFocus\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setFocus\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_setFocusId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iControlId", + NULL}; + + int iControlId ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &iControlId + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"setFocusId","XBMCAddon::xbmcgui::Window"))-> setFocusId( iControlId ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setFocusId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setFocusId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getFocus (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::Control * apiResult; + try + { + + apiResult = (XBMCAddon::xbmcgui::Control *)((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getFocus","XBMCAddon::xbmcgui::Window"))-> getFocus( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getFocus\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getFocus\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getFocusId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getFocusId","XBMCAddon::xbmcgui::Window"))-> getFocusId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getFocusId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getFocusId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_removeControl (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pControl", + NULL}; + + XBMCAddon::xbmcgui::Control * pControl ; + PyObject* pypControl = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypControl + )) + { + return NULL; + } + + + try + { + pControl = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pypControl,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","removeControl"); + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"removeControl","XBMCAddon::xbmcgui::Window"))-> removeControl( pControl ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"removeControl\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"removeControl\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_removeControls (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pControls", + NULL}; + + std::vector< XBMCAddon::xbmcgui::Control * > pControls ; + PyObject* pypControls = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypControls + )) + { + return NULL; + } + + + try + { + + if (pypControls) + { + bool isTuple = PyObject_TypeCheck(pypControls,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pypControls,&PyList_Type)) + throw WrongTypeException("The parameter \"pControls\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pypControls) : PyList_Size(pypControls)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pypControls, i) : PyList_GetItem(pypControls, i)); + XBMCAddon::xbmcgui::Control * entry1; + entry1 = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pyentry1,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","removeControls"); + pControls.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"removeControls","XBMCAddon::xbmcgui::Window"))-> removeControls( pControls ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"removeControls\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"removeControls\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getHeight (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getHeight","XBMCAddon::xbmcgui::Window"))-> getHeight( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getHeight\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getHeight\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getWidth (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getWidth","XBMCAddon::xbmcgui::Window"))-> getWidth( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getWidth\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getWidth\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getResolution (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long apiResult; + try + { + + apiResult = (long )((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getResolution","XBMCAddon::xbmcgui::Window"))-> getResolution( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getResolution\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getResolution\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyInt_FromLong(apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_setCoordinateResolution (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "res", + NULL}; + + long res ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"l", + (char**)keywords, + &res + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"setCoordinateResolution","XBMCAddon::xbmcgui::Window"))-> setCoordinateResolution( res ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setCoordinateResolution\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setCoordinateResolution\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_setProperty (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + "value", + NULL}; + + char * key ; + std::string value ; + PyObject* pyvalue = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"sO", + (char**)keywords, + &key, + &pyvalue + )) + { + return NULL; + } + + + try + { + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,false,"value","setProperty"); + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"setProperty","XBMCAddon::xbmcgui::Window"))-> setProperty( key, value ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getProperty (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getProperty","XBMCAddon::xbmcgui::Window"))-> getProperty( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_clearProperty (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "key", + NULL}; + + char * key ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"s", + (char**)keywords, + &key + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"clearProperty","XBMCAddon::xbmcgui::Window"))-> clearProperty( key ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"clearProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"clearProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_clearProperties (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"clearProperties","XBMCAddon::xbmcgui::Window"))-> clearProperties( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"clearProperties\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"clearProperties\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_close (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"close","XBMCAddon::xbmcgui::Window"))-> close( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"close\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"close\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_doModal (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"doModal","XBMCAddon::xbmcgui::Window"))-> doModal( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"doModal\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"doModal\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_addControl (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pControl", + NULL}; + + XBMCAddon::xbmcgui::Control * pControl ; + PyObject* pypControl = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypControl + )) + { + return NULL; + } + + + try + { + pControl = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pypControl,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","addControl"); + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"addControl","XBMCAddon::xbmcgui::Window"))-> addControl( pControl ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addControl\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addControl\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_addControls (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "pControls", + NULL}; + + std::vector< XBMCAddon::xbmcgui::Control * > pControls ; + PyObject* pypControls = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypControls + )) + { + return NULL; + } + + + try + { + + if (pypControls) + { + bool isTuple = PyObject_TypeCheck(pypControls,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pypControls,&PyList_Type)) + throw WrongTypeException("The parameter \"pControls\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pypControls) : PyList_Size(pypControls)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pypControls, i) : PyList_GetItem(pypControls, i)); + XBMCAddon::xbmcgui::Control * entry1; + entry1 = (XBMCAddon::xbmcgui::Control *)retrieveApiInstance(pyentry1,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","addControls"); + pControls.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"addControls","XBMCAddon::xbmcgui::Window"))-> addControls( pControls ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addControls\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addControls\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Window_getControl (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "iControlId", + NULL}; + + int iControlId ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &iControlId + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::Control * apiResult; + try + { + + apiResult = (XBMCAddon::xbmcgui::Control *)((XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"getControl","XBMCAddon::xbmcgui::Window"))-> getControl( iControlId ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getControl\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getControl\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowDialog_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcgui::WindowDialog * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::WindowDialog *)(&(TyXBMCAddon_xbmcgui_WindowDialog_Type.pythonType) != pytype) ? new XBMCAddon_xbmcgui_WindowDialog_Director() : new XBMCAddon::xbmcgui::WindowDialog( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::WindowDialog\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::WindowDialog\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + if (&(TyXBMCAddon_xbmcgui_WindowDialog_Type.pythonType) != pytype) + ((XBMCAddon_xbmcgui_WindowDialog_Director*)apiResult)->setPyObjectForDirector(result); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + std::string xmlFilename ; + PyObject* pyxmlFilename = NULL; + std::string scriptPath ; + PyObject* pyscriptPath = NULL; + std::string defaultSkin = "Default"; + PyObject* pydefaultSkin = NULL; + std::string defaultRes = "720p"; + PyObject* pydefaultRes = NULL; + if (!PyArg_ParseTuple( + args, + + (char*)"OO|OO", + + &pyxmlFilename, + &pyscriptPath, + &pydefaultSkin, + &pydefaultRes + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::WindowXML * apiResult; + try + { + if (pyxmlFilename) PyXBMCGetUnicodeString(xmlFilename,pyxmlFilename,false,"xmlFilename","WindowXML"); + if (pyscriptPath) PyXBMCGetUnicodeString(scriptPath,pyscriptPath,false,"scriptPath","WindowXML"); + if (pydefaultSkin) PyXBMCGetUnicodeString(defaultSkin,pydefaultSkin,false,"defaultSkin","WindowXML"); + if (pydefaultRes) PyXBMCGetUnicodeString(defaultRes,pydefaultRes,false,"defaultRes","WindowXML"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::WindowXML *)(&(TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType) != pytype) ? new XBMCAddon_xbmcgui_WindowXML_Director( xmlFilename, scriptPath, defaultSkin, defaultRes ) : new XBMCAddon::xbmcgui::WindowXML( xmlFilename, scriptPath, defaultSkin, defaultRes ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::WindowXML\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::WindowXML\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + if (&(TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType) != pytype) + ((XBMCAddon_xbmcgui_WindowXML_Director*)apiResult)->setPyObjectForDirector(result); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_addItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "item", + "position", + NULL}; + + Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > item ; + PyObject* pyitem = NULL; + int position = INT_MAX; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|i", + (char**)keywords, + &pyitem, + &position + )) + { + return NULL; + } + + + try + { + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_1 = pyitem; + try + { + std::string entry0_1; + if (pyentry_1) PyXBMCGetUnicodeString(entry0_1,pyentry_1,false,"entry0_1","addItem"); + item.former() = entry0_1; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + XBMCAddon::xbmcgui::ListItem * entry1_1; + entry1_1 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry_1,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","addItem"); + item.later() = entry1_1; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.XBMCAddon::xbmcgui::ListItem" ); + } + } + } + + ((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"addItem","XBMCAddon::xbmcgui::WindowXML"))-> addItem( item, position ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_addItems (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "items", + NULL}; + + std::vector< Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > > items ; + PyObject* pyitems = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyitems + )) + { + return NULL; + } + + + try + { + + if (pyitems) + { + bool isTuple = PyObject_TypeCheck(pyitems,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyitems,&PyList_Type)) + throw WrongTypeException("The parameter \"items\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyitems) : PyList_Size(pyitems)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyitems, i) : PyList_GetItem(pyitems, i)); + Alternative< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const * > entry1; + + { + // we need to check the parameter type and see if it matches + PyObject *pyentry_2 = pyentry1; + try + { + std::string entry0_2; + if (pyentry_2) PyXBMCGetUnicodeString(entry0_2,pyentry_2,false,"entry0_2","addItems"); + entry1.former() = entry0_2; + } + catch (XBMCAddon::WrongTypeException wte) + { + try + { + XBMCAddon::xbmcgui::ListItem * entry1_2; + entry1_2 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry_2,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::","addItems"); + entry1.later() = entry1_2; + } + catch (XBMCAddon::WrongTypeException wte2) + { + throw XBMCAddon::WrongTypeException("Failed to convert to input type to either a " + "std::string or a " + "p.XBMCAddon::xbmcgui::ListItem" ); + } + } + } + items.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"addItems","XBMCAddon::xbmcgui::WindowXML"))-> addItems( items ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"addItems\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"addItems\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_removeItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "position", + NULL}; + + int position ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &position + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"removeItem","XBMCAddon::xbmcgui::WindowXML"))-> removeItem( position ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"removeItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"removeItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_getCurrentListPosition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"getCurrentListPosition","XBMCAddon::xbmcgui::WindowXML"))-> getCurrentListPosition( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getCurrentListPosition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getCurrentListPosition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_setCurrentListPosition (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "position", + NULL}; + + int position ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &position + )) + { + return NULL; + } + + + try + { + + ((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"setCurrentListPosition","XBMCAddon::xbmcgui::WindowXML"))-> setCurrentListPosition( position ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setCurrentListPosition\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setCurrentListPosition\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_getListItem (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "position", + NULL}; + + int position ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i", + (char**)keywords, + &position + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::ListItem * apiResult; + try + { + + apiResult = (XBMCAddon::xbmcgui::ListItem *)((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"getListItem","XBMCAddon::xbmcgui::WindowXML"))-> getListItem( position ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getListItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getListItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_getListSize (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"getListSize","XBMCAddon::xbmcgui::WindowXML"))-> getListSize( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getListSize\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getListSize\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_clearList (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"clearList","XBMCAddon::xbmcgui::WindowXML"))-> clearList( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"clearList\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"clearList\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_setContainerProperty (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "strProperty", + "strValue", + NULL}; + + std::string strProperty ; + PyObject* pystrProperty = NULL; + std::string strValue ; + PyObject* pystrValue = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO", + (char**)keywords, + &pystrProperty, + &pystrValue + )) + { + return NULL; + } + + + try + { + if (pystrProperty) PyXBMCGetUnicodeString(strProperty,pystrProperty,false,"strProperty","setContainerProperty"); + if (pystrValue) PyXBMCGetUnicodeString(strValue,pystrValue,false,"strValue","setContainerProperty"); + + ((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"setContainerProperty","XBMCAddon::xbmcgui::WindowXML"))-> setContainerProperty( strProperty, strValue ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"setContainerProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"setContainerProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXML_getCurrentContainerId (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + int apiResult; + try + { + + apiResult = (int )((XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"getCurrentContainerId","XBMCAddon::xbmcgui::WindowXML"))-> getCurrentContainerId( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"getCurrentContainerId\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"getCurrentContainerId\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"i", apiResult); + + return result; + } + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_WindowXMLDialog_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + std::string xmlFilename ; + PyObject* pyxmlFilename = NULL; + std::string scriptPath ; + PyObject* pyscriptPath = NULL; + std::string defaultSkin = "Default"; + PyObject* pydefaultSkin = NULL; + std::string defaultRes = "720p"; + PyObject* pydefaultRes = NULL; + if (!PyArg_ParseTuple( + args, + + (char*)"OO|OO", + + &pyxmlFilename, + &pyscriptPath, + &pydefaultSkin, + &pydefaultRes + )) + { + return NULL; + } + + XBMCAddon::xbmcgui::WindowXMLDialog * apiResult; + try + { + if (pyxmlFilename) PyXBMCGetUnicodeString(xmlFilename,pyxmlFilename,false,"xmlFilename","WindowXMLDialog"); + if (pyscriptPath) PyXBMCGetUnicodeString(scriptPath,pyscriptPath,false,"scriptPath","WindowXMLDialog"); + if (pydefaultSkin) PyXBMCGetUnicodeString(defaultSkin,pydefaultSkin,false,"defaultSkin","WindowXMLDialog"); + if (pydefaultRes) PyXBMCGetUnicodeString(defaultRes,pydefaultRes,false,"defaultRes","WindowXMLDialog"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcgui::WindowXMLDialog *)(&(TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.pythonType) != pytype) ? new XBMCAddon_xbmcgui_WindowXMLDialog_Director( xmlFilename, scriptPath, defaultSkin, defaultRes ) : new XBMCAddon::xbmcgui::WindowXMLDialog( xmlFilename, scriptPath, defaultSkin, defaultRes ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::WindowXMLDialog\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcgui::WindowXMLDialog\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + if (&(TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.pythonType) != pytype) + ((XBMCAddon_xbmcgui_WindowXMLDialog_Director*)apiResult)->setPyObjectForDirector(result); + + return result; + } + + static void xbmcgui_XBMCAddon_xbmcgui_ListItem_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ListItem* theObj = (XBMCAddon::xbmcgui::ListItem*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ListItem_Type,"~XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcgui::ListItem"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ListItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ListItem\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_Control_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::Control* theObj = (XBMCAddon::xbmcgui::Control*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Control_Type,"~XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::Control"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Control\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Control\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlSpin_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlSpin* theObj = (XBMCAddon::xbmcgui::ControlSpin*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlSpin_Type,"~XBMCAddon::xbmcgui::ControlSpin","XBMCAddon::xbmcgui::ControlSpin"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlSpin\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlSpin\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlLabel_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlLabel* theObj = (XBMCAddon::xbmcgui::ControlLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlLabel_Type,"~XBMCAddon::xbmcgui::ControlLabel","XBMCAddon::xbmcgui::ControlLabel"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlLabel\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlEdit_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlEdit* theObj = (XBMCAddon::xbmcgui::ControlEdit*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlEdit_Type,"~XBMCAddon::xbmcgui::ControlEdit","XBMCAddon::xbmcgui::ControlEdit"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlEdit\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlEdit\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlList_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlList* theObj = (XBMCAddon::xbmcgui::ControlList*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlList_Type,"~XBMCAddon::xbmcgui::ControlList","XBMCAddon::xbmcgui::ControlList"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlList\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlList\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlFadeLabel* theObj = (XBMCAddon::xbmcgui::ControlFadeLabel*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlFadeLabel_Type,"~XBMCAddon::xbmcgui::ControlFadeLabel","XBMCAddon::xbmcgui::ControlFadeLabel"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlFadeLabel\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlFadeLabel\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlTextBox* theObj = (XBMCAddon::xbmcgui::ControlTextBox*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlTextBox_Type,"~XBMCAddon::xbmcgui::ControlTextBox","XBMCAddon::xbmcgui::ControlTextBox"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlTextBox\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlTextBox\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlImage_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlImage* theObj = (XBMCAddon::xbmcgui::ControlImage*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlImage_Type,"~XBMCAddon::xbmcgui::ControlImage","XBMCAddon::xbmcgui::ControlImage"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlImage\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlImage\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlProgress_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlProgress* theObj = (XBMCAddon::xbmcgui::ControlProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlProgress_Type,"~XBMCAddon::xbmcgui::ControlProgress","XBMCAddon::xbmcgui::ControlProgress"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlProgress\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlProgress\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlButton_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlButton* theObj = (XBMCAddon::xbmcgui::ControlButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlButton_Type,"~XBMCAddon::xbmcgui::ControlButton","XBMCAddon::xbmcgui::ControlButton"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlButton\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlButton\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlGroup_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlGroup* theObj = (XBMCAddon::xbmcgui::ControlGroup*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlGroup_Type,"~XBMCAddon::xbmcgui::ControlGroup","XBMCAddon::xbmcgui::ControlGroup"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlGroup\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlGroup\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlRadioButton* theObj = (XBMCAddon::xbmcgui::ControlRadioButton*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlRadioButton_Type,"~XBMCAddon::xbmcgui::ControlRadioButton","XBMCAddon::xbmcgui::ControlRadioButton"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlRadioButton\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlRadioButton\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_ControlSlider_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::ControlSlider* theObj = (XBMCAddon::xbmcgui::ControlSlider*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_ControlSlider_Type,"~XBMCAddon::xbmcgui::ControlSlider","XBMCAddon::xbmcgui::ControlSlider"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlSlider\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::ControlSlider\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_Dialog_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::Dialog* theObj = (XBMCAddon::xbmcgui::Dialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Dialog_Type,"~XBMCAddon::xbmcgui::Dialog","XBMCAddon::xbmcgui::Dialog"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Dialog\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Dialog\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_DialogProgress_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::DialogProgress* theObj = (XBMCAddon::xbmcgui::DialogProgress*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgress_Type,"~XBMCAddon::xbmcgui::DialogProgress","XBMCAddon::xbmcgui::DialogProgress"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::DialogProgress\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::DialogProgress\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_DialogBusy_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::DialogBusy* theObj = (XBMCAddon::xbmcgui::DialogBusy*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogBusy_Type,"~XBMCAddon::xbmcgui::DialogBusy","XBMCAddon::xbmcgui::DialogBusy"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::DialogBusy\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::DialogBusy\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::DialogProgressBG* theObj = (XBMCAddon::xbmcgui::DialogProgressBG*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_DialogProgressBG_Type,"~XBMCAddon::xbmcgui::DialogProgressBG","XBMCAddon::xbmcgui::DialogProgressBG"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::DialogProgressBG\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::DialogProgressBG\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_Action_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::Action* theObj = (XBMCAddon::xbmcgui::Action*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Action_Type,"~XBMCAddon::xbmcgui::Action","XBMCAddon::xbmcgui::Action"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Action\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Action\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_Window_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::Window* theObj = (XBMCAddon::xbmcgui::Window*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_Window_Type,"~XBMCAddon::xbmcgui::Window","XBMCAddon::xbmcgui::Window"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Window\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::Window\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_WindowDialog_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::WindowDialog* theObj = (XBMCAddon::xbmcgui::WindowDialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowDialog_Type,"~XBMCAddon::xbmcgui::WindowDialog","XBMCAddon::xbmcgui::WindowDialog"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::WindowDialog\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::WindowDialog\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_WindowXML_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::WindowXML* theObj = (XBMCAddon::xbmcgui::WindowXML*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXML_Type,"~XBMCAddon::xbmcgui::WindowXML","XBMCAddon::xbmcgui::WindowXML"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::WindowXML\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::WindowXML\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcgui_XBMCAddon_xbmcgui_WindowXMLDialog_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcgui::WindowXMLDialog* theObj = (XBMCAddon::xbmcgui::WindowXMLDialog*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcgui_WindowXMLDialog_Type,"~XBMCAddon::xbmcgui::WindowXMLDialog","XBMCAddon::xbmcgui::WindowXMLDialog"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcgui::WindowXMLDialog\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcgui::WindowXMLDialog\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ListItem + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ListItem_methods[] = { + {(char*)"getLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLabel2", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getLabel2, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setLabel2", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setLabel2, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setIconImage", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setIconImage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setThumbnailImage", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setThumbnailImage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setArt", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setArt, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setUniqueIDs", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setUniqueIDs, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setRating", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setRating, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getArt", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getArt, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getUniqueID", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getUniqueID, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getRating", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getRating, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getVotes", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getVotes, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"select", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_select, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isSelected", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_isSelected, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setInfo", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setInfo, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setCast", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setCast, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addStreamInfo", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_addStreamInfo, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addContextMenuItems", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_addContextMenuItems, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setProperty", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProperty", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setPath", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setPath, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setMimeType", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setMimeType, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setContentLookup", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setContentLookup, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setSubtitles", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_setSubtitles, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getdescription", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getdescription, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getduration", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getduration, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getfilename", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getfilename, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPath", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getPath, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getVideoInfoTag", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getVideoInfoTag, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getMusicInfoTag", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ListItem_getMusicInfoTag, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ListItem_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ListItem_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ListItem"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ListItem_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ListItem_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ListItem_New; + + TyXBMCAddon_xbmcgui_ListItem_Type.swigType="p.XBMCAddon::xbmcgui::ListItem"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ListItem_Type); + + } + //========================================================================= + + static int xbmcgui_XBMCAddon_xbmcgui_Control_cmp(PyObject* obj1, PyObject* obj2) + { + return PythonCompare::compare(obj1,obj2,"p.XBMCAddon::xbmcgui::Control","XBMCAddon::xbmcgui::","compare on XBMCAddon::xbmcgui::Control"); + } + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::Control + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_Control_methods[] = { + {(char*)"canAcceptMessages", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_canAcceptMessages, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getId", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_getId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPosition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_getPosition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getX", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_getX, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getY", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_getY, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getHeight", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_getHeight, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getWidth", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_getWidth, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setEnabled", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setEnabled, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setVisible", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setVisible, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setVisibleCondition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setVisibleCondition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setEnableCondition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setEnableCondition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setAnimations", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setAnimations, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setPosition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setPosition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setWidth", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setWidth, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setHeight", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setHeight, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setNavigation", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_setNavigation, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"controlUp", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_controlUp, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"controlDown", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_controlDown, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"controlLeft", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_controlLeft, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"controlRight", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Control_controlRight, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_Control_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_Control_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.Control"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_Control_Dealloc; + pythonType.tp_compare=xbmcgui_XBMCAddon_xbmcgui_Control_cmp; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_Control_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = NULL; + + TyXBMCAddon_xbmcgui_Control_Type.swigType="p.XBMCAddon::xbmcgui::Control"; + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlSpin + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlSpin_methods[] = { + {(char*)"setTextures", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlSpin_setTextures, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlSpin_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlSpin_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlSpin"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlSpin_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlSpin_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = NULL; + + TyXBMCAddon_xbmcgui_ControlSpin_Type.swigType="p.XBMCAddon::xbmcgui::ControlSpin"; + TyXBMCAddon_xbmcgui_ControlSpin_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlLabel + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlLabel_methods[] = { + {(char*)"getLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlLabel_getLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlLabel_setLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlLabel_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlLabel_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlLabel"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlLabel_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlLabel_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlLabel_New; + + TyXBMCAddon_xbmcgui_ControlLabel_Type.swigType="p.XBMCAddon::xbmcgui::ControlLabel"; + TyXBMCAddon_xbmcgui_ControlLabel_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlLabel_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlEdit + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlEdit_methods[] = { + {(char*)"setLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlEdit_setLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlEdit_getLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setText", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlEdit_setText, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getText", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlEdit_getText, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlEdit_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlEdit_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlEdit"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlEdit_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlEdit_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlEdit_New; + + TyXBMCAddon_xbmcgui_ControlEdit_Type.swigType="p.XBMCAddon::xbmcgui::ControlEdit"; + TyXBMCAddon_xbmcgui_ControlEdit_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlEdit_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlList + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlList_methods[] = { + {(char*)"addItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_addItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addItems", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_addItems, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"selectItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_selectItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"removeItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_removeItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"reset", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_reset, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSpinControl", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_getSpinControl, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSelectedPosition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_getSelectedPosition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSelectedItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_getSelectedItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setImageDimensions", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_setImageDimensions, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setItemHeight", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_setItemHeight, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setSpace", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_setSpace, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setPageControlVisible", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_setPageControlVisible, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"size", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_size, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getItemHeight", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_getItemHeight, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSpace", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_getSpace, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getListItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_getListItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setStaticContent", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlList_setStaticContent, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlList_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlList_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlList"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlList_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlList_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlList_New; + + TyXBMCAddon_xbmcgui_ControlList_Type.swigType="p.XBMCAddon::xbmcgui::ControlList"; + TyXBMCAddon_xbmcgui_ControlList_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlList_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlFadeLabel + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlFadeLabel_methods[] = { + {(char*)"addLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_addLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setScrolling", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_setScrolling, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"reset", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_reset, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlFadeLabel_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlFadeLabel_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlFadeLabel"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlFadeLabel_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlFadeLabel_New; + + TyXBMCAddon_xbmcgui_ControlFadeLabel_Type.swigType="p.XBMCAddon::xbmcgui::ControlFadeLabel"; + TyXBMCAddon_xbmcgui_ControlFadeLabel_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlFadeLabel_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlTextBox + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlTextBox_methods[] = { + {(char*)"setText", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_setText, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getText", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_getText, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"reset", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_reset, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"scroll", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_scroll, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"autoScroll", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_autoScroll, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlTextBox_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlTextBox_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlTextBox"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlTextBox_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlTextBox_New; + + TyXBMCAddon_xbmcgui_ControlTextBox_Type.swigType="p.XBMCAddon::xbmcgui::ControlTextBox"; + TyXBMCAddon_xbmcgui_ControlTextBox_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlTextBox_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlImage + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlImage_methods[] = { + {(char*)"setImage", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlImage_setImage, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setColorDiffuse", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlImage_setColorDiffuse, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlImage_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlImage_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlImage"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlImage_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlImage_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlImage_New; + + TyXBMCAddon_xbmcgui_ControlImage_Type.swigType="p.XBMCAddon::xbmcgui::ControlImage"; + TyXBMCAddon_xbmcgui_ControlImage_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlImage_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlProgress + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlProgress_methods[] = { + {(char*)"setPercent", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlProgress_setPercent, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getPercent", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlProgress_getPercent, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlProgress_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlProgress_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlProgress"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlProgress_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlProgress_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlProgress_New; + + TyXBMCAddon_xbmcgui_ControlProgress_Type.swigType="p.XBMCAddon::xbmcgui::ControlProgress"; + TyXBMCAddon_xbmcgui_ControlProgress_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlProgress_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlButton + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlButton_methods[] = { + {(char*)"setLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlButton_setLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setDisabledColor", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlButton_setDisabledColor, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlButton_getLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getLabel2", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlButton_getLabel2, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlButton_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlButton_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlButton"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlButton_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlButton_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlButton_New; + + TyXBMCAddon_xbmcgui_ControlButton_Type.swigType="p.XBMCAddon::xbmcgui::ControlButton"; + TyXBMCAddon_xbmcgui_ControlButton_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlButton_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlGroup + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlGroup_methods[] = { + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlGroup_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlGroup_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlGroup"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlGroup_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlGroup_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlGroup_New; + + TyXBMCAddon_xbmcgui_ControlGroup_Type.swigType="p.XBMCAddon::xbmcgui::ControlGroup"; + TyXBMCAddon_xbmcgui_ControlGroup_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlGroup_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlRadioButton + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlRadioButton_methods[] = { + {(char*)"setSelected", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_setSelected, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isSelected", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_isSelected, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setLabel", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_setLabel, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setRadioDimension", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_setRadioDimension, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlRadioButton_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlRadioButton_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlRadioButton"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlRadioButton_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlRadioButton_New; + + TyXBMCAddon_xbmcgui_ControlRadioButton_Type.swigType="p.XBMCAddon::xbmcgui::ControlRadioButton"; + TyXBMCAddon_xbmcgui_ControlRadioButton_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlRadioButton_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::ControlSlider + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_ControlSlider_methods[] = { + {(char*)"getPercent", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlSlider_getPercent, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setPercent", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_ControlSlider_setPercent, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_ControlSlider_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_ControlSlider_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.ControlSlider"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_ControlSlider_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_ControlSlider_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Control_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_ControlSlider_New; + + TyXBMCAddon_xbmcgui_ControlSlider_Type.swigType="p.XBMCAddon::xbmcgui::ControlSlider"; + TyXBMCAddon_xbmcgui_ControlSlider_Type.parentType=&TyXBMCAddon_xbmcgui_Control_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_ControlSlider_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::Dialog + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_Dialog_methods[] = { + {(char*)"yesno", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_yesno, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"info", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_info, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"select", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_select, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"contextmenu", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_contextmenu, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"multiselect", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_multiselect, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"ok", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_ok, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"textviewer", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_textviewer, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"browse", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_browse, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"browseSingle", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_browseSingle, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"browseMultiple", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_browseMultiple, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"numeric", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_numeric, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"notification", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_notification, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"input", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Dialog_input, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_Dialog_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_Dialog_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.Dialog"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_Dialog_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_Dialog_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_Dialog_New; + + TyXBMCAddon_xbmcgui_Dialog_Type.swigType="p.XBMCAddon::xbmcgui::Dialog"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_Dialog_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::DialogProgress + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_DialogProgress_methods[] = { + {(char*)"create", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgress_create, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"update", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgress_update, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"close", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgress_close, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"iscanceled", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgress_iscanceled, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_DialogProgress_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_DialogProgress_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.DialogProgress"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_DialogProgress_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_DialogProgress_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_DialogProgress_New; + + TyXBMCAddon_xbmcgui_DialogProgress_Type.swigType="p.XBMCAddon::xbmcgui::DialogProgress"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_DialogProgress_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::DialogBusy + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_DialogBusy_methods[] = { + {(char*)"create", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogBusy_create, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"update", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogBusy_update, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"close", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogBusy_close, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"iscanceled", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogBusy_iscanceled, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_DialogBusy_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_DialogBusy_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.DialogBusy"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_DialogBusy_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_DialogBusy_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_DialogBusy_New; + + TyXBMCAddon_xbmcgui_DialogBusy_Type.swigType="p.XBMCAddon::xbmcgui::DialogBusy"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_DialogBusy_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::DialogProgressBG + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_DialogProgressBG_methods[] = { + {(char*)"create", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_create, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"update", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_update, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"close", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_close, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"isFinished", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_isFinished, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_DialogProgressBG_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_DialogProgressBG_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.DialogProgressBG"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_DialogProgressBG_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_DialogProgressBG_New; + + TyXBMCAddon_xbmcgui_DialogProgressBG_Type.swigType="p.XBMCAddon::xbmcgui::DialogProgressBG"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_DialogProgressBG_Type); + + } + //========================================================================= + + static PyObject* xbmcgui_XBMCAddon_xbmcgui_Action_rcmp(PyObject* obj1, PyObject *obj2, int method) + { XBMC_TRACE; + if (method == Py_EQ) + { + XBMCAddon::xbmcgui::Action* a1 = (Action*)retrieveApiInstance(obj1,&TyXBMCAddon_xbmcgui_Action_Type,"rcmp","XBMCAddon::xbmcgui::Action"); + if (PyObject_TypeCheck(obj2, &(TyXBMCAddon_xbmcgui_Action_Type.pythonType))) + { + // both are Action objects + XBMCAddon::xbmcgui::Action* a2 = (Action*)retrieveApiInstance(obj2,&TyXBMCAddon_xbmcgui_Action_Type,"rcmp","XBMCAddon::xbmcgui::Action"); + + if (a1->id == a2->id && + a1->buttonCode == a2->buttonCode && + a1->fAmount1 == a2->fAmount1 && + a1->fAmount2 == a2->fAmount2 && + a1->fRepeat == a2->fRepeat && + a1->strAction == a2->strAction) + { + Py_RETURN_TRUE; + } + else + { + Py_RETURN_FALSE; + } + } + else + { + // for backwards compatability in python scripts + PyObject* o1 = PyLong_FromLong(a1->id); + return PyObject_RichCompare(o1, obj2, method); + } + } + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; + } + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::Action + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_Action_methods[] = { + {(char*)"getId", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Action_getId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getButtonCode", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Action_getButtonCode, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAmount1", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Action_getAmount1, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getAmount2", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Action_getAmount2, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_Action_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_Action_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.Action"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_Action_Dealloc; + pythonType.tp_richcompare=(richcmpfunc)xbmcgui_XBMCAddon_xbmcgui_Action_rcmp; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_Action_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_Action_New; + + TyXBMCAddon_xbmcgui_Action_Type.swigType="p.XBMCAddon::xbmcgui::Action"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_Action_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::Window + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_Window_methods[] = { + {(char*)"onAction", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_onAction, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onControl", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_onControl, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onClick", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_onClick, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onDoubleClick", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_onDoubleClick, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onFocus", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_onFocus, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"onInit", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_onInit, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"show", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_show, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setFocus", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_setFocus, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setFocusId", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_setFocusId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getFocus", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getFocus, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getFocusId", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getFocusId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"removeControl", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_removeControl, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"removeControls", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_removeControls, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getHeight", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getHeight, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getWidth", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getWidth, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getResolution", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getResolution, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setCoordinateResolution", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_setCoordinateResolution, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setProperty", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_setProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getProperty", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"clearProperty", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_clearProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"clearProperties", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_clearProperties, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"close", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_close, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"doModal", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_doModal, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addControl", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_addControl, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addControls", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_addControls, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getControl", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_Window_getControl, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_Window_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_Window_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.Window"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_Window_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_Window_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_Window_New; + + TyXBMCAddon_xbmcgui_Window_Type.swigType="p.XBMCAddon::xbmcgui::Window"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_Window_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::WindowDialog + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_WindowDialog_methods[] = { + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_WindowDialog_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_WindowDialog_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.WindowDialog"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_WindowDialog_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_WindowDialog_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Window_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_WindowDialog_New; + + TyXBMCAddon_xbmcgui_WindowDialog_Type.swigType="p.XBMCAddon::xbmcgui::WindowDialog"; + TyXBMCAddon_xbmcgui_WindowDialog_Type.parentType=&TyXBMCAddon_xbmcgui_Window_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_WindowDialog_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::WindowXML + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_WindowXML_methods[] = { + {(char*)"addItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_addItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addItems", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_addItems, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"removeItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_removeItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCurrentListPosition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_getCurrentListPosition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setCurrentListPosition", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_setCurrentListPosition, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getListItem", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_getListItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getListSize", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_getListSize, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"clearList", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_clearList, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setContainerProperty", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_setContainerProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCurrentContainerId", (PyCFunction)xbmcgui_XBMCAddon_xbmcgui_WindowXML_getCurrentContainerId, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_WindowXML_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.WindowXML"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_WindowXML_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_WindowXML_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_Window_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_WindowXML_New; + + TyXBMCAddon_xbmcgui_WindowXML_Type.swigType="p.XBMCAddon::xbmcgui::WindowXML"; + TyXBMCAddon_xbmcgui_WindowXML_Type.parentType=&TyXBMCAddon_xbmcgui_Window_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_WindowXML_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcgui::WindowXMLDialog + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcgui_WindowXMLDialog_methods[] = { + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcgui_WindowXMLDialog_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.pythonType; + pythonType.tp_name = (char*)"xbmcgui.WindowXMLDialog"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcgui_XBMCAddon_xbmcgui_WindowXMLDialog_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcgui_WindowXMLDialog_methods; + + pythonType.tp_base = &(TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType); + pythonType.tp_new = xbmcgui_XBMCAddon_xbmcgui_WindowXMLDialog_New; + + TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.swigType="p.XBMCAddon::xbmcgui::WindowXMLDialog"; + TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.parentType=&TyXBMCAddon_xbmcgui_WindowXML_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcgui_WindowXMLDialog_Type); + + } + //========================================================================= + + + static PyMethodDef xbmcgui_methods[] = { + {(char*)"getCurrentWindowId", (PyCFunction)xbmcgui_getCurrentWindowId, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getCurrentWindowDialogId", (PyCFunction)xbmcgui_getCurrentWindowDialogId, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + // This is the call that will call all of the other initializes + // for all of the classes in this module + static void initTypes() + { + static bool typesAlreadyInitialized = false; + if (!typesAlreadyInitialized) + { + typesAlreadyInitialized = true; + + initPyXBMCAddon_xbmcgui_ListItem_Type(); + initPyXBMCAddon_xbmcgui_Control_Type(); + initPyXBMCAddon_xbmcgui_ControlSpin_Type(); + initPyXBMCAddon_xbmcgui_ControlLabel_Type(); + initPyXBMCAddon_xbmcgui_ControlEdit_Type(); + initPyXBMCAddon_xbmcgui_ControlList_Type(); + initPyXBMCAddon_xbmcgui_ControlFadeLabel_Type(); + initPyXBMCAddon_xbmcgui_ControlTextBox_Type(); + initPyXBMCAddon_xbmcgui_ControlImage_Type(); + initPyXBMCAddon_xbmcgui_ControlProgress_Type(); + initPyXBMCAddon_xbmcgui_ControlButton_Type(); + initPyXBMCAddon_xbmcgui_ControlGroup_Type(); + initPyXBMCAddon_xbmcgui_ControlRadioButton_Type(); + initPyXBMCAddon_xbmcgui_ControlSlider_Type(); + initPyXBMCAddon_xbmcgui_Dialog_Type(); + initPyXBMCAddon_xbmcgui_DialogProgress_Type(); + initPyXBMCAddon_xbmcgui_DialogBusy_Type(); + initPyXBMCAddon_xbmcgui_DialogProgressBG_Type(); + initPyXBMCAddon_xbmcgui_Action_Type(); + initPyXBMCAddon_xbmcgui_Window_Type(); + initPyXBMCAddon_xbmcgui_WindowDialog_Type(); + initPyXBMCAddon_xbmcgui_WindowXML_Type(); + initPyXBMCAddon_xbmcgui_WindowXMLDialog_Type(); + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ListItem_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_Control_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlSpin_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlLabel_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlEdit_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlList_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlFadeLabel_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlTextBox_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlImage_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlProgress_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlButton_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlGroup_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlRadioButton_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_ControlSlider_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_Dialog_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_DialogProgress_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_DialogBusy_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_DialogProgressBG_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_Action_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_Window_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_WindowDialog_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.pythonType)) < 0) + return; + } + } + + void initModule_xbmcgui() + { + initTypes(); + + // init general xbmcgui modules + PyObject* module; + + + Py_INCREF(&(TyXBMCAddon_xbmcgui_ListItem_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_Control_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlSpin_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlLabel_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlEdit_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlList_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlFadeLabel_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlTextBox_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlImage_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlProgress_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlButton_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlGroup_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlRadioButton_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_ControlSlider_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_Dialog_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_DialogProgress_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_DialogBusy_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_DialogProgressBG_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_Action_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_Window_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_WindowDialog_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.pythonType)); + + module = Py_InitModule((char*)"xbmcgui", xbmcgui_methods); + if (module == NULL) return; + + + PyModule_AddObject(module, (char*)"ListItem", (PyObject*)(&(TyXBMCAddon_xbmcgui_ListItem_Type.pythonType))); + PyModule_AddObject(module, (char*)"Control", (PyObject*)(&(TyXBMCAddon_xbmcgui_Control_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlSpin", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlSpin_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlLabel", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlLabel_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlEdit", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlEdit_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlList", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlList_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlFadeLabel", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlFadeLabel_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlTextBox", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlTextBox_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlImage", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlImage_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlProgress", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlProgress_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlButton", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlButton_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlGroup", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlGroup_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlRadioButton", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlRadioButton_Type.pythonType))); + PyModule_AddObject(module, (char*)"ControlSlider", (PyObject*)(&(TyXBMCAddon_xbmcgui_ControlSlider_Type.pythonType))); + PyModule_AddObject(module, (char*)"Dialog", (PyObject*)(&(TyXBMCAddon_xbmcgui_Dialog_Type.pythonType))); + PyModule_AddObject(module, (char*)"DialogProgress", (PyObject*)(&(TyXBMCAddon_xbmcgui_DialogProgress_Type.pythonType))); + PyModule_AddObject(module, (char*)"DialogBusy", (PyObject*)(&(TyXBMCAddon_xbmcgui_DialogBusy_Type.pythonType))); + PyModule_AddObject(module, (char*)"DialogProgressBG", (PyObject*)(&(TyXBMCAddon_xbmcgui_DialogProgressBG_Type.pythonType))); + PyModule_AddObject(module, (char*)"Action", (PyObject*)(&(TyXBMCAddon_xbmcgui_Action_Type.pythonType))); + PyModule_AddObject(module, (char*)"Window", (PyObject*)(&(TyXBMCAddon_xbmcgui_Window_Type.pythonType))); + PyModule_AddObject(module, (char*)"WindowDialog", (PyObject*)(&(TyXBMCAddon_xbmcgui_WindowDialog_Type.pythonType))); + PyModule_AddObject(module, (char*)"WindowXML", (PyObject*)(&(TyXBMCAddon_xbmcgui_WindowXML_Type.pythonType))); + PyModule_AddObject(module, (char*)"WindowXMLDialog", (PyObject*)(&(TyXBMCAddon_xbmcgui_WindowXMLDialog_Type.pythonType))); + + // constants + PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:23 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); + PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); + PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); + + // need to handle constants + + PyModule_AddIntConstant(module,"ICON_OVERLAY_NONE",CGUIListItem::ICON_OVERLAY_NONE); + PyModule_AddIntConstant(module,"ICON_OVERLAY_RAR",CGUIListItem::ICON_OVERLAY_RAR); + PyModule_AddIntConstant(module,"ICON_OVERLAY_ZIP",CGUIListItem::ICON_OVERLAY_ZIP); + PyModule_AddIntConstant(module,"ICON_OVERLAY_LOCKED",CGUIListItem::ICON_OVERLAY_LOCKED); + PyModule_AddIntConstant(module,"ICON_OVERLAY_UNWATCHED",CGUIListItem::ICON_OVERLAY_UNWATCHED); + PyModule_AddIntConstant(module,"ICON_OVERLAY_WATCHED",CGUIListItem::ICON_OVERLAY_WATCHED); + PyModule_AddIntConstant(module,"ICON_OVERLAY_HD",CGUIListItem::ICON_OVERLAY_HD); + PyModule_AddStringConstant(module,"NOTIFICATION_INFO",getNOTIFICATION_INFO()); + PyModule_AddStringConstant(module,"NOTIFICATION_WARNING",getNOTIFICATION_WARNING()); + PyModule_AddStringConstant(module,"NOTIFICATION_ERROR",getNOTIFICATION_ERROR()); + PyModule_AddIntConstant(module,"INPUT_ALPHANUM",INPUT_ALPHANUM); + PyModule_AddIntConstant(module,"INPUT_NUMERIC",INPUT_NUMERIC); + PyModule_AddIntConstant(module,"INPUT_DATE",INPUT_DATE); + PyModule_AddIntConstant(module,"INPUT_TIME",INPUT_TIME); + PyModule_AddIntConstant(module,"INPUT_IPADDRESS",INPUT_IPADDRESS); + PyModule_AddIntConstant(module,"INPUT_PASSWORD",INPUT_PASSWORD); + PyModule_AddIntConstant(module,"HORIZONTAL",HORIZONTAL); + PyModule_AddIntConstant(module,"VERTICAL",VERTICAL); + PyModule_AddIntConstant(module,"PASSWORD_VERIFY",PASSWORD_VERIFY); + PyModule_AddIntConstant(module,"ALPHANUM_HIDE_INPUT",ALPHANUM_HIDE_INPUT); + PyModule_AddIntConstant(module,"CONTROL_TEXT_OFFSET_X",10); + PyModule_AddIntConstant(module,"CONTROL_TEXT_OFFSET_Y",2); + PyModule_AddIntConstant(module,"INPUT_ALPHANUM",0); + PyModule_AddIntConstant(module,"INPUT_NUMERIC",1); + PyModule_AddIntConstant(module,"INPUT_DATE",2); + PyModule_AddIntConstant(module,"INPUT_TIME",3); + PyModule_AddIntConstant(module,"INPUT_IPADDRESS",4); + PyModule_AddIntConstant(module,"INPUT_PASSWORD",5); + PyModule_AddIntConstant(module,"PASSWORD_VERIFY",1); + PyModule_AddIntConstant(module,"ALPHANUM_HIDE_INPUT",2); + PyModule_AddIntConstant(module,"KEY_BUTTON_A",256); + PyModule_AddIntConstant(module,"KEY_BUTTON_B",257); + PyModule_AddIntConstant(module,"KEY_BUTTON_X",258); + PyModule_AddIntConstant(module,"KEY_BUTTON_Y",259); + PyModule_AddIntConstant(module,"KEY_BUTTON_BLACK",260); + PyModule_AddIntConstant(module,"KEY_BUTTON_WHITE",261); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_TRIGGER",262); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_TRIGGER",263); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_THUMB_STICK",264); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_THUMB_STICK",265); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_THUMB_STICK_UP",266); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_THUMB_STICK_DOWN",267); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_THUMB_STICK_LEFT",268); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_THUMB_STICK_RIGHT",269); + PyModule_AddIntConstant(module,"KEY_BUTTON_DPAD_UP",270); + PyModule_AddIntConstant(module,"KEY_BUTTON_DPAD_DOWN",271); + PyModule_AddIntConstant(module,"KEY_BUTTON_DPAD_LEFT",272); + PyModule_AddIntConstant(module,"KEY_BUTTON_DPAD_RIGHT",273); + PyModule_AddIntConstant(module,"KEY_BUTTON_START",274); + PyModule_AddIntConstant(module,"KEY_BUTTON_BACK",275); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_THUMB_BUTTON",276); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_THUMB_BUTTON",277); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_ANALOG_TRIGGER",278); + PyModule_AddIntConstant(module,"KEY_BUTTON_RIGHT_ANALOG_TRIGGER",279); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_THUMB_STICK_UP",280); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_THUMB_STICK_DOWN",281); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_THUMB_STICK_LEFT",282); + PyModule_AddIntConstant(module,"KEY_BUTTON_LEFT_THUMB_STICK_RIGHT",283); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_A",284); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_B",285); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_X",286); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_Y",287); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_SHOULDER",288); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_SHOULDER",289); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_TRIGGER",290); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_TRIGGER",291); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_STICK_BUTTON",292); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_STICK_BUTTON",293); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_UP",294); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_DOWN",295); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_LEFT",296); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_RIGHT",297); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_DPAD_UP",298); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_DPAD_DOWN",299); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_DPAD_LEFT",300); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_DPAD_RIGHT",301); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_START",302); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_BACK",303); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_UP",304); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_DOWN",305); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_LEFT",306); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_RIGHT",307); + PyModule_AddIntConstant(module,"KEY_JOYSTICK_BUTTON_GUIDE",308); + PyModule_AddIntConstant(module,"KEY_VKEY",0xF000); + PyModule_AddIntConstant(module,"KEY_ASCII",0xF100); + PyModule_AddIntConstant(module,"KEY_UNICODE",0xF200); + PyModule_AddIntConstant(module,"KEY_VMOUSE",0xEFFF); + PyModule_AddIntConstant(module,"KEY_MOUSE_START",0xE000); + PyModule_AddIntConstant(module,"KEY_MOUSE_CLICK",0xE000); + PyModule_AddIntConstant(module,"KEY_MOUSE_RIGHTCLICK",0xE001); + PyModule_AddIntConstant(module,"KEY_MOUSE_MIDDLECLICK",0xE002); + PyModule_AddIntConstant(module,"KEY_MOUSE_DOUBLE_CLICK",0xE010); + PyModule_AddIntConstant(module,"KEY_MOUSE_LONG_CLICK",0xE020); + PyModule_AddIntConstant(module,"KEY_MOUSE_WHEEL_UP",0xE101); + PyModule_AddIntConstant(module,"KEY_MOUSE_WHEEL_DOWN",0xE102); + PyModule_AddIntConstant(module,"KEY_MOUSE_MOVE",0xE103); + PyModule_AddIntConstant(module,"KEY_MOUSE_DRAG",0xE104); + PyModule_AddIntConstant(module,"KEY_MOUSE_DRAG_START",0xE105); + PyModule_AddIntConstant(module,"KEY_MOUSE_DRAG_END",0xE106); + PyModule_AddIntConstant(module,"KEY_MOUSE_RDRAG",0xE107); + PyModule_AddIntConstant(module,"KEY_MOUSE_RDRAG_START",0xE108); + PyModule_AddIntConstant(module,"KEY_MOUSE_RDRAG_END",0xE109); + PyModule_AddIntConstant(module,"KEY_MOUSE_NOOP",0xEFFF); + PyModule_AddIntConstant(module,"KEY_MOUSE_END",0xEFFF); + PyModule_AddIntConstant(module,"KEY_APPCOMMAND",0xD000); + PyModule_AddIntConstant(module,"KEY_TOUCH",0xF000); + PyModule_AddIntConstant(module,"KEY_INVALID",0xFFFF); + PyModule_AddIntConstant(module,"ACTION_NONE",0); + PyModule_AddIntConstant(module,"ACTION_MOVE_LEFT",1); + PyModule_AddIntConstant(module,"ACTION_MOVE_RIGHT",2); + PyModule_AddIntConstant(module,"ACTION_MOVE_UP",3); + PyModule_AddIntConstant(module,"ACTION_MOVE_DOWN",4); + PyModule_AddIntConstant(module,"ACTION_PAGE_UP",5); + PyModule_AddIntConstant(module,"ACTION_PAGE_DOWN",6); + PyModule_AddIntConstant(module,"ACTION_SELECT_ITEM",7); + PyModule_AddIntConstant(module,"ACTION_HIGHLIGHT_ITEM",8); + PyModule_AddIntConstant(module,"ACTION_PARENT_DIR",9); + PyModule_AddIntConstant(module,"ACTION_PREVIOUS_MENU",10); + PyModule_AddIntConstant(module,"ACTION_SHOW_INFO",11); + PyModule_AddIntConstant(module,"ACTION_PAUSE",12); + PyModule_AddIntConstant(module,"ACTION_STOP",13); + PyModule_AddIntConstant(module,"ACTION_NEXT_ITEM",14); + PyModule_AddIntConstant(module,"ACTION_PREV_ITEM",15); + PyModule_AddIntConstant(module,"ACTION_FORWARD",16); + PyModule_AddIntConstant(module,"ACTION_REWIND",17); + PyModule_AddIntConstant(module,"ACTION_SHOW_GUI",18); + PyModule_AddIntConstant(module,"ACTION_ASPECT_RATIO",19); + PyModule_AddIntConstant(module,"ACTION_STEP_FORWARD",20); + PyModule_AddIntConstant(module,"ACTION_STEP_BACK",21); + PyModule_AddIntConstant(module,"ACTION_BIG_STEP_FORWARD",22); + PyModule_AddIntConstant(module,"ACTION_BIG_STEP_BACK",23); + PyModule_AddIntConstant(module,"ACTION_SHOW_OSD",24); + PyModule_AddIntConstant(module,"ACTION_SHOW_SUBTITLES",25); + PyModule_AddIntConstant(module,"ACTION_NEXT_SUBTITLE",26); + PyModule_AddIntConstant(module,"ACTION_PLAYER_DEBUG",27); + PyModule_AddIntConstant(module,"ACTION_NEXT_PICTURE",28); + PyModule_AddIntConstant(module,"ACTION_PREV_PICTURE",29); + PyModule_AddIntConstant(module,"ACTION_ZOOM_OUT",30); + PyModule_AddIntConstant(module,"ACTION_ZOOM_IN",31); + PyModule_AddIntConstant(module,"ACTION_TOGGLE_SOURCE_DEST",32); + PyModule_AddIntConstant(module,"ACTION_SHOW_PLAYLIST",33); + PyModule_AddIntConstant(module,"ACTION_QUEUE_ITEM",34); + PyModule_AddIntConstant(module,"ACTION_REMOVE_ITEM",35); + PyModule_AddIntConstant(module,"ACTION_SHOW_FULLSCREEN",36); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_NORMAL",37); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_1",38); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_2",39); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_3",40); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_4",41); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_5",42); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_6",43); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_7",44); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_8",45); + PyModule_AddIntConstant(module,"ACTION_ZOOM_LEVEL_9",46); + PyModule_AddIntConstant(module,"ACTION_CALIBRATE_SWAP_ARROWS",47); + PyModule_AddIntConstant(module,"ACTION_CALIBRATE_RESET",48); + PyModule_AddIntConstant(module,"ACTION_ANALOG_MOVE",49); + PyModule_AddIntConstant(module,"ACTION_ROTATE_PICTURE_CW",50); + PyModule_AddIntConstant(module,"ACTION_ROTATE_PICTURE_CCW",51); + PyModule_AddIntConstant(module,"ACTION_SUBTITLE_DELAY_MIN",52); + PyModule_AddIntConstant(module,"ACTION_SUBTITLE_DELAY_PLUS",53); + PyModule_AddIntConstant(module,"ACTION_AUDIO_DELAY_MIN",54); + PyModule_AddIntConstant(module,"ACTION_AUDIO_DELAY_PLUS",55); + PyModule_AddIntConstant(module,"ACTION_AUDIO_NEXT_LANGUAGE",56); + PyModule_AddIntConstant(module,"ACTION_CHANGE_RESOLUTION",57); + PyModule_AddIntConstant(module,"REMOTE_0",58); + PyModule_AddIntConstant(module,"REMOTE_1",59); + PyModule_AddIntConstant(module,"REMOTE_2",60); + PyModule_AddIntConstant(module,"REMOTE_3",61); + PyModule_AddIntConstant(module,"REMOTE_4",62); + PyModule_AddIntConstant(module,"REMOTE_5",63); + PyModule_AddIntConstant(module,"REMOTE_6",64); + PyModule_AddIntConstant(module,"REMOTE_7",65); + PyModule_AddIntConstant(module,"REMOTE_8",66); + PyModule_AddIntConstant(module,"REMOTE_9",67); + PyModule_AddIntConstant(module,"ACTION_PLAY",68); + PyModule_AddIntConstant(module,"ACTION_PLAYER_PROCESS_INFO",69); + PyModule_AddIntConstant(module,"ACTION_SMALL_STEP_BACK",76); + PyModule_AddIntConstant(module,"ACTION_PLAYER_FORWARD",77); + PyModule_AddIntConstant(module,"ACTION_PLAYER_REWIND",78); + PyModule_AddIntConstant(module,"ACTION_PLAYER_PLAY",79); + PyModule_AddIntConstant(module,"ACTION_DELETE_ITEM",80); + PyModule_AddIntConstant(module,"ACTION_COPY_ITEM",81); + PyModule_AddIntConstant(module,"ACTION_MOVE_ITEM",82); + PyModule_AddIntConstant(module,"ACTION_TAKE_SCREENSHOT",85); + PyModule_AddIntConstant(module,"ACTION_RENAME_ITEM",87); + PyModule_AddIntConstant(module,"ACTION_VOLUME_UP",88); + PyModule_AddIntConstant(module,"ACTION_VOLUME_DOWN",89); + PyModule_AddIntConstant(module,"ACTION_VOLAMP",90); + PyModule_AddIntConstant(module,"ACTION_MUTE",91); + PyModule_AddIntConstant(module,"ACTION_NAV_BACK",92); + PyModule_AddIntConstant(module,"ACTION_VOLAMP_UP",93); + PyModule_AddIntConstant(module,"ACTION_VOLAMP_DOWN",94); + PyModule_AddIntConstant(module,"ACTION_CREATE_EPISODE_BOOKMARK",95); + PyModule_AddIntConstant(module,"ACTION_CREATE_BOOKMARK",96); + PyModule_AddIntConstant(module,"ACTION_CHAPTER_OR_BIG_STEP_FORWARD",97); + PyModule_AddIntConstant(module,"ACTION_CHAPTER_OR_BIG_STEP_BACK",98); + PyModule_AddIntConstant(module,"ACTION_CYCLE_SUBTITLE",99); + PyModule_AddIntConstant(module,"ACTION_MOUSE_START",100); + PyModule_AddIntConstant(module,"ACTION_MOUSE_LEFT_CLICK",100); + PyModule_AddIntConstant(module,"ACTION_MOUSE_RIGHT_CLICK",101); + PyModule_AddIntConstant(module,"ACTION_MOUSE_MIDDLE_CLICK",102); + PyModule_AddIntConstant(module,"ACTION_MOUSE_DOUBLE_CLICK",103); + PyModule_AddIntConstant(module,"ACTION_MOUSE_WHEEL_UP",104); + PyModule_AddIntConstant(module,"ACTION_MOUSE_WHEEL_DOWN",105); + PyModule_AddIntConstant(module,"ACTION_MOUSE_DRAG",106); + PyModule_AddIntConstant(module,"ACTION_MOUSE_MOVE",107); + PyModule_AddIntConstant(module,"ACTION_MOUSE_LONG_CLICK",108); + PyModule_AddIntConstant(module,"ACTION_MOUSE_END",109); + PyModule_AddIntConstant(module,"ACTION_BACKSPACE",110); + PyModule_AddIntConstant(module,"ACTION_SCROLL_UP",111); + PyModule_AddIntConstant(module,"ACTION_SCROLL_DOWN",112); + PyModule_AddIntConstant(module,"ACTION_ANALOG_FORWARD",113); + PyModule_AddIntConstant(module,"ACTION_ANALOG_REWIND",114); + PyModule_AddIntConstant(module,"ACTION_MOVE_ITEM_UP",115); + PyModule_AddIntConstant(module,"ACTION_MOVE_ITEM_DOWN",116); + PyModule_AddIntConstant(module,"ACTION_CONTEXT_MENU",117); + PyModule_AddIntConstant(module,"ACTION_SHIFT",118); + PyModule_AddIntConstant(module,"ACTION_SYMBOLS",119); + PyModule_AddIntConstant(module,"ACTION_CURSOR_LEFT",120); + PyModule_AddIntConstant(module,"ACTION_CURSOR_RIGHT",121); + PyModule_AddIntConstant(module,"ACTION_BUILT_IN_FUNCTION",122); + PyModule_AddIntConstant(module,"ACTION_SHOW_OSD_TIME",123); + PyModule_AddIntConstant(module,"ACTION_ANALOG_SEEK_FORWARD",124); + PyModule_AddIntConstant(module,"ACTION_ANALOG_SEEK_BACK",125); + PyModule_AddIntConstant(module,"ACTION_VIS_PRESET_SHOW",126); + PyModule_AddIntConstant(module,"ACTION_VIS_PRESET_NEXT",128); + PyModule_AddIntConstant(module,"ACTION_VIS_PRESET_PREV",129); + PyModule_AddIntConstant(module,"ACTION_VIS_PRESET_LOCK",130); + PyModule_AddIntConstant(module,"ACTION_VIS_PRESET_RANDOM",131); + PyModule_AddIntConstant(module,"ACTION_VIS_RATE_PRESET_PLUS",132); + PyModule_AddIntConstant(module,"ACTION_VIS_RATE_PRESET_MINUS",133); + PyModule_AddIntConstant(module,"ACTION_SHOW_VIDEOMENU",134); + PyModule_AddIntConstant(module,"ACTION_ENTER",135); + PyModule_AddIntConstant(module,"ACTION_INCREASE_RATING",136); + PyModule_AddIntConstant(module,"ACTION_DECREASE_RATING",137); + PyModule_AddIntConstant(module,"ACTION_NEXT_SCENE",138); + PyModule_AddIntConstant(module,"ACTION_PREV_SCENE",139); + PyModule_AddIntConstant(module,"ACTION_NEXT_LETTER",140); + PyModule_AddIntConstant(module,"ACTION_PREV_LETTER",141); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS2",142); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS3",143); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS4",144); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS5",145); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS6",146); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS7",147); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS8",148); + PyModule_AddIntConstant(module,"ACTION_JUMP_SMS9",149); + PyModule_AddIntConstant(module,"ACTION_FILTER_CLEAR",150); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS2",151); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS3",152); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS4",153); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS5",154); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS6",155); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS7",156); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS8",157); + PyModule_AddIntConstant(module,"ACTION_FILTER_SMS9",158); + PyModule_AddIntConstant(module,"ACTION_FIRST_PAGE",159); + PyModule_AddIntConstant(module,"ACTION_LAST_PAGE",160); + PyModule_AddIntConstant(module,"ACTION_AUDIO_DELAY",161); + PyModule_AddIntConstant(module,"ACTION_SUBTITLE_DELAY",162); + PyModule_AddIntConstant(module,"ACTION_MENU",163); + PyModule_AddIntConstant(module,"ACTION_SET_RATING",164); + PyModule_AddIntConstant(module,"ACTION_RECORD",170); + PyModule_AddIntConstant(module,"ACTION_PASTE",180); + PyModule_AddIntConstant(module,"ACTION_NEXT_CONTROL",181); + PyModule_AddIntConstant(module,"ACTION_PREV_CONTROL",182); + PyModule_AddIntConstant(module,"ACTION_CHANNEL_SWITCH",183); + PyModule_AddIntConstant(module,"ACTION_CHANNEL_UP",184); + PyModule_AddIntConstant(module,"ACTION_CHANNEL_DOWN",185); + PyModule_AddIntConstant(module,"ACTION_NEXT_CHANNELGROUP",186); + PyModule_AddIntConstant(module,"ACTION_PREVIOUS_CHANNELGROUP",187); + PyModule_AddIntConstant(module,"ACTION_PVR_PLAY",188); + PyModule_AddIntConstant(module,"ACTION_PVR_PLAY_TV",189); + PyModule_AddIntConstant(module,"ACTION_PVR_PLAY_RADIO",190); + PyModule_AddIntConstant(module,"ACTION_PVR_SHOW_TIMER_RULE",191); + PyModule_AddIntConstant(module,"ACTION_TOGGLE_FULLSCREEN",199); + PyModule_AddIntConstant(module,"ACTION_TOGGLE_WATCHED",200); + PyModule_AddIntConstant(module,"ACTION_SCAN_ITEM",201); + PyModule_AddIntConstant(module,"ACTION_TOGGLE_DIGITAL_ANALOG",202); + PyModule_AddIntConstant(module,"ACTION_RELOAD_KEYMAPS",203); + PyModule_AddIntConstant(module,"ACTION_GUIPROFILE_BEGIN",204); + PyModule_AddIntConstant(module,"ACTION_TELETEXT_RED",215); + PyModule_AddIntConstant(module,"ACTION_TELETEXT_GREEN",216); + PyModule_AddIntConstant(module,"ACTION_TELETEXT_YELLOW",217); + PyModule_AddIntConstant(module,"ACTION_TELETEXT_BLUE",218); + PyModule_AddIntConstant(module,"ACTION_INCREASE_PAR",219); + PyModule_AddIntConstant(module,"ACTION_DECREASE_PAR",220); + PyModule_AddIntConstant(module,"ACTION_VSHIFT_UP",227); + PyModule_AddIntConstant(module,"ACTION_VSHIFT_DOWN",228); + PyModule_AddIntConstant(module,"ACTION_PLAYER_PLAYPAUSE",229); + PyModule_AddIntConstant(module,"ACTION_SUBTITLE_VSHIFT_UP",230); + PyModule_AddIntConstant(module,"ACTION_SUBTITLE_VSHIFT_DOWN",231); + PyModule_AddIntConstant(module,"ACTION_SUBTITLE_ALIGN",232); + PyModule_AddIntConstant(module,"ACTION_FILTER",233); + PyModule_AddIntConstant(module,"ACTION_SWITCH_PLAYER",234); + PyModule_AddIntConstant(module,"ACTION_STEREOMODE_NEXT",235); + PyModule_AddIntConstant(module,"ACTION_STEREOMODE_PREVIOUS",236); + PyModule_AddIntConstant(module,"ACTION_STEREOMODE_TOGGLE",237); + PyModule_AddIntConstant(module,"ACTION_STEREOMODE_SELECT",238); + PyModule_AddIntConstant(module,"ACTION_STEREOMODE_TOMONO",239); + PyModule_AddIntConstant(module,"ACTION_STEREOMODE_SET",240); + PyModule_AddIntConstant(module,"ACTION_SETTINGS_RESET",241); + PyModule_AddIntConstant(module,"ACTION_SETTINGS_LEVEL_CHANGE",242); + PyModule_AddIntConstant(module,"ACTION_TRIGGER_OSD",243); + PyModule_AddIntConstant(module,"ACTION_INPUT_TEXT",244); + PyModule_AddIntConstant(module,"ACTION_VOLUME_SET",245); + PyModule_AddIntConstant(module,"ACTION_TOGGLE_COMMSKIP",246); + PyModule_AddIntConstant(module,"ACTION_TOUCH_TAP",401); + PyModule_AddIntConstant(module,"ACTION_TOUCH_TAP_TEN",410); + PyModule_AddIntConstant(module,"ACTION_TOUCH_LONGPRESS",411); + PyModule_AddIntConstant(module,"ACTION_TOUCH_LONGPRESS_TEN",420); + PyModule_AddIntConstant(module,"ACTION_GESTURE_NOTIFY",500); + PyModule_AddIntConstant(module,"ACTION_GESTURE_BEGIN",501); + PyModule_AddIntConstant(module,"ACTION_GESTURE_ZOOM",502); + PyModule_AddIntConstant(module,"ACTION_GESTURE_ROTATE",503); + PyModule_AddIntConstant(module,"ACTION_GESTURE_PAN",504); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_LEFT",511); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_LEFT_TEN",520); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_RIGHT",521); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_RIGHT_TEN",530); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_UP",531); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_UP_TEN",540); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_DOWN",541); + PyModule_AddIntConstant(module,"ACTION_GESTURE_SWIPE_DOWN_TEN",550); + PyModule_AddIntConstant(module,"ACTION_GESTURE_END",599); + PyModule_AddIntConstant(module,"ACTION_ANALOG_MOVE_X",601); + PyModule_AddIntConstant(module,"ACTION_ANALOG_MOVE_Y",602); + PyModule_AddIntConstant(module,"ACTION_ERROR",998); + PyModule_AddIntConstant(module,"ACTION_NOOP",999); + PyModule_AddIntConstant(module,"ICON_TYPE_NONE",101); + PyModule_AddIntConstant(module,"ICON_TYPE_PROGRAMS",102); + PyModule_AddIntConstant(module,"ICON_TYPE_MUSIC",103); + PyModule_AddIntConstant(module,"ICON_TYPE_PICTURES",104); + PyModule_AddIntConstant(module,"ICON_TYPE_VIDEOS",105); + PyModule_AddIntConstant(module,"ICON_TYPE_FILES",106); + PyModule_AddIntConstant(module,"ICON_TYPE_WEATHER",107); + PyModule_AddIntConstant(module,"ICON_TYPE_SETTINGS",109); + } + +} // end PythonBindings namespace for python type definitions + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.xml b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.xml new file mode 100644 index 0000000000..f7e74714f8 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcgui.i.xml @@ -0,0 +1,27851 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.cpp new file mode 100644 index 0000000000..f0d8b3983e --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.cpp @@ -0,0 +1,915 @@ + + +/* + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +// ************************************************************************ +// This file was generated by xbmc compile process. DO NOT EDIT!! +// It was created by running the code generator on the spec file for +// the module "xbmcplugin" on the template file PythonSwig.template.cpp +// ************************************************************************ + + + +#include +#include +#include "interfaces/python/LanguageHook.h" +#include "interfaces/python/swig.h" +#include "interfaces/python/PyContext.h" + + +#include "interfaces/legacy/ModuleXbmcplugin.h" + +using namespace XBMCAddon; +using namespace xbmcplugin; + +#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif + + + +namespace PythonBindings +{ + + //========================================================================= + // These variables define the type XBMCAddon::xbmcgui::ListItem from another module + extern TypeInfo TyXBMCAddon_xbmcgui_ListItem_Type; + //========================================================================= + + + + static PyObject* xbmcplugin_addDirectoryItem (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "url", + "listitem", + "isFolder", + "totalItems", + NULL}; + + int handle ; + std::string url ; + PyObject* pyurl = NULL; + XBMCAddon::xbmcgui::ListItem * listitem ; + PyObject* pylistitem = NULL; + bool isFolder = false; + int totalItems = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iOO|bi", + (char**)keywords, + &handle, + &pyurl, + &pylistitem, + &isFolder, + &totalItems + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pyurl) PyXBMCGetUnicodeString(url,pyurl,false,"url","XBMCAddon::xbmcplugin::addDirectoryItem"); + listitem = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pylistitem,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcplugin::","XBMCAddon::xbmcplugin::addDirectoryItem"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcplugin::addDirectoryItem( handle, url, listitem, isFolder, totalItems ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::addDirectoryItem\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::addDirectoryItem\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcplugin_addDirectoryItems (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "items", + "totalItems", + NULL}; + + int handle ; + std::vector< Tuple< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const *,bool > > items ; + PyObject* pyitems = NULL; + int totalItems = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iO|i", + (char**)keywords, + &handle, + &pyitems, + &totalItems + )) + { + return NULL; + } + + bool apiResult; + try + { + + if (pyitems) + { + bool isTuple = PyObject_TypeCheck(pyitems,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyitems,&PyList_Type)) + throw WrongTypeException("The parameter \"items\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyitems) : PyList_Size(pyitems)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyitems, i) : PyList_GetItem(pyitems, i)); + Tuple< XBMCAddon::String ,XBMCAddon::xbmcgui::ListItem const *,bool > entry1; + + if(pyentry1) + { + bool isTuple = PyObject_TypeCheck(pyentry1,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyentry1,&PyList_Type)) + throw WrongTypeException("The parameter \"entry1\" must be either a Tuple or a List."); + int vecSize = (isTuple ? PyTuple_Size(pyentry1) : PyList_Size(pyentry1)); + + if (vecSize > 0) + { + PyObject *pyentry0_2 = NULL; + pyentry0_2 = (isTuple ? PyTuple_GetItem(pyentry1, 0) : PyList_GetItem(pyentry1, 0)); + std::string entry0_2; + if (pyentry0_2) PyXBMCGetUnicodeString(entry0_2,pyentry0_2,false,"entry0_2","XBMCAddon::xbmcplugin::addDirectoryItems"); + entry1.first() = entry0_2; + } + + if (vecSize > 1) + { + PyObject *pyentry1_2 = NULL; + pyentry1_2 = (isTuple ? PyTuple_GetItem(pyentry1, 1) : PyList_GetItem(pyentry1, 1)); + XBMCAddon::xbmcgui::ListItem * entry1_2; + entry1_2 = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pyentry1_2,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcplugin::","XBMCAddon::xbmcplugin::addDirectoryItems"); + entry1.second() = entry1_2; + } + + if (vecSize > 2) + { + PyObject *pyentry2_2 = NULL; + pyentry2_2 = (isTuple ? PyTuple_GetItem(pyentry1, 2) : PyList_GetItem(pyentry1, 2)); + bool entry2_2; + entry2_2 = (PyInt_AsLong(pyentry2_2) == 0L ? false : true); + entry1.third() = entry2_2; + } + + } + + items.push_back(entry1); + } + } + + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcplugin::addDirectoryItems( handle, items, totalItems ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::addDirectoryItems\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::addDirectoryItems\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcplugin_endOfDirectory (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "succeeded", + "updateListing", + "cacheToDisc", + NULL}; + + int handle ; + bool succeeded = true; + bool updateListing = false; + bool cacheToDisc = true; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i|bbb", + (char**)keywords, + &handle, + &succeeded, + &updateListing, + &cacheToDisc + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::endOfDirectory( handle, succeeded, updateListing, cacheToDisc ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::endOfDirectory\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::endOfDirectory\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_setResolvedUrl (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "succeeded", + "listitem", + NULL}; + + int handle ; + bool succeeded ; + XBMCAddon::xbmcgui::ListItem * listitem ; + PyObject* pylistitem = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ibO", + (char**)keywords, + &handle, + &succeeded, + &pylistitem + )) + { + return NULL; + } + + + try + { + listitem = (XBMCAddon::xbmcgui::ListItem *)retrieveApiInstance(pylistitem,"p.XBMCAddon::xbmcgui::ListItem","XBMCAddon::xbmcplugin::","XBMCAddon::xbmcplugin::setResolvedUrl"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::setResolvedUrl( handle, succeeded, listitem ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setResolvedUrl\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setResolvedUrl\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_addSortMethod (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "sortMethod", + "label2Mask", + NULL}; + + int handle ; + int sortMethod ; + std::string label2Mask = XBMCAddon::emptyString; + PyObject* pylabel2Mask = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"ii|O", + (char**)keywords, + &handle, + &sortMethod, + &pylabel2Mask + )) + { + return NULL; + } + + + try + { + if (pylabel2Mask) PyXBMCGetUnicodeString(label2Mask,pylabel2Mask,false,"label2Mask","XBMCAddon::xbmcplugin::addSortMethod"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::addSortMethod( handle, sortMethod, label2Mask ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::addSortMethod\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::addSortMethod\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_getSetting (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "id", + NULL}; + + int handle ; + char * id ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"is", + (char**)keywords, + &handle, + &id + )) + { + return NULL; + } + + std::string apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (std::string )XBMCAddon::xbmcplugin::getSetting( handle, id ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::getSetting\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::getSetting\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcplugin_setSetting (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "id", + "value", + NULL}; + + int handle ; + std::string id ; + PyObject* pyid = NULL; + std::string value ; + PyObject* pyvalue = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iOO", + (char**)keywords, + &handle, + &pyid, + &pyvalue + )) + { + return NULL; + } + + + try + { + if (pyid) PyXBMCGetUnicodeString(id,pyid,false,"id","XBMCAddon::xbmcplugin::setSetting"); + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,false,"value","XBMCAddon::xbmcplugin::setSetting"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::setSetting( handle, id, value ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setSetting\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setSetting\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_setContent (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "content", + NULL}; + + int handle ; + char * content ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"is", + (char**)keywords, + &handle, + &content + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::setContent( handle, content ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setContent\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setContent\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_setPluginCategory (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "category", + NULL}; + + int handle ; + std::string category ; + PyObject* pycategory = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"iO", + (char**)keywords, + &handle, + &pycategory + )) + { + return NULL; + } + + + try + { + if (pycategory) PyXBMCGetUnicodeString(category,pycategory,false,"category","XBMCAddon::xbmcplugin::setPluginCategory"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::setPluginCategory( handle, category ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setPluginCategory\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setPluginCategory\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_setPluginFanart (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "image", + "color1", + "color2", + "color3", + NULL}; + + int handle ; + char * image = NULL; + char * color1 = NULL; + char * color2 = NULL; + char * color3 = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"i|ssss", + (char**)keywords, + &handle, + &image, + &color1, + &color2, + &color3 + )) + { + return NULL; + } + + + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::setPluginFanart( handle, image, color1, color2, color3 ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setPluginFanart\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setPluginFanart\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcplugin_setProperty (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "handle", + "key", + "value", + NULL}; + + int handle ; + char * key ; + std::string value ; + PyObject* pyvalue = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"isO", + (char**)keywords, + &handle, + &key, + &pyvalue + )) + { + return NULL; + } + + + try + { + if (pyvalue) PyXBMCGetUnicodeString(value,pyvalue,false,"value","XBMCAddon::xbmcplugin::setProperty"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + XBMCAddon::xbmcplugin::setProperty( handle, key, value ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setProperty\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcplugin::setProperty\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + + static PyMethodDef xbmcplugin_methods[] = { + {(char*)"addDirectoryItem", (PyCFunction)xbmcplugin_addDirectoryItem, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addDirectoryItems", (PyCFunction)xbmcplugin_addDirectoryItems, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"endOfDirectory", (PyCFunction)xbmcplugin_endOfDirectory, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setResolvedUrl", (PyCFunction)xbmcplugin_setResolvedUrl, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"addSortMethod", (PyCFunction)xbmcplugin_addSortMethod, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"getSetting", (PyCFunction)xbmcplugin_getSetting, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setSetting", (PyCFunction)xbmcplugin_setSetting, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setContent", (PyCFunction)xbmcplugin_setContent, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setPluginCategory", (PyCFunction)xbmcplugin_setPluginCategory, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setPluginFanart", (PyCFunction)xbmcplugin_setPluginFanart, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"setProperty", (PyCFunction)xbmcplugin_setProperty, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + // This is the call that will call all of the other initializes + // for all of the classes in this module + static void initTypes() + { + static bool typesAlreadyInitialized = false; + if (!typesAlreadyInitialized) + { + typesAlreadyInitialized = true; + + } + } + + void initModule_xbmcplugin() + { + initTypes(); + + // init general xbmcplugin modules + PyObject* module; + + + + module = Py_InitModule((char*)"xbmcplugin", xbmcplugin_methods); + if (module == NULL) return; + + + + // constants + PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:31 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); + PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); + PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); + + // need to handle constants + + PyModule_AddIntConstant(module,"SORT_METHOD_NONE",SORT_METHOD_NONE); + PyModule_AddIntConstant(module,"SORT_METHOD_LABEL",SORT_METHOD_LABEL); + PyModule_AddIntConstant(module,"SORT_METHOD_LABEL_IGNORE_THE",SORT_METHOD_LABEL_IGNORE_THE); + PyModule_AddIntConstant(module,"SORT_METHOD_DATE",SORT_METHOD_DATE); + PyModule_AddIntConstant(module,"SORT_METHOD_SIZE",SORT_METHOD_SIZE); + PyModule_AddIntConstant(module,"SORT_METHOD_FILE",SORT_METHOD_FILE); + PyModule_AddIntConstant(module,"SORT_METHOD_DRIVE_TYPE",SORT_METHOD_DRIVE_TYPE); + PyModule_AddIntConstant(module,"SORT_METHOD_TRACKNUM",SORT_METHOD_TRACKNUM); + PyModule_AddIntConstant(module,"SORT_METHOD_DURATION",SORT_METHOD_DURATION); + PyModule_AddIntConstant(module,"SORT_METHOD_TITLE",SORT_METHOD_TITLE); + PyModule_AddIntConstant(module,"SORT_METHOD_TITLE_IGNORE_THE",SORT_METHOD_TITLE_IGNORE_THE); + PyModule_AddIntConstant(module,"SORT_METHOD_ARTIST",SORT_METHOD_ARTIST); + PyModule_AddIntConstant(module,"SORT_METHOD_ARTIST_IGNORE_THE",SORT_METHOD_ARTIST_IGNORE_THE); + PyModule_AddIntConstant(module,"SORT_METHOD_ALBUM",SORT_METHOD_ALBUM); + PyModule_AddIntConstant(module,"SORT_METHOD_ALBUM_IGNORE_THE",SORT_METHOD_ALBUM_IGNORE_THE); + PyModule_AddIntConstant(module,"SORT_METHOD_GENRE",SORT_METHOD_GENRE); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_YEAR",SORT_METHOD_YEAR); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_RATING",SORT_METHOD_VIDEO_RATING); + PyModule_AddIntConstant(module,"SORT_METHOD_PROGRAM_COUNT",SORT_METHOD_PROGRAM_COUNT); + PyModule_AddIntConstant(module,"SORT_METHOD_PLAYLIST_ORDER",SORT_METHOD_PLAYLIST_ORDER); + PyModule_AddIntConstant(module,"SORT_METHOD_EPISODE",SORT_METHOD_EPISODE); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_TITLE",SORT_METHOD_VIDEO_TITLE); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_SORT_TITLE",SORT_METHOD_VIDEO_SORT_TITLE); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE",SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE); + PyModule_AddIntConstant(module,"SORT_METHOD_PRODUCTIONCODE",SORT_METHOD_PRODUCTIONCODE); + PyModule_AddIntConstant(module,"SORT_METHOD_SONG_RATING",SORT_METHOD_SONG_RATING); + PyModule_AddIntConstant(module,"SORT_METHOD_MPAA_RATING",SORT_METHOD_MPAA_RATING); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_RUNTIME",SORT_METHOD_VIDEO_RUNTIME); + PyModule_AddIntConstant(module,"SORT_METHOD_STUDIO",SORT_METHOD_STUDIO); + PyModule_AddIntConstant(module,"SORT_METHOD_STUDIO_IGNORE_THE",SORT_METHOD_STUDIO_IGNORE_THE); + PyModule_AddIntConstant(module,"SORT_METHOD_UNSORTED",SORT_METHOD_UNSORTED); + PyModule_AddIntConstant(module,"SORT_METHOD_BITRATE",SORT_METHOD_BITRATE); + PyModule_AddIntConstant(module,"SORT_METHOD_LISTENERS",SORT_METHOD_LISTENERS); + PyModule_AddIntConstant(module,"SORT_METHOD_COUNTRY",SORT_METHOD_COUNTRY); + PyModule_AddIntConstant(module,"SORT_METHOD_DATEADDED",SORT_METHOD_DATEADDED); + PyModule_AddIntConstant(module,"SORT_METHOD_FULLPATH",SORT_METHOD_FULLPATH); + PyModule_AddIntConstant(module,"SORT_METHOD_LABEL_IGNORE_FOLDERS",SORT_METHOD_LABEL_IGNORE_FOLDERS); + PyModule_AddIntConstant(module,"SORT_METHOD_LASTPLAYED",SORT_METHOD_LASTPLAYED); + PyModule_AddIntConstant(module,"SORT_METHOD_PLAYCOUNT",SORT_METHOD_PLAYCOUNT); + PyModule_AddIntConstant(module,"SORT_METHOD_CHANNEL",SORT_METHOD_CHANNEL); + PyModule_AddIntConstant(module,"SORT_METHOD_DATE_TAKEN",SORT_METHOD_DATE_TAKEN); + PyModule_AddIntConstant(module,"SORT_METHOD_VIDEO_USER_RATING",SORT_METHOD_VIDEO_USER_RATING); + PyModule_AddIntConstant(module,"SORT_METHOD_SONG_USER_RATING",SORT_METHOD_SONG_USER_RATING); + } + +} // end PythonBindings namespace for python type definitions + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.xml b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.xml new file mode 100644 index 0000000000..90d9e98d8a --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcplugin.i.xml @@ -0,0 +1,2077 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.cpp new file mode 100644 index 0000000000..11e1c9733b --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.cpp @@ -0,0 +1,1598 @@ + + +/* + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +// ************************************************************************ +// This file was generated by xbmc compile process. DO NOT EDIT!! +// It was created by running the code generator on the spec file for +// the module "xbmcvfs" on the template file PythonSwig.template.cpp +// ************************************************************************ + + + +#include +#include +#include "interfaces/python/LanguageHook.h" +#include "interfaces/python/swig.h" +#include "interfaces/python/PyContext.h" + + +#include "interfaces/legacy/ModuleXbmcvfs.h" +#include "interfaces/legacy/File.h" +#include "interfaces/legacy/Stat.h" +#include "utils/log.h" + +using namespace XBMCAddon; +using namespace xbmcvfs; + +#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif + + + +namespace PythonBindings +{ + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcvfs::File + TypeInfo TyXBMCAddon_xbmcvfs_File_Type(typeid(XBMCAddon::xbmcvfs::File)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcvfs::Stat + TypeInfo TyXBMCAddon_xbmcvfs_Stat_Type(typeid(XBMCAddon::xbmcvfs::Stat)); + //========================================================================= + + + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "filepath", + "mode", + NULL}; + + std::string filepath ; + PyObject* pyfilepath = NULL; + char * mode = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|s", + (char**)keywords, + &pyfilepath, + &mode + )) + { + return NULL; + } + + XBMCAddon::xbmcvfs::File * apiResult; + try + { + if (pyfilepath) PyXBMCGetUnicodeString(filepath,pyfilepath,false,"filepath","File"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcvfs::File *)new XBMCAddon::xbmcvfs::File( filepath, mode ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcvfs::File\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcvfs::File\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_read (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "numBytes", + NULL}; + + unsigned long numBytes = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|k", + (char**)keywords, + &numBytes + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"read","XBMCAddon::xbmcvfs::File"))-> read( numBytes ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"read\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"read\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_readBytes (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "numBytes", + NULL}; + + unsigned long numBytes = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|k", + (char**)keywords, + &numBytes + )) + { + return NULL; + } + + XbmcCommons::Buffer apiResult; + try + { + + apiResult = (XbmcCommons::Buffer )((XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"readBytes","XBMCAddon::xbmcvfs::File"))-> readBytes( numBytes ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"readBytes\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"readBytes\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyByteArray_FromStringAndSize((char*)apiResult.curPosition(),apiResult.remaining()); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_write (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "buffer", + NULL}; + + XbmcCommons::Buffer buffer ; + PyObject* pybuffer = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pybuffer + )) + { + return NULL; + } + + bool apiResult; + try + { + + if (PyString_Check(pybuffer)) + { + const char* str = PyString_AsString(pybuffer); + size_t size = (size_t)PyString_Size(pybuffer); + buffer.allocate(size); + buffer.put(str,size); + buffer.flip(); // prepare the buffer for reading from + } + else if (PyByteArray_Check(pybuffer)) + { + size_t size = PyByteArray_Size(pybuffer); + buffer.allocate(size); + buffer.put(PyByteArray_AsString(pybuffer),size); + buffer.flip(); // prepare the buffer for reading from + } + else + throw XBMCAddon::WrongTypeException("argument \"%s\" for \"%s\" must be a string or a bytearray", "buffer", "write"); + + apiResult = (bool )((XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"write","XBMCAddon::xbmcvfs::File"))-> write( buffer ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"write\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"write\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_size (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"size","XBMCAddon::xbmcvfs::File"))-> size( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"size\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"size\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_seek (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "seekBytes", + "iWhence", + NULL}; + + long long seekBytes ; + int iWhence ; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"Li", + (char**)keywords, + &seekBytes, + &iWhence + )) + { + return NULL; + } + + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"seek","XBMCAddon::xbmcvfs::File"))-> seek( seekBytes, iWhence ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"seek\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"seek\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_File_close (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"close","XBMCAddon::xbmcvfs::File"))-> close( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"close\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"close\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + XBMCAddon::xbmcvfs::Stat * apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","Stat"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcvfs::Stat *)new XBMCAddon::xbmcvfs::Stat( path ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcvfs::Stat\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcvfs::Stat\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_mode (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_mode","XBMCAddon::xbmcvfs::Stat"))-> st_mode( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_mode\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_mode\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_ino (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_ino","XBMCAddon::xbmcvfs::Stat"))-> st_ino( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_ino\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_ino\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_dev (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_dev","XBMCAddon::xbmcvfs::Stat"))-> st_dev( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_dev\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_dev\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_nlink (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_nlink","XBMCAddon::xbmcvfs::Stat"))-> st_nlink( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_nlink\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_nlink\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_uid (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_uid","XBMCAddon::xbmcvfs::Stat"))-> st_uid( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_uid\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_uid\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_gid (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_gid","XBMCAddon::xbmcvfs::Stat"))-> st_gid( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_gid\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_gid\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_size (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"st_size","XBMCAddon::xbmcvfs::Stat"))-> st_size( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"st_size\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"st_size\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_atime (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"atime","XBMCAddon::xbmcvfs::Stat"))-> atime( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"atime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"atime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_mtime (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"mtime","XBMCAddon::xbmcvfs::Stat"))-> mtime( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"mtime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"mtime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_ctime (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + long long apiResult; + try + { + + apiResult = (long long )((XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"ctime","XBMCAddon::xbmcvfs::Stat"))-> ctime( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"ctime\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"ctime\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"L", apiResult); + + return result; + } + + static PyObject* xbmcvfs_copy (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "strSource", + "strDestnation", + NULL}; + + std::string strSource ; + PyObject* pystrSource = NULL; + std::string strDestnation ; + PyObject* pystrDestnation = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO", + (char**)keywords, + &pystrSource, + &pystrDestnation + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pystrSource) PyXBMCGetUnicodeString(strSource,pystrSource,false,"strSource","XBMCAddon::xbmcvfs::copy"); + if (pystrDestnation) PyXBMCGetUnicodeString(strDestnation,pystrDestnation,false,"strDestnation","XBMCAddon::xbmcvfs::copy"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::copy( strSource, strDestnation ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::copy\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::copy\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_delete (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "file", + NULL}; + + std::string file ; + PyObject* pyfile = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyfile + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pyfile) PyXBMCGetUnicodeString(file,pyfile,false,"file","XBMCAddon::xbmcvfs::deleteFile"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::deleteFile( file ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::deleteFile\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::deleteFile\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_rename (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "file", + "newFile", + NULL}; + + std::string file ; + PyObject* pyfile = NULL; + std::string newFile ; + PyObject* pynewFile = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO", + (char**)keywords, + &pyfile, + &pynewFile + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pyfile) PyXBMCGetUnicodeString(file,pyfile,false,"file","XBMCAddon::xbmcvfs::rename"); + if (pynewFile) PyXBMCGetUnicodeString(newFile,pynewFile,false,"newFile","XBMCAddon::xbmcvfs::rename"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::rename( file, newFile ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::rename\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::rename\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_exists (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmcvfs::exists"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::exists( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::exists\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::exists\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_mkdir (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmcvfs::mkdir"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::mkdir( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::mkdir\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::mkdir\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_mkdirs (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmcvfs::mkdirs"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::mkdirs( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::mkdirs\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::mkdirs\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_rmdir (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + "force", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + bool force = false; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O|b", + (char**)keywords, + &pypath, + &force + )) + { + return NULL; + } + + bool apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmcvfs::rmdir"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (bool )XBMCAddon::xbmcvfs::rmdir( path, force ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::rmdir\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::rmdir\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = Py_BuildValue((char*)"b", apiResult); + + return result; + } + + static PyObject* xbmcvfs_listdir (PyObject* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "path", + NULL}; + + std::string path ; + PyObject* pypath = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pypath + )) + { + return NULL; + } + + Tuple< std::vector< XBMCAddon::String > ,std::vector< XBMCAddon::String > > apiResult; + try + { + if (pypath) PyXBMCGetUnicodeString(path,pypath,false,"path","XBMCAddon::xbmcvfs::listdir"); + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (Tuple< std::vector< XBMCAddon::String > ,std::vector< XBMCAddon::String > > )XBMCAddon::xbmcvfs::listdir( path ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::listdir\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::listdir\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + int vecSize = apiResult.GetNumValuesSet(); + result = PyTuple_New(vecSize); + { + PyObject* pyentry1; + + if (vecSize > 0) + { + std::vector< XBMCAddon::String > & entry1 = apiResult.first(); + { + + pyentry1 = PyList_New(0); + + for (std::vector::iterator iter = entry1.begin(); iter != entry1.end(); ++iter) + { + std::string & entry2 = *iter; + PyObject* pyentry2; + pyentry2 = PyString_FromStringAndSize(entry2.c_str(), entry2.length()); + PyList_Append(pyentry1, pyentry2); + Py_DECREF(pyentry2); + } + + + } + PyTuple_SetItem(result, 0, pyentry1); + } + + + if (vecSize > 1) + { + std::vector< XBMCAddon::String > & entry1 = apiResult.second(); + { + + pyentry1 = PyList_New(0); + + for (std::vector::iterator iter = entry1.begin(); iter != entry1.end(); ++iter) + { + std::string & entry3 = *iter; + PyObject* pyentry3; + pyentry3 = PyString_FromStringAndSize(entry3.c_str(), entry3.length()); + PyList_Append(pyentry1, pyentry3); + Py_DECREF(pyentry3); + } + + + } + PyTuple_SetItem(result, 1, pyentry1); + } + + } + + return result; + } + + static void xbmcvfs_XBMCAddon_xbmcvfs_File_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcvfs::File* theObj = (XBMCAddon::xbmcvfs::File*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_File_Type,"~XBMCAddon::xbmcvfs::File","XBMCAddon::xbmcvfs::File"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::File\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::File\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcvfs_XBMCAddon_xbmcvfs_Stat_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcvfs::Stat* theObj = (XBMCAddon::xbmcvfs::Stat*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcvfs_Stat_Type,"~XBMCAddon::xbmcvfs::Stat","XBMCAddon::xbmcvfs::Stat"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::Stat\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcvfs::Stat\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcvfs::File + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcvfs_File_methods[] = { + {(char*)"read", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_File_read, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"readBytes", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_File_readBytes, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"write", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_File_write, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"size", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_File_size, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"seek", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_File_seek, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"close", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_File_close, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcvfs_File_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcvfs_File_Type.pythonType; + pythonType.tp_name = (char*)"xbmcvfs.File"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcvfs_XBMCAddon_xbmcvfs_File_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcvfs_File_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcvfs_XBMCAddon_xbmcvfs_File_New; + + TyXBMCAddon_xbmcvfs_File_Type.swigType="p.XBMCAddon::xbmcvfs::File"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcvfs_File_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcvfs::Stat + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcvfs_Stat_methods[] = { + {(char*)"st_mode", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_mode, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_ino", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_ino, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_dev", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_dev, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_nlink", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_nlink, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_uid", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_uid, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_gid", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_gid, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_size", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_size, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_atime", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_atime, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_mtime", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_mtime, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"st_ctime", (PyCFunction)xbmcvfs_XBMCAddon_xbmcvfs_Stat_st_ctime, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcvfs_Stat_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcvfs_Stat_Type.pythonType; + pythonType.tp_name = (char*)"xbmcvfs.Stat"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcvfs_XBMCAddon_xbmcvfs_Stat_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcvfs_Stat_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcvfs_XBMCAddon_xbmcvfs_Stat_New; + + TyXBMCAddon_xbmcvfs_Stat_Type.swigType="p.XBMCAddon::xbmcvfs::Stat"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcvfs_Stat_Type); + + } + //========================================================================= + + + static PyMethodDef xbmcvfs_methods[] = { + {(char*)"copy", (PyCFunction)xbmcvfs_copy, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"delete", (PyCFunction)xbmcvfs_delete, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"rename", (PyCFunction)xbmcvfs_rename, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"exists", (PyCFunction)xbmcvfs_exists, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"mkdir", (PyCFunction)xbmcvfs_mkdir, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"mkdirs", (PyCFunction)xbmcvfs_mkdirs, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"rmdir", (PyCFunction)xbmcvfs_rmdir, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"listdir", (PyCFunction)xbmcvfs_listdir, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + // This is the call that will call all of the other initializes + // for all of the classes in this module + static void initTypes() + { + static bool typesAlreadyInitialized = false; + if (!typesAlreadyInitialized) + { + typesAlreadyInitialized = true; + + initPyXBMCAddon_xbmcvfs_File_Type(); + initPyXBMCAddon_xbmcvfs_Stat_Type(); + if (PyType_Ready(&(TyXBMCAddon_xbmcvfs_File_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcvfs_Stat_Type.pythonType)) < 0) + return; + } + } + + void initModule_xbmcvfs() + { + initTypes(); + + // init general xbmcvfs modules + PyObject* module; + + + Py_INCREF(&(TyXBMCAddon_xbmcvfs_File_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcvfs_Stat_Type.pythonType)); + + module = Py_InitModule((char*)"xbmcvfs", xbmcvfs_methods); + if (module == NULL) return; + + + PyModule_AddObject(module, (char*)"File", (PyObject*)(&(TyXBMCAddon_xbmcvfs_File_Type.pythonType))); + PyModule_AddObject(module, (char*)"Stat", (PyObject*)(&(TyXBMCAddon_xbmcvfs_Stat_Type.pythonType))); + + // constants + PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:34 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); + PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); + PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); + + // need to handle constants + + } + +} // end PythonBindings namespace for python type definitions + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.xml b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.xml new file mode 100644 index 0000000000..99afb23fcc --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcvfs.i.xml @@ -0,0 +1,1804 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.cpp new file mode 100644 index 0000000000..78edb80331 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.cpp @@ -0,0 +1,1286 @@ + + +/* + * Copyright (C) 2005-2013 Team XBMC + * http://xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +// ************************************************************************ +// This file was generated by xbmc compile process. DO NOT EDIT!! +// It was created by running the code generator on the spec file for +// the module "xbmcwsgi" on the template file PythonSwig.template.cpp +// ************************************************************************ + + +#include "system.h" + +#ifdef HAS_WEB_SERVER + + +#include +#include +#include "interfaces/python/LanguageHook.h" +#include "interfaces/python/swig.h" +#include "interfaces/python/PyContext.h" + + +#include "interfaces/legacy/wsgi/WsgiErrorStream.h" +#include "interfaces/legacy/wsgi/WsgiInputStream.h" +#include "interfaces/legacy/wsgi/WsgiResponse.h" +#include "interfaces/legacy/wsgi/WsgiResponseBody.h" + +using namespace XBMCAddon; +using namespace xbmcwsgi; + +#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif + + + +namespace PythonBindings +{ + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcwsgi::WsgiErrorStream + TypeInfo TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type(typeid(XBMCAddon::xbmcwsgi::WsgiErrorStream)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcwsgi::WsgiInputStreamIterator + TypeInfo TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type(typeid(XBMCAddon::xbmcwsgi::WsgiInputStreamIterator)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcwsgi::WsgiInputStream + TypeInfo TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type(typeid(XBMCAddon::xbmcwsgi::WsgiInputStream)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcwsgi::WsgiResponse + TypeInfo TyXBMCAddon_xbmcwsgi_WsgiResponse_Type(typeid(XBMCAddon::xbmcwsgi::WsgiResponse)); + //========================================================================= + + //========================================================================= + // These variables will hold the Python Type information for XBMCAddon::xbmcwsgi::WsgiResponseBody + TypeInfo TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type(typeid(XBMCAddon::xbmcwsgi::WsgiResponseBody)); + //========================================================================= + + + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcwsgi::WsgiErrorStream * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcwsgi::WsgiErrorStream *)new XBMCAddon::xbmcwsgi::WsgiErrorStream( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiErrorStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiErrorStream\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_flush (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + try + { + + ((XBMCAddon::xbmcwsgi::WsgiErrorStream*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type,"flush","XBMCAddon::xbmcwsgi::WsgiErrorStream"))-> flush( ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"flush\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"flush\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_write (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "str", + NULL}; + + std::string str ; + PyObject* pystr = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pystr + )) + { + return NULL; + } + + + try + { + if (pystr) PyXBMCGetUnicodeString(str,pystr,false,"str","write"); + + ((XBMCAddon::xbmcwsgi::WsgiErrorStream*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type,"write","XBMCAddon::xbmcwsgi::WsgiErrorStream"))-> write( str ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"write\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"write\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_writelines (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "seq", + NULL}; + + std::vector< XBMCAddon::String > seq ; + PyObject* pyseq = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pyseq + )) + { + return NULL; + } + + + try + { + + if (pyseq) + { + bool isTuple = PyObject_TypeCheck(pyseq,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyseq,&PyList_Type)) + throw WrongTypeException("The parameter \"seq\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyseq) : PyList_Size(pyseq)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyseq, i) : PyList_GetItem(pyseq, i)); + std::string entry1; + if (pyentry1) PyXBMCGetUnicodeString(entry1,pyentry1,false,"entry1","writelines"); + seq.push_back(entry1); + } + } + + + ((XBMCAddon::xbmcwsgi::WsgiErrorStream*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type,"writelines","XBMCAddon::xbmcwsgi::WsgiErrorStream"))-> writelines( seq ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"writelines\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"writelines\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcwsgi::WsgiInputStreamIterator * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcwsgi::WsgiInputStreamIterator *)new XBMCAddon::xbmcwsgi::WsgiInputStreamIterator( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiInputStreamIterator\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiInputStreamIterator\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_read (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "size", + NULL}; + + unsigned long size = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|k", + (char**)keywords, + &size + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcwsgi::WsgiInputStreamIterator*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type,"read","XBMCAddon::xbmcwsgi::WsgiInputStreamIterator"))-> read( size ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"read\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"read\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_readline (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "size", + NULL}; + + unsigned long size = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|k", + (char**)keywords, + &size + )) + { + return NULL; + } + + std::string apiResult; + try + { + + apiResult = (std::string )((XBMCAddon::xbmcwsgi::WsgiInputStreamIterator*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type,"readline","XBMCAddon::xbmcwsgi::WsgiInputStreamIterator"))-> readline( size ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"readline\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"readline\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_readlines (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "sizehint", + NULL}; + + unsigned long sizehint = 0; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"|k", + (char**)keywords, + &sizehint + )) + { + return NULL; + } + + std::vector< XBMCAddon::String > apiResult; + try + { + + apiResult = (std::vector< XBMCAddon::String > )((XBMCAddon::xbmcwsgi::WsgiInputStreamIterator*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type,"readlines","XBMCAddon::xbmcwsgi::WsgiInputStreamIterator"))-> readlines( sizehint ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"readlines\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"readlines\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + + result = PyList_New(0); + + for (std::vector::iterator iter = apiResult.begin(); iter != apiResult.end(); ++iter) + { + std::string & entry1 = *iter; + PyObject* pyentry1; + pyentry1 = PyString_FromStringAndSize(entry1.c_str(), entry1.length()); + PyList_Append(result, pyentry1); + Py_DECREF(pyentry1); + } + + + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcwsgi::WsgiInputStream * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcwsgi::WsgiInputStream *)new XBMCAddon::xbmcwsgi::WsgiInputStream( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiInputStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiInputStream\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponse_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcwsgi::WsgiResponse * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcwsgi::WsgiResponse *)new XBMCAddon::xbmcwsgi::WsgiResponse( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiResponse\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiResponse\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponse_callable_ (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "status", + "response_headers", + "exc_info", + NULL}; + + std::string status ; + PyObject* pystatus = NULL; + std::vector< XBMCAddon::xbmcwsgi::WsgiHttpHeader > response_headers ; + PyObject* pyresponse_headers = NULL; + void * exc_info = NULL; + PyObject* pyexc_info = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"OO|O", + (char**)keywords, + &pystatus, + &pyresponse_headers, + &pyexc_info + )) + { + return NULL; + } + + WsgiResponseBody * apiResult; + try + { + if (pystatus) PyXBMCGetUnicodeString(status,pystatus,false,"status","operator ()"); + + if (pyresponse_headers) + { + bool isTuple = PyObject_TypeCheck(pyresponse_headers,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyresponse_headers,&PyList_Type)) + throw WrongTypeException("The parameter \"response_headers\" must be either a Tuple or a List."); + + + PyObject *pyentry1 = NULL; + int vecSize = (isTuple ? PyTuple_Size(pyresponse_headers) : PyList_Size(pyresponse_headers)); + for(int i = 0; i < vecSize; i++) + { + pyentry1 = (isTuple ? PyTuple_GetItem(pyresponse_headers, i) : PyList_GetItem(pyresponse_headers, i)); + Tuple< XBMCAddon::String ,XBMCAddon::String > entry1; + + if(pyentry1) + { + bool isTuple = PyObject_TypeCheck(pyentry1,&PyTuple_Type); + if (!isTuple && !PyObject_TypeCheck(pyentry1,&PyList_Type)) + throw WrongTypeException("The parameter \"entry1\" must be either a Tuple or a List."); + int vecSize = (isTuple ? PyTuple_Size(pyentry1) : PyList_Size(pyentry1)); + + if (vecSize > 0) + { + PyObject *pyentry0_2 = NULL; + pyentry0_2 = (isTuple ? PyTuple_GetItem(pyentry1, 0) : PyList_GetItem(pyentry1, 0)); + std::string entry0_2; + if (pyentry0_2) PyXBMCGetUnicodeString(entry0_2,pyentry0_2,false,"entry0_2","operator ()"); + entry1.first() = entry0_2; + } + + if (vecSize > 1) + { + PyObject *pyentry1_2 = NULL; + pyentry1_2 = (isTuple ? PyTuple_GetItem(pyentry1, 1) : PyList_GetItem(pyentry1, 1)); + std::string entry1_2; + if (pyentry1_2) PyXBMCGetUnicodeString(entry1_2,pyentry1_2,false,"entry1_2","operator ()"); + entry1.second() = entry1_2; + } + + } + + response_headers.push_back(entry1); + } + } + + exc_info = (void*)pyexc_info; + + apiResult = (WsgiResponseBody *)((XBMCAddon::xbmcwsgi::WsgiResponse*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiResponse_Type,"operator ()","XBMCAddon::xbmcwsgi::WsgiResponse"))-> operator ()( status, response_headers, exc_info ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"operator ()\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"operator ()\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,true); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponseBody_New (PyTypeObject* pytype , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + XBMCAddon::xbmcwsgi::WsgiResponseBody * apiResult; + try + { + + XBMCAddon::SetLanguageHookGuard slhg(XBMCAddon::Python::PythonLanguageHook::GetIfExists(PyThreadState_Get()->interp).get()); + apiResult = (XBMCAddon::xbmcwsgi::WsgiResponseBody *)new XBMCAddon::xbmcwsgi::WsgiResponseBody( ); + prepareForReturn(apiResult); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiResponseBody\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"new XBMCAddon::xbmcwsgi::WsgiResponseBody\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + result = makePythonInstance(apiResult,pytype,false); + + return result; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponseBody_callable_ (PyHolder* self , PyObject *args, PyObject *kwds ) + { + XBMC_TRACE; + + static const char *keywords[] = { + "data", + NULL}; + + std::string data ; + PyObject* pydata = NULL; + if (!PyArg_ParseTupleAndKeywords( + args, + kwds, + (char*)"O", + (char**)keywords, + &pydata + )) + { + return NULL; + } + + + try + { + if (pydata) PyXBMCGetUnicodeString(data,pydata,false,"data","operator ()"); + + ((XBMCAddon::xbmcwsgi::WsgiResponseBody*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type,"operator ()","XBMCAddon::xbmcwsgi::WsgiResponseBody"))-> operator ()( data ); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"operator ()\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"operator ()\""); + return NULL; + } + + PyObject* result = Py_None; + + // transform the result + Py_INCREF(Py_None); + result = Py_None; + + return result; + } + + static void xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcwsgi::WsgiErrorStream* theObj = (XBMCAddon::xbmcwsgi::WsgiErrorStream*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type,"~XBMCAddon::xbmcwsgi::WsgiErrorStream","XBMCAddon::xbmcwsgi::WsgiErrorStream"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiErrorStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiErrorStream\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcwsgi::WsgiInputStreamIterator* theObj = (XBMCAddon::xbmcwsgi::WsgiInputStreamIterator*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type,"~XBMCAddon::xbmcwsgi::WsgiInputStreamIterator","XBMCAddon::xbmcwsgi::WsgiInputStreamIterator"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiInputStreamIterator\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiInputStreamIterator\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcwsgi::WsgiInputStream* theObj = (XBMCAddon::xbmcwsgi::WsgiInputStream*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type,"~XBMCAddon::xbmcwsgi::WsgiInputStream","XBMCAddon::xbmcwsgi::WsgiInputStream"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiInputStream\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiInputStream\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponse_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcwsgi::WsgiResponse* theObj = (XBMCAddon::xbmcwsgi::WsgiResponse*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiResponse_Type,"~XBMCAddon::xbmcwsgi::WsgiResponse","XBMCAddon::xbmcwsgi::WsgiResponse"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiResponse\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiResponse\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + static void xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponseBody_Dealloc (PyHolder* self ) + { + XBMC_TRACE; + + try + { + + + XBMCAddon::xbmcwsgi::WsgiResponseBody* theObj = (XBMCAddon::xbmcwsgi::WsgiResponseBody*)retrieveApiInstance((PyObject*)self,&TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type,"~XBMCAddon::xbmcwsgi::WsgiResponseBody","XBMCAddon::xbmcwsgi::WsgiResponseBody"); + cleanForDealloc(theObj); + + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiResponseBody\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"XBMCAddon::xbmcwsgi::WsgiResponseBody\""); + } + + self->ob_type->tp_free((PyObject*)self); + + } + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcwsgi::WsgiErrorStream + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcwsgi_WsgiErrorStream_methods[] = { + {(char*)"flush", (PyCFunction)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_flush, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"write", (PyCFunction)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_write, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"writelines", (PyCFunction)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_writelines, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type.pythonType; + pythonType.tp_name = (char*)"xbmcwsgi.WsgiErrorStream"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcwsgi_WsgiErrorStream_methods; + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiErrorStream_New; + + TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type.swigType="p.XBMCAddon::xbmcwsgi::WsgiErrorStream"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcwsgi::WsgiInputStreamIterator + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_methods[] = { + {(char*)"read", (PyCFunction)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_read, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"readline", (PyCFunction)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_readline, METH_VARARGS|METH_KEYWORDS, NULL }, + {(char*)"readlines", (PyCFunction)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_readlines, METH_VARARGS|METH_KEYWORDS, NULL }, + {NULL, NULL, 0, NULL} + }; + + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iter(PyObject* self) + { + return self; + } + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iternext(PyObject* self) + { + PyObject* result = NULL; + try + { + XBMCAddon::xbmcwsgi::WsgiInputStreamIterator* iter = (XBMCAddon::xbmcwsgi::WsgiInputStreamIterator*)retrieveApiInstance(self,&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type,"xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iternext","XBMCAddon::xbmcwsgi::WsgiInputStreamIterator"); + + // check if we have reached the end + if (!iter->end()) + { + ++(*iter); + + std::string apiResult = **iter; + result = PyString_FromStringAndSize(apiResult.c_str(), apiResult.length()); + } + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iternext\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iternext\""); + return NULL; + } + + return result; + } + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type.pythonType; + pythonType.tp_name = (char*)"xbmcwsgi.WsgiInputStreamIterator"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_ITER; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_methods; + pythonType.tp_iter = (getiterfunc)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iter; + pythonType.tp_iternext = (iternextfunc)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_iternext; + + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStreamIterator_New; + + TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type.swigType="p.XBMCAddon::xbmcwsgi::WsgiInputStreamIterator"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcwsgi::WsgiInputStream + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcwsgi_WsgiInputStream_methods[] = { + {NULL, NULL, 0, NULL} + }; + + + static PyObject* xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_iter(PyObject* self) + { + PyObject* result = NULL; + try + { + XBMCAddon::xbmcwsgi::WsgiInputStreamIterator* apiResult = ((XBMCAddon::xbmcwsgi::WsgiInputStream*)retrieveApiInstance(self,&TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type,"xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_iternext","XBMCAddon::xbmcwsgi::WsgiInputStream"))->begin(); + + result = makePythonInstance(apiResult,true); + } + catch (const XBMCAddon::WrongTypeException& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_TypeError, e.GetMessage()); + return NULL; + } + catch (const XbmcCommons::Exception& e) + { + CLog::Log(LOGERROR,"EXCEPTION: %s",e.GetMessage()); + PyErr_SetString(PyExc_RuntimeError, e.GetMessage()); + return NULL; + } + catch (...) + { + CLog::Log(LOGERROR,"EXCEPTION: Unknown exception thrown from the call \"xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_iternext\""); + PyErr_SetString(PyExc_RuntimeError, "Unknown exception thrown from the call \"xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_iternext\""); + return NULL; + } + + return result; + } + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcwsgi_WsgiInputStream_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type.pythonType; + pythonType.tp_name = (char*)"xbmcwsgi.WsgiInputStream"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcwsgi_WsgiInputStream_methods; + pythonType.tp_iter = (getiterfunc)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_iter; + + + pythonType.tp_base = &(TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type.pythonType); + pythonType.tp_new = xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiInputStream_New; + + TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type.swigType="p.XBMCAddon::xbmcwsgi::WsgiInputStream"; + TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type.parentType=&TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type; + + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcwsgi::WsgiResponse + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcwsgi_WsgiResponse_methods[] = { + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcwsgi_WsgiResponse_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcwsgi_WsgiResponse_Type.pythonType; + pythonType.tp_name = (char*)"xbmcwsgi.WsgiResponse"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponse_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcwsgi_WsgiResponse_methods; + pythonType.tp_call = (ternaryfunc)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponse_callable_; + + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponse_New; + + TyXBMCAddon_xbmcwsgi_WsgiResponse_Type.swigType="p.XBMCAddon::xbmcwsgi::WsgiResponse"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcwsgi_WsgiResponse_Type); + + } + //========================================================================= + + //========================================================================= + // This section contains the initialization for the + // Python extention for the Api class XBMCAddon::xbmcwsgi::WsgiResponseBody + //========================================================================= + // All of the methods on this class + static PyMethodDef XBMCAddon_xbmcwsgi_WsgiResponseBody_methods[] = { + {NULL, NULL, 0, NULL} + }; + + + + // This method initializes the above mentioned Python Type structure + static void initPyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type() + { + + + PyTypeObject& pythonType = TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type.pythonType; + pythonType.tp_name = (char*)"xbmcwsgi.WsgiResponseBody"; + pythonType.tp_basicsize = sizeof(PyHolder); + pythonType.tp_dealloc = (destructor)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponseBody_Dealloc; + + + pythonType.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE; + + pythonType.tp_doc = NULL; + pythonType.tp_methods = XBMCAddon_xbmcwsgi_WsgiResponseBody_methods; + pythonType.tp_call = (ternaryfunc)xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponseBody_callable_; + + + pythonType.tp_base = NULL; + pythonType.tp_new = xbmcwsgi_XBMCAddon_xbmcwsgi_WsgiResponseBody_New; + + TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type.swigType="p.XBMCAddon::xbmcwsgi::WsgiResponseBody"; + registerAddonClassTypeInformation(&TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type); + + } + //========================================================================= + + + static PyMethodDef xbmcwsgi_methods[] = { + {NULL, NULL, 0, NULL} + }; + + // This is the call that will call all of the other initializes + // for all of the classes in this module + static void initTypes() + { + static bool typesAlreadyInitialized = false; + if (!typesAlreadyInitialized) + { + typesAlreadyInitialized = true; + + initPyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type(); + initPyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type(); + initPyXBMCAddon_xbmcwsgi_WsgiInputStream_Type(); + initPyXBMCAddon_xbmcwsgi_WsgiResponse_Type(); + initPyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type(); + if (PyType_Ready(&(TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcwsgi_WsgiResponse_Type.pythonType)) < 0) + return; + if (PyType_Ready(&(TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type.pythonType)) < 0) + return; + } + } + + void initModule_xbmcwsgi() + { + initTypes(); + + // init general xbmcwsgi modules + PyObject* module; + + + Py_INCREF(&(TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcwsgi_WsgiResponse_Type.pythonType)); + Py_INCREF(&(TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type.pythonType)); + + module = Py_InitModule((char*)"xbmcwsgi", xbmcwsgi_methods); + if (module == NULL) return; + + + PyModule_AddObject(module, (char*)"WsgiErrorStream", (PyObject*)(&(TyXBMCAddon_xbmcwsgi_WsgiErrorStream_Type.pythonType))); + PyModule_AddObject(module, (char*)"WsgiInputStreamIterator", (PyObject*)(&(TyXBMCAddon_xbmcwsgi_WsgiInputStreamIterator_Type.pythonType))); + PyModule_AddObject(module, (char*)"WsgiInputStream", (PyObject*)(&(TyXBMCAddon_xbmcwsgi_WsgiInputStream_Type.pythonType))); + PyModule_AddObject(module, (char*)"WsgiResponse", (PyObject*)(&(TyXBMCAddon_xbmcwsgi_WsgiResponse_Type.pythonType))); + PyModule_AddObject(module, (char*)"WsgiResponseBody", (PyObject*)(&(TyXBMCAddon_xbmcwsgi_WsgiResponseBody_Type.pythonType))); + + // constants + PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:17 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); + PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); + PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); + + // need to handle constants + + } + +} // end PythonBindings namespace for python type definitions + + +#endif + diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.xml b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.xml new file mode 100644 index 0000000000..bcd75d3d34 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmcwsgi.i.xml @@ -0,0 +1,2254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3e7c7db01d0b53b6079fb2f5d5e313c1c1807c7c Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Sun, 21 May 2017 15:02:49 +0200 Subject: [PATCH 0707/1145] lutris: update to 0.4.10. --- srcpkgs/lutris/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 92d213a059..7cc329f84f 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,6 +1,6 @@ # Template file for 'Lutris' pkgname=lutris -version=0.4.9 +version=0.4.10 revision=1 build_style=python3-module wrksrc="${pkgname}" @@ -12,4 +12,4 @@ maintainer="Jan Wey. " license="GPL-3" homepage="https://lutris.net" distfiles="${homepage}/releases/${pkgname}_${version}.tar.xz" -checksum=635e1b34084d9b2419575fd25097e36689e0f59c50bff89a4a3494e644fa4be9 +checksum=6ad3e5d08a7ce1644b3cf0bd50d928b14b6a30d82eec6a5b899c2d8a55d747c6 From ae30464f8719721dc3e70ff2f32ca5dc11a5e8cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 22 May 2017 14:05:18 +0200 Subject: [PATCH 0708/1145] parallel: update to 20170522. --- srcpkgs/parallel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index ce319004f4..cc56238c5c 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,6 +1,6 @@ # Template file for 'parallel' pkgname=parallel -version=20170422 +version=20170522 revision=1 noarch=yes build_style=gnu-configure @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " homepage="http://www.gnu.org/software/parallel/" license="GPL-3" distfiles="${GNU_SITE}/$pkgname/$pkgname-${version}.tar.bz2" -checksum=7a2438a92692c662dae3d4e80f1190af4cfe527cd3fb1a0d14e07f5c110ed329 +checksum=8a0d51632921b80102817151b62ea17eed6b28d088c40d94ed4ee40618a3bccc pre_configure() { # no html and pdf doc From d06b1e0e4f1a820a7c5fc76a11b7f776e90ca8fe Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 22 May 2017 14:17:56 +0200 Subject: [PATCH 0709/1145] diffutils: update to 3.6. --- .../diffutils/patches/gcc7-builtin_add_overflow.patch | 11 ----------- srcpkgs/diffutils/template | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch diff --git a/srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch b/srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch deleted file mode 100644 index dbb7204001..0000000000 --- a/srcpkgs/diffutils/patches/gcc7-builtin_add_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/intprops.h 2016-08-05 01:38:16.000000000 +0200 -+++ lib/intprops.h 2017-05-08 12:19:47.703724356 +0200 -@@ -223,7 +223,7 @@ - : (max) >> (b) < (a)) - - /* True if __builtin_add_overflow (A, B, P) works when P is null. */ --#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) -+#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 < __GNUC__) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template index 30ac973fdf..42763baa40 100644 --- a/srcpkgs/diffutils/template +++ b/srcpkgs/diffutils/template @@ -1,7 +1,7 @@ # Template file for 'diffutils' pkgname=diffutils -version=3.5 -revision=2 +version=3.6 +revision=1 bootstrap=yes build_style=gnu-configure short_desc="The GNU diff utilities" @@ -9,4 +9,4 @@ maintainer="Juan RP " homepage="http://www.gnu.org/software/diffutils" license="GPL-3" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 +checksum=d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6 From 6aeca8b11ca11c2d153ffced1b7e5995c0e073cb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 22 May 2017 14:21:35 +0200 Subject: [PATCH 0710/1145] par2cmdline: update to 0.7.1. --- srcpkgs/par2cmdline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/par2cmdline/template b/srcpkgs/par2cmdline/template index 5787a99d4a..16834bbc7d 100644 --- a/srcpkgs/par2cmdline/template +++ b/srcpkgs/par2cmdline/template @@ -1,6 +1,6 @@ # Template file for 'par2cmdline' pkgname=par2cmdline -version=0.7.0 +version=0.7.1 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2" homepage="https://github.com/BlackIkeEagle/par2cmdline" distfiles="https://github.com/BlackIkeEagle/par2cmdline/archive/v${version}.tar.gz" -checksum=d877b728d6d3af422904644310980e4da9eba6685960950fd1cd8277c7b63bd5 +checksum=894e798eeffa4d96542aa437a8ca2b74406b7f831a56c6f7fd67d45e2548552c pre_configure() { autoreconf -fi From bd375d82f9c55e28d61d76e4443e3717564f4fc2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 22 May 2017 14:24:55 +0200 Subject: [PATCH 0711/1145] os-prober: update to 1.75. --- srcpkgs/os-prober/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 8fc4f7c8bc..f6f5d53203 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,15 +1,14 @@ # Template file for 'os-prober' pkgname=os-prober -version=1.74 +version=1.75 revision=1 -wrksrc="${pkgname}" make_dirs="/var/lib/os-prober 0755 root root" short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" license="GPL-2" distfiles="${DEBIAN_SITE}/main/o/$pkgname/${pkgname}_$version.tar.xz" -checksum=c8e97ae193783eb8b5f5aba6b6d447b2e3e60696bb71f86ad029c33e14c5a7be +checksum=f4ef620455c5ffc3545daf4f32861640a48b0b3b6edda72491eecc1818653446 do_build() { make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs} From 5dfd11bcc05e70f11f455efabfbf02b32c1da8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 22 May 2017 16:04:13 +0200 Subject: [PATCH 0712/1145] mkvtoolnix: update to 12.0.0 --- srcpkgs/mkvtoolnix/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index b5d1d0fcbb..aa06e8f2af 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=11.0.0 -revision=2 +version=12.0.0 +revision=1 build_style=gnu-configure configure_args="--without-curl --with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt" hostmakedepends="autoconf pkg-config ruby libxslt docbook-xsl" @@ -12,9 +12,8 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="https://www.bunkus.org/videotools/mkvtoolnix/" distfiles="${homepage}/sources/${pkgname}-${version}.tar.xz" -checksum=bb642e1eb2c402c4f93a962f41a1832c99ee5b782f1596dc20f996e9a4aa426d -# Cross compiling fails due to dependency chain eigen -> jack -> pulseaudio -nocross=yes +checksum=5c2401d1cc36d8a2d57cb791a5a22f3cda69cb0824c6cee35326b35e7f94b536 +nocross="Fails due to dependency chain eigen -> jack -> pulseaudio" pre_configure() { ./autogen.sh From caf24fec48e93234c6e1f50455682d05ca32da5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 22 May 2017 16:49:56 +0200 Subject: [PATCH 0713/1145] libGL: fix armv6* build (disable neon) --- srcpkgs/libGL/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index d7553f2ec7..56243d55ea 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -15,10 +15,6 @@ license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 -case "$XBPS_TARGET_MACHINE" in - armv6*) broken=https://build.voidlinux.eu/builders/armv6l-musl_builder/builds/2613/steps/shell_3/logs/stdio ;; -esac - hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" makedepends=" @@ -81,6 +77,12 @@ esac pre_configure() { libtoolize -f NOCONFIGURE=1 ./autogen.sh + case "$XBPS_TARGET_MACHINE" in + armv6*) sed -i src/gallium/drivers/vc4/Makefile.am \ + -e 's;\(libvc4_neon_la_SOURCES =\) vc4_tiling_lt.c;\1;' \ + -e 's;\(libvc4_neon_la_CFLAGS = $(AM_CFLAGS)\) -DVC4_BUILD_NEON;\1;' + ;; + esac } post_install() { vmkdir usr/lib/xorg/modules/extensions From a240244ffa6aea6b6091be8f05a631036fce3c63 Mon Sep 17 00:00:00 2001 From: David Flatz Date: Mon, 22 May 2017 13:33:32 +0200 Subject: [PATCH 0714/1145] git-annex: update to 6.20170519 --- srcpkgs/git-annex/files/stack.yaml | 10 ++-------- srcpkgs/git-annex/template | 14 +++++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml index 7d2bf11cbc..5642d1210b 100644 --- a/srcpkgs/git-annex/files/stack.yaml +++ b/srcpkgs/git-annex/files/stack.yaml @@ -4,7 +4,6 @@ flags: production: true assistant: true pairing: true - cryptonite: true network-uri: true s3: true testsuite: true @@ -13,20 +12,15 @@ flags: webapp: true magicmime: false dbus: false - xmpp: false android: false androidsplice: false packages: - '.' extra-deps: +- aws-0.16 - bloomfilter-2.0.1.0 -- esqueleto-2.4.3 -- network-multicast-0.1.1 -- persistent-2.2.4.1 -- persistent-sqlite-2.2.1 -- persistent-template-2.1.8.1 - torrent-10000.0.0 - yesod-default-1.2.0 explicit-setup-deps: git-annex: true -resolver: lts-7.0 +resolver: lts-8.13 diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 99db15f15a..eda9d2d49f 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.20161210 +version=6.20170519 revision=1 nocross=yes build_style=haskell-stack -stackage="lts-7.0" +stackage="lts-8.13" 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 @@ -13,21 +13,17 @@ short_desc="Git addon for managing large files" maintainer="Evan Deaubl " license="GPL-3" homepage="http://git-annex.branchable.com" -distfiles="http://github.com/joeyh/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=6d985dc3dbb840629bca4e65e17564b68f4c403c7002c8b9155f120519680ed6 +distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" +checksum=3ae5d427a766dab31c25c31adfc14b7e0ec7ff9c7e94a282bf222ea254dc5c66 nopie=yes -post_extract() { - # messes up stack dependency resolution - rm -rf standalone/android/tmp -} - # These install steps are pulled from the install target in the # git-annex Makefile. The target can't be called directly because it is # comingled with the Cabal build, and we're using Stackage instead # Make sure they are in sync with each version upgrade post_install() { ln -sf git-annex ${DESTDIR}/usr/bin/git-annex-shell + ln -sf git-annex ${DESTDIR}/usr/bin/git-remote-tor-annex vmkdir usr/share/man/man1 vcopy man/*.1 usr/share/man/man1 From a63deed8eacb5ddaafc3973238e89a31f0749c73 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 18:05:33 +0200 Subject: [PATCH 0715/1145] kodi-rpi: readd sv script --- srcpkgs/kodi-rpi/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 6783ec49fe..b7b37e1930 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -116,4 +116,5 @@ post_install() { # remove unused stuff rm -rf ${DESTDIR}/usr/include find ${DESTDIR}/usr/lib -name "*.cmake" -delete + vsv xbmc-standalone } From ee43e47ef3107d8cb7cfb35ddacc780e7e4f0e3f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 18:09:00 +0200 Subject: [PATCH 0716/1145] kodi-rpi: revbump --- srcpkgs/kodi-rpi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index b7b37e1930..27097e7853 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,7 +1,7 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi version=17.1 -revision=1 +revision=2 build_style=cmake patch_args="-Np1" _codename="Krypton" From a39033f5c5b443e0e315539115ad9cc7c7a3a555 Mon Sep 17 00:00:00 2001 From: lemmi Date: Mon, 22 May 2017 14:14:31 +0200 Subject: [PATCH 0717/1145] obs: update to 19.0.2. --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 7e2ca5a8cc..a56b65717a 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=19.0.1 +version=19.0.2 revision=1 wrksrc=obs-studio-${version} only_for_archs="i686 x86_64 i686-musl x86_64-musl" @@ -15,7 +15,7 @@ maintainer="lemmi " license="GPL-2" homepage="https://obsproject.com" distfiles="https://github.com/jp9000/obs-studio/archive/${version}.tar.gz" -checksum=922aca3d098d43a9f82d79fffd004c6cdcf699912a69895bbd707dd29cd01c85 +checksum=c7846e09f13061587d844588c538276aec6d498c8f9a4518fc3d8bb206776f01 obs-devel_package() { short_desc+=" - development files" From 6d07b6687bad007f16fb0170932443f9e5e4b064 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 22 May 2017 18:48:54 +0200 Subject: [PATCH 0718/1145] kodi-rpi: set ld path for sv script --- srcpkgs/kodi-rpi/files/xbmc-standalone/run | 2 +- srcpkgs/kodi-rpi/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run index 9e966fb143..67b60dec95 100755 --- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run +++ b/srcpkgs/kodi-rpi/files/xbmc-standalone/run @@ -1,2 +1,2 @@ #!/bin/sh -exec chpst -P sudo -u xbmc -- /usr/lib/kodi/kodi.bin --standalone +exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi.bin --standalone diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index 27097e7853..8cf34321a3 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,7 +1,7 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi version=17.1 -revision=2 +revision=3 build_style=cmake patch_args="-Np1" _codename="Krypton" From 1995c727ae8141ba6eae65cd5b0de7437120aa74 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 22 May 2017 19:46:38 +0200 Subject: [PATCH 0719/1145] mate-power-manage: needs upower0 on runtime. --- srcpkgs/mate-power-manager/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index 9a4eefa501..048102ac44 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,7 +1,7 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager version=1.18.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-schemas-compile" hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel @@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel makedepends="gtk+3-devel dbus-glib-devel libnotify-devel libunique-devel upower0-devel libcanberra-devel libgnome-keyring-devel libmate-panel-devel mate-desktop-devel" -depends="dconf" +depends="dconf upower0" short_desc="Power management tool for the MATE desktop" maintainer="Juan RP " license="GPL-2" From 2ced79c2d00a1d36e6e6236c16f2f5268ba23ec5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:22:53 +0000 Subject: [PATCH 0720/1145] ykneomgr: orphan --- srcpkgs/ykneomgr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ykneomgr/template b/srcpkgs/ykneomgr/template index 36da723625..db111bbf0e 100644 --- a/srcpkgs/ykneomgr/template +++ b/srcpkgs/ykneomgr/template @@ -7,7 +7,7 @@ build_style=gnu-configure hostmakedepends="automake libtool pkg-config gengetopt help2man" makedepends="pcsclite-devel libzip-devel zlib-devel" short_desc="Yubikey NEO Manager" -maintainer="Michael Gehring " +maintainer="Orphaned " license="LGPL-3" homepage="https://developers.yubico.com/libykneomgr/" distfiles="https://developers.yubico.com/libykneomgr/Releases/libykneomgr-${version}.tar.gz" From d5070c32f5554fb9bca26f0c8d65f7196351ed19 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:23:32 +0000 Subject: [PATCH 0721/1145] xcftools: orphan --- srcpkgs/xcftools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xcftools/template b/srcpkgs/xcftools/template index d7255d1bd7..31efcf2562 100644 --- a/srcpkgs/xcftools/template +++ b/srcpkgs/xcftools/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="perl" makedepends="gettext-devel libpng-devel" short_desc="A set of tools for extracting information from XCF files" -maintainer="Michael Gehring " +maintainer="Orphaned " license="Public domain" homepage="http://henning.makholm.net/software" distfiles="http://henning.makholm.net/xcftools/xcftools-${version}.tar.gz" From 0b08e1d4782581e5fa4908923f1c09bd491902bb Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:24:50 +0000 Subject: [PATCH 0722/1145] xcb-util-xrm: orphan --- srcpkgs/xcb-util-xrm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xcb-util-xrm/template b/srcpkgs/xcb-util-xrm/template index 5d6c330f63..0f1668a1e8 100644 --- a/srcpkgs/xcb-util-xrm/template +++ b/srcpkgs/xcb-util-xrm/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config m4" makedepends="xcb-util-devel libX11-devel" short_desc="XCB utility functions for the X resource manager" -maintainer="Michael Gehring " +maintainer="Orphaned " license="MIT" homepage="https://github.com/Airblader/xcb-util-xrm" distfiles="https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/xcb-util-xrm-${version}.tar.gz" From e66b9228c99a82167bd4c510b66f83de1546bd7c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:25:31 +0000 Subject: [PATCH 0723/1145] uzbl: orphan --- srcpkgs/uzbl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/uzbl/template b/srcpkgs/uzbl/template index 3000c604bc..92d1e9340c 100644 --- a/srcpkgs/uzbl/template +++ b/srcpkgs/uzbl/template @@ -7,7 +7,7 @@ hostmakedepends="pkg-config python3-setuptools" makedepends="libsoup-devel webkitgtk-devel glib-devel" depends="python3-setuptools python3-six" short_desc="Web interface tools which adhere to the unix philosophy" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-3" homepage="http://www.uzbl.org/" distfiles="https://github.com/uzbl/uzbl/archive/v${version}.tar.gz" From 65fdaaf15273d54f0e450e54ce2a39a7460fb8b0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:26:30 +0000 Subject: [PATCH 0724/1145] wayland-protocols: orphan --- srcpkgs/wayland-protocols/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template index 9b9f3f99d9..fb6cbc7dcf 100644 --- a/srcpkgs/wayland-protocols/template +++ b/srcpkgs/wayland-protocols/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config wayland-devel" short_desc="Protocols and protocol extensions complementing the Wayland core protocol" -maintainer="Michael Gehring " +maintainer="Orphaned " license="MIT" homepage="http://wayland.freedesktop.org" distfiles="https://wayland.freedesktop.org/releases/wayland-protocols-${version}.tar.xz" From 3354708759d7c4203efc8f515407cebbf809838d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:27:10 +0000 Subject: [PATCH 0725/1145] scid_vs_pc: orphan --- srcpkgs/scid_vs_pc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/scid_vs_pc/template b/srcpkgs/scid_vs_pc/template index d45b6b5478..6e9f295048 100644 --- a/srcpkgs/scid_vs_pc/template +++ b/srcpkgs/scid_vs_pc/template @@ -6,7 +6,7 @@ build_style=configure hostmakedepends="tcl" makedepends="tcl-devel tk-devel zlib-devel" short_desc="A chess toolkit with extensive database, analysis and playing features" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-2,custom" homepage="http://scidvspc.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/scidvspc/source/scid_vs_pc-${version}.tgz" From c0976c16998080ff0785ea52a7688d0b15ceb4ca Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:27:46 +0000 Subject: [PATCH 0726/1145] python-stem: orphan --- srcpkgs/python-stem/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-stem/template b/srcpkgs/python-stem/template index ade05cb475..bc41b8af32 100644 --- a/srcpkgs/python-stem/template +++ b/srcpkgs/python-stem/template @@ -9,7 +9,7 @@ pycompile_module="stem" hostmakedepends="python-devel python3-devel" depends="python-crypto" short_desc="Python2 controller library for Tor" -maintainer="Michael Gehring " +maintainer="Orphaned " license="LGPL-3" homepage="https://stem.torproject.org/" distfiles="${PYPI_SITE}/s/stem/stem-${version}.tar.gz" From defd524c091768e4f57e16ff3a8da83b03313192 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:28:33 +0000 Subject: [PATCH 0727/1145] python-service_identity: orphan --- srcpkgs/python-service_identity/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template index 506a11a53c..d1161bef29 100644 --- a/srcpkgs/python-service_identity/template +++ b/srcpkgs/python-service_identity/template @@ -9,7 +9,7 @@ pycompile_module="service_identity" hostmakedepends="python-setuptools python3-setuptools" depends="python-attrs python-idna python-pyasn1-modules" short_desc="Service identity verification for pyOpenSSL (Python2)" -maintainer="Michael Gehring " +maintainer="Orphaned " license="MIT" homepage="https://service-identity.readthedocs.org/" distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz" From 74b4e566890754172ba435d04b3c131c05deca40 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:28:55 +0000 Subject: [PATCH 0728/1145] ted: orphan --- srcpkgs/ted/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ted/template b/srcpkgs/ted/template index 92ee637a8b..62e108e58a 100644 --- a/srcpkgs/ted/template +++ b/srcpkgs/ted/template @@ -6,7 +6,7 @@ wrksrc=Ted-${version} hostmakedepends="pkg-config" makedepends="zlib-devel pcre-devel libX11-devel libxmp-devel tiff-devel libpng-devel libjpeg-turbo-devel gtk+-devel libpaper-devel" short_desc="An easy rich text processor" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-2" homepage="https://nllgg.nl/Ted/" distfiles="http://ftp.nluug.nl/pub/editors/ted/ted-${version}.src.tar.gz" From a9bcdf759f684d43b89d2c8592ec6d12841f46b7 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:30:14 +0000 Subject: [PATCH 0729/1145] python-attrs: orphan --- srcpkgs/python-attrs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template index df3a4ce5dd..327cf7f945 100644 --- a/srcpkgs/python-attrs/template +++ b/srcpkgs/python-attrs/template @@ -8,7 +8,7 @@ build_style=python-module pycompile_module="attrs" hostmakedepends="python-setuptools python3-setuptools" short_desc="Python2 attributes without boilerplate" -maintainer="Michael Gehring " +maintainer="Orphaned " license="MIT" homepage="https://attrs.readthedocs.org/" distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz" From 0d6b1dfaf7f5eb9c16d80cbb79e9080d4eb58d9c Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:30:41 +0000 Subject: [PATCH 0730/1145] python-pyrfc3339: orphan --- srcpkgs/python-pyrfc3339/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-pyrfc3339/template b/srcpkgs/python-pyrfc3339/template index 38328a860e..26a1ff50dd 100644 --- a/srcpkgs/python-pyrfc3339/template +++ b/srcpkgs/python-pyrfc3339/template @@ -9,7 +9,7 @@ wrksrc="pyRFC3339-${version}" hostmakedepends="python-setuptools python3-setuptools" depends="python-pytz" short_desc="Python2 library for generating and parsing RFC3339-compliant timestamps" -maintainer="Michael Gehring " +maintainer="Orphaned " license="MIT" homepage="https://pythonhosted.org/pyRFC3339/" distfiles="${PYPI_SITE}/p/pyRFC3339/pyRFC3339-${version}.tar.gz" From 4b7f4ae245509e5778acaf7b52941168d166844d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:31:23 +0000 Subject: [PATCH 0731/1145] pysolfc: orphan --- srcpkgs/pysolfc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template index 46b6659afa..74d37cc752 100644 --- a/srcpkgs/pysolfc/template +++ b/srcpkgs/pysolfc/template @@ -9,7 +9,7 @@ pycompile_module=pysollib hostmakedepends="python" depends="python-tkinter python-pygame" short_desc="A Python solitaire game collection" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-3" homepage="http://pysolfc.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/PySolFC-${version}.tar.bz2" From b7e9928838aff4ba9fc5458b4b602a8155a8e9f8 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:31:54 +0000 Subject: [PATCH 0732/1145] pup: orphan --- srcpkgs/pup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template index 1dd70280fd..044c9c0cb1 100644 --- a/srcpkgs/pup/template +++ b/srcpkgs/pup/template @@ -5,7 +5,7 @@ revision=4 build_style=go go_import_path="github.com/ericchiang/pup" short_desc="Command line tool for processing HTML" -maintainer="Michael Gehring " +maintainer="Orphaned " license="MIT" homepage="https://github.com/ericchiang/pup" distfiles="https://github.com/ericchiang/pup/archive/v${version}.tar.gz" From 86a0faa758e1e44556cd1d62807d3fbdc744d472 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:32:36 +0000 Subject: [PATCH 0733/1145] perl-Time-Duration: orphan --- srcpkgs/perl-Time-Duration/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/perl-Time-Duration/template b/srcpkgs/perl-Time-Duration/template index edcd41606b..d341023326 100644 --- a/srcpkgs/perl-Time-Duration/template +++ b/srcpkgs/perl-Time-Duration/template @@ -9,7 +9,7 @@ hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends}" short_desc="rounded or exact English expression of durations" -maintainer="Michael Gehring " +maintainer="Orphaned " license="Artistic, GPL-1" homepage="http://search.cpan.org/dist/Time-Duration/" distfiles="${CPAN_SITE}/Time/${pkgname/perl-/}-$version.tar.gz" From fe6be77e92271cb34b67106f15f569ce1995269e Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:33:20 +0000 Subject: [PATCH 0734/1145] perl-Glib-Object-Introspection: orphan --- srcpkgs/perl-Glib-Object-Introspection/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template index 50bcee0187..4b23364371 100644 --- a/srcpkgs/perl-Glib-Object-Introspection/template +++ b/srcpkgs/perl-Glib-Object-Introspection/template @@ -9,7 +9,7 @@ hostmakedepends="perl" makedepends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib libgirepository-devel" depends="perl-ExtUtils-PkgConfig perl-ExtUtils-Depends perl-Glib" short_desc="Dynamically create Perl language bindings" -maintainer="Michael Gehring " +maintainer="Orphaned " license="LGPL-3" homepage="http://search.cpan.org/~tsch/Glib-Object-Introspection/" distfiles="http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/Glib-Object-Introspection-${version}.tar.gz" From 91ac6e1616d5f714a850e924a131f8004a35ba9f Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:33:48 +0000 Subject: [PATCH 0735/1145] mhddfs: orphan --- srcpkgs/mhddfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mhddfs/template b/srcpkgs/mhddfs/template index 5953004438..b2b84bc405 100644 --- a/srcpkgs/mhddfs/template +++ b/srcpkgs/mhddfs/template @@ -6,7 +6,7 @@ build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="fuse-devel attr-devel uthash" short_desc="FUSE filesystem that combines a several mountpoints into a single one" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-3" homepage="http://mhddfs.uvw.ru/" distfiles="http://mhddfs.uvw.ru/downloads/${pkgname}_${version}.tar.gz" From 074fffc1b9a7d211662f0edbaa0af6ba7ea24002 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:34:09 +0000 Subject: [PATCH 0736/1145] lxqt-build-tools: orphan --- srcpkgs/lxqt-build-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template index 7e69a60d97..c9c0466794 100644 --- a/srcpkgs/lxqt-build-tools/template +++ b/srcpkgs/lxqt-build-tools/template @@ -7,7 +7,7 @@ build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake" makedepends="qt5-devel" short_desc="LXQt build tools" -maintainer="Michael Gehring " +maintainer="Orphaned " license="3-clause-BSD" homepage="http://lxqt.org/" distfiles="https://github.com/lxde/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz" From bf9d3afc06b7d89a63bc2feb529013f4f7255d52 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:34:44 +0000 Subject: [PATCH 0737/1145] coursera-dl: orphan --- srcpkgs/coursera-dl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template index 75a4ca8836..4d3fc9e114 100644 --- a/srcpkgs/coursera-dl/template +++ b/srcpkgs/coursera-dl/template @@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools" depends="python3-setuptools python3-pyasn1 python3-html5lib python3-BeautifulSoup4 python3-requests python3-six python3-keyring" short_desc="Script for downloading Coursera.org videos and naming them" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-3" homepage="https://github.com/coursera-dl/coursera-dl" distfiles="${PYPI_SITE}/c/coursera-dl/coursera-dl-${version}.tar.gz" From b14d56560f8c558452f46f898b1216245f00ba49 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:35:54 +0000 Subject: [PATCH 0738/1145] backupninja: orphan --- srcpkgs/backupninja/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/backupninja/template b/srcpkgs/backupninja/template index 86217b5252..3fc3c9dbde 100644 --- a/srcpkgs/backupninja/template +++ b/srcpkgs/backupninja/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure depends="dialog" short_desc="A lightweight, extensible meta-backup system" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-2" homepage="https://labs.riseup.net/code/projects/backupninja" distfiles="https://labs.riseup.net/code/attachments/download/275/backupninja-${version}.tar.gz" From b535583b122d15891f7b6c1b7aa197623aa3b1e0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:36:15 +0000 Subject: [PATCH 0739/1145] cdrdao: orphan --- srcpkgs/cdrdao/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template index 8038d75b96..ae88e7a0b1 100644 --- a/srcpkgs/cdrdao/template +++ b/srcpkgs/cdrdao/template @@ -7,7 +7,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="lame-devel libmad-devel libvorbis-devel libao-devel" short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-2" homepage="http://cdrdao.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/cdrdao/cdrdao/1.2.3/cdrdao-1.2.3.tar.bz2" From 964a297cd36292c22489ccd6630c3a8a2171e9ea Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:36:52 +0000 Subject: [PATCH 0740/1145] gupnp-tools: orphan --- srcpkgs/gupnp-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template index b8ddd15471..6ed3d73bda 100644 --- a/srcpkgs/gupnp-tools/template +++ b/srcpkgs/gupnp-tools/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gupnp-av-devel gtk+3-devel gtksourceview-devel" short_desc="Free replacements of Intel UPnP tools that use GUPnP" -maintainer="Michael Gehring " +maintainer="Orphaned " license="GPL-2" homepage="http://gupnp.org/" distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz" From 03207d9edf1a04b7b5a68e0d322720ccce783b65 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:37:50 +0000 Subject: [PATCH 0741/1145] libtommath: orphan --- srcpkgs/libtommath/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libtommath/template b/srcpkgs/libtommath/template index e4739a8a37..ee8d564914 100644 --- a/srcpkgs/libtommath/template +++ b/srcpkgs/libtommath/template @@ -4,7 +4,7 @@ version=1.0 revision=1 hostmakedepends="libtool" short_desc="A portable number theoretic multiple-precision integer library" -maintainer="Michael Gehring " +maintainer="Orphaned " license="Public domain" homepage="http://www.libtom.org/LibTomMath/" distfiles="https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz" From 3b5e4ec5ea5864fda652700f694ea905f6f2da2d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 20:38:17 +0000 Subject: [PATCH 0742/1145] html-xml-utils: orphan --- srcpkgs/html-xml-utils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template index 3eb822873f..0cbba1df88 100644 --- a/srcpkgs/html-xml-utils/template +++ b/srcpkgs/html-xml-utils/template @@ -4,7 +4,7 @@ version=7.1 revision=1 build_style=gnu-configure short_desc="A number of simple utilities for manipulating HTML and XML files" -maintainer="Michael Gehring " +maintainer="Orphaned " license="custom" homepage="https://www.w3.org/Tools/HTML-XML-utils/README" distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz" From 5285a3ebb78db5127d86d856d3edf4c54fb2f8cd Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 23 May 2017 00:21:05 +0000 Subject: [PATCH 0743/1145] yara: update to 3.6.0. --- srcpkgs/yara/patches/libressl.patch | 45 +++++++++++++++++++++++------ srcpkgs/yara/template | 6 ++-- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/srcpkgs/yara/patches/libressl.patch b/srcpkgs/yara/patches/libressl.patch index e5032b399a..e0bef7e3f2 100644 --- a/srcpkgs/yara/patches/libressl.patch +++ b/srcpkgs/yara/patches/libressl.patch @@ -1,25 +1,52 @@ ---- libyara/libyara.c.orig 2016-09-06 20:09:47.000000000 +0000 -+++ libyara/libyara.c 2017-05-10 12:40:13.393089280 +0000 +--- libyara/libyara.c.orig 2017-05-22 10:24:23.000000000 +0000 ++++ libyara/libyara.c 2017-05-23 00:18:32.658793790 +0000 +@@ -37,7 +37,7 @@ + #include + #include + +-#if defined(HAVE_LIBCRYPTO) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(HAVE_LIBCRYPTO) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + #include + #endif + @@ -71,7 +71,7 @@ - char altercase[256]; + char yr_altercase[256]; --#if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) +-#if defined(HAVE_LIBCRYPTO) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(HAVE_LIBCRYPTO) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) // The OpenSSL library before version 1.1 requires some locks in order // to be thread-safe. These locks are initialized in yr_initialize @@ -133,7 +133,7 @@ - FAIL_ON_ERROR(yr_thread_storage_create(&tidx_key)); - FAIL_ON_ERROR(yr_thread_storage_create(&recovery_state_key)); + FAIL_ON_ERROR(yr_thread_storage_create(&yr_tidx_key)); + FAIL_ON_ERROR(yr_thread_storage_create(&yr_recovery_state_key)); - #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L + #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) openssl_locks = (YR_MUTEX*) OPENSSL_malloc( CRYPTO_num_locks() * sizeof(YR_MUTEX)); ---- libyara/modules/pe.c.orig 2016-09-06 20:09:47.000000000 +0000 -+++ libyara/modules/pe.c 2017-05-10 12:38:23.755095815 +0000 +@@ -178,7 +178,7 @@ + + YR_API int yr_finalize(void) + { +- #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L ++ #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + int i; + #endif + +@@ -194,7 +194,7 @@ + if (init_count > 0) + return ERROR_SUCCESS; + +- #if defined HAVE_LIBCRYPTO && OPENSSL_VERSION_NUMBER < 0x10100000L ++ #if defined HAVE_LIBCRYPTO && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + + for (i = 0; i < CRYPTO_num_locks(); i ++) + yr_mutex_destroy(&openssl_locks[i]); +--- libyara/modules/pe.c.orig 2016-09-06 20:09:47.000000000 +0000 ++++ libyara/modules/pe.c 2017-05-10 12:38:23.755095815 +0000 @@ -42,7 +42,7 @@ #include #include diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index 4867db233b..2d6d984a45 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -1,7 +1,7 @@ # Template file for 'yara' pkgname=yara -version=3.5.0 -revision=2 +version=3.6.0 +revision=1 build_style=gnu-configure configure_args="--enable-magic --enable-cuckoo" hostmakedepends="automake libtool" @@ -11,7 +11,7 @@ maintainer="Michael Gehring " license="3-clause-BSD" homepage="http://virustotal.github.io/yara/" distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz" -checksum=4bc72ee755db85747f7e856afb0e817b788a280ab5e73dee42f159171a9b5299 +checksum=fb27784b3989db509871652aae26063d87e9cc6330929abed1ab824c5bd600e0 pre_configure() { autoreconf -fi From 35b97a81844f341a3e4c473da38adf94262a24f0 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Mon, 22 May 2017 20:55:59 -0400 Subject: [PATCH 0744/1145] gsoap: fix musl --- srcpkgs/gsoap/patches/fix-musl-again.patch | 22 +++++++++++++++++++ .../{musl-fixes.patch => fix-musl.patch} | 8 +++++++ 2 files changed, 30 insertions(+) create mode 100644 srcpkgs/gsoap/patches/fix-musl-again.patch rename srcpkgs/gsoap/patches/{musl-fixes.patch => fix-musl.patch} (77%) diff --git a/srcpkgs/gsoap/patches/fix-musl-again.patch b/srcpkgs/gsoap/patches/fix-musl-again.patch new file mode 100644 index 0000000000..38d97a5a4c --- /dev/null +++ b/srcpkgs/gsoap/patches/fix-musl-again.patch @@ -0,0 +1,22 @@ +--- gsoap/stdsoap2.c.orig 2017-05-22 20:36:36.124570820 -0400 ++++ gsoap/stdsoap2.c 2017-05-22 20:36:52.229856096 -0400 +@@ -4395,7 +4395,7 @@ + return soap->error = SOAP_EOM; + return SOAP_OK; + } +-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) ++#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) || defined(LINUX) + if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) + host = NULL; + #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) +--- gsoap/stdsoap2.cpp 2017-05-22 20:43:17.974688879 -0400 ++++ gsoap/stdsoap2.cpp.orig 2017-04-07 14:39:02.000000000 -0400 +@@ -4395,7 +4395,7 @@ + return soap->error = SOAP_EOM; + return SOAP_OK; + } +-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) ++#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) || defined(LINUX) + if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) + host = NULL; + #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) diff --git a/srcpkgs/gsoap/patches/musl-fixes.patch b/srcpkgs/gsoap/patches/fix-musl.patch similarity index 77% rename from srcpkgs/gsoap/patches/musl-fixes.patch rename to srcpkgs/gsoap/patches/fix-musl.patch index 9ac981727e..8a955ac13c 100644 --- a/srcpkgs/gsoap/patches/musl-fixes.patch +++ b/srcpkgs/gsoap/patches/fix-musl.patch @@ -1,3 +1,11 @@ +With thanks to alpine. +https://git.alpinelinux.org/cgit/aports/tree/community/gsoap/musl-fixes.patch + +The first patch I think should not be necessary, but is because the same source +file defines _GNU_SOURCE if gnu-linux and !defined(_GNU_SOURCE) (go read the +code, it's the first two places _GNU_SOURCE is used in gsoap/stdsoap2.cpp). +I don't know why, but it seems wrong to me. + --- ./gsoap/stdsoap2.cpp.orig +++ ./gsoap/stdsoap2.cpp @@ -18691,7 +18691,7 @@ From 82662f6cfd707f606f90bffeb3e0bbffe951f737 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:22:30 +0200 Subject: [PATCH 0745/1145] pango: update to 1.40.6. --- srcpkgs/pango/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index 5d2430730a..6fe46c7108 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -1,6 +1,6 @@ # Template build file for 'pango'. pkgname=pango -version=1.40.5 +version=1.40.6 revision=1 build_style=gnu-configure configure_args="--with-included-modules=basic-fc $(vopt_enable gir introspection)" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.pango.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9 +checksum=ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573 # Package build options build_options="gir" From 0f2138fd21c3d0db201f590801439d6353b43ba7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:23:29 +0200 Subject: [PATCH 0746/1145] libva: update to 1.8.2. --- srcpkgs/libva/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template index d5ae5107f7..ea57a94050 100644 --- a/srcpkgs/libva/template +++ b/srcpkgs/libva/template @@ -1,6 +1,6 @@ # Template file for 'libva' pkgname=libva -version=1.8.1 +version=1.8.2 revision=1 build_style=gnu-configure configure_args="--disable-egl --disable-glx" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://01.org/linuxmedia" license="MIT" distfiles="https://github.com/01org/libva/releases/download/${version}/libva-${version}.tar.bz2" -checksum=c1d5d85b6b40b76f37993b4da33388d3d73b64998dcbc160b7578e24ed775c73 +checksum=9ed3e3ddc8f47a715d4c6ec366beb21c83fc4e8a3d4d39a811baff76f0a0cede post_install() { vlicense COPYING From 4215f611e2dba9173fa1dab9688e486d168be694 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:23:52 +0200 Subject: [PATCH 0747/1145] libva-glx: update to 1.8.2. --- srcpkgs/libva-glx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template index a15ab8689d..2f8e8cf6ff 100644 --- a/srcpkgs/libva-glx/template +++ b/srcpkgs/libva-glx/template @@ -7,7 +7,7 @@ # KEEP THIS PACKAGE SYNCHRONIZED WITH "libva". # pkgname=libva-glx -version=1.8.1 +version=1.8.2 revision=1 wrksrc="libva-${version}" build_style=gnu-configure @@ -19,7 +19,7 @@ maintainer="Juan RP " homepage="https://01.org/linuxmedia" license="MIT" distfiles="https://github.com/01org/libva/releases/download/${version}/libva-${version}.tar.bz2" -checksum=c1d5d85b6b40b76f37993b4da33388d3d73b64998dcbc160b7578e24ed775c73 +checksum=9ed3e3ddc8f47a715d4c6ec366beb21c83fc4e8a3d4d39a811baff76f0a0cede post_install() { # We are only interested in the glx component, remove everything else. From 2942269e6d6376cb5fd33e532fcf6922b0f66e43 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:24:23 +0200 Subject: [PATCH 0748/1145] libva-utils: update to 1.8.2. --- srcpkgs/libva-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template index 89812cc1fb..e8de1af756 100644 --- a/srcpkgs/libva-utils/template +++ b/srcpkgs/libva-utils/template @@ -1,6 +1,6 @@ # Template file for 'libva-utils' pkgname=libva-utils -version=1.8.1 +version=1.8.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config wayland-devel" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="https://01.org/linuxmedia" license="MIT" distfiles="https://github.com/01org/libva-utils/releases/download/${version}/libva-utils-${version}.tar.bz2" -checksum=fff17327739b801d9d91dbc79ae385026ae7ddc564d489fa1d12d8d6f9f1e2c9 +checksum=038cc320d6403a626d78a50aad6c8b70a13f2359cea1e0cf0ab773773135bf4c post_install() { vlicense COPYING From 00a43fc2141ec85b02b65677f34bab2ee3f6bef6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:24:51 +0200 Subject: [PATCH 0749/1145] libva-intel-driver: update to 1.8.2. --- srcpkgs/libva-intel-driver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template index c57a6a0194..86184d7ed1 100644 --- a/srcpkgs/libva-intel-driver/template +++ b/srcpkgs/libva-intel-driver/template @@ -1,6 +1,6 @@ # Template file for 'libva-intel-driver' pkgname=libva-intel-driver -version=1.8.1 +version=1.8.2 revision=1 wrksrc="intel-vaapi-driver-${version}" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://01.org/linuxmedia" license="MIT" distfiles="https://github.com/01org/intel-vaapi-driver/releases/download/${version}/intel-vaapi-driver-${version}.tar.bz2" -checksum=efd041602635ce9450fbdf864563d3b95341ef3877337772af708d9cc17b2fce +checksum=866cdf9974911e58b0d3a2cade29dbe7b5b68836e142cf092b99db68e366b702 only_for_archs="i686 i686-musl x86_64 x86_64-musl" post_install() { From af92e8c0e1864cf3a846e5e6085112a09b82f04c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:25:35 +0200 Subject: [PATCH 0750/1145] libmateweather: update to 1.18.1. --- srcpkgs/libmateweather/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmateweather/template b/srcpkgs/libmateweather/template index 651c5b2aaa..79e1808fa4 100644 --- a/srcpkgs/libmateweather/template +++ b/srcpkgs/libmateweather/template @@ -1,6 +1,6 @@ # Template file for 'libmateweather' pkgname=libmateweather -version=1.18.0 +version=1.18.1 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-python @@ -13,7 +13,7 @@ maintainer="Juan RP " license="LGPL-2" homepage="http://mate-desktop.org" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=72e205f92bd9aed1a1d82abb17c5e26d447198d8bbdccf969d50c1c7c429b287 +checksum=6af4ca73df3d0589481e74f8be843130359ba071d76195b3c4396d270874db7c libmateweather-devel_package() { short_desc+=" - development files" From 8e9b85e11de2a9333b05c4707e21952f42a9444e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:26:58 +0200 Subject: [PATCH 0751/1145] sqlite: update to 3.19.0. --- srcpkgs/sqlite/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 1daa72bad4..0e9e34fa3a 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,7 +1,7 @@ # Template build file for 'sqlite'. pkgname=sqlite -version=3.18.0 -revision=2 +version=3.19.0 +revision=1 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ }) wrksrc="sqlite-autoconf-${_amalgamationver}" build_style=gnu-configure @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://www.sqlite.org" license="Public Domain" distfiles="http://sqlite.org/2017/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=3757612463976e7d08c5e9f0af3021613fc24bbcfe1c51197d6776b9ece9ac5c +checksum=b516e665952c6659638eab3283f09f317afb212fd8e39d6415b4b6259c37b0f5 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \ From f8600549dc338ebf461100ec5ec4e3bb3b6fb110 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:28:58 +0200 Subject: [PATCH 0752/1145] firefox: update to 53.0.3. --- srcpkgs/firefox/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 170febdcbb..ed94c0f7da 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,13 +1,13 @@ # Template build file for 'firefox'. pkgname=firefox -version=53.0.2 -revision=2 +version=53.0.3 +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=c536df9794fafe61e4e74562e2a37cd4a6fb1c13d99d5330d61be03b2d57ae54 +checksum=78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348 only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes From 4890effa202bfa5d6a4b8cd0451d254e516847c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 23 May 2017 07:57:42 +0200 Subject: [PATCH 0753/1145] firefox-i18n: update to 53.0.3. --- srcpkgs/firefox-i18n/template | 183 +++++++++++++++++----------------- 1 file changed, 92 insertions(+), 91 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 1bbeaec74c..443ba3eaf1 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=52.0.2 +version=53.0.3 revision=1 build_style=meta homepage="https://www.mozilla.org/firefox/" @@ -132,93 +132,94 @@ _pkgtmpl() { } checksum=" -46a28dec74c400b26b894ff50e386bc4cd657d09450b0b2daa643fed234a49fe -c63b3bc898c1d05acfbc69cd98192568e8e69e66e54590a418ba5de9b05d2fd4 -d341e02116d166a57451a043eb8c1a33f528050483a54129c1a42b5a3257a205 -b20d225e90ae1d7641faafd80e7d0e53b811473410d45a21dd2fc2dd2b3b9a77 -ad300a4a43e6961a75bb50089427b292b53e90a02d5d4420aae364192e952d02 -bb39846af23b0e422be4727359233cc2df3f80751a24f0ff933b094300263a62 -238b8948b8dd429b96a25dced6968d4154749ade71ff2ccfdcda3ed15d694b69 -98adcbaf6f62e3dc8533ba9ad304f4e2183ab6cf93434522fe748b7bd28a5b50 -796e8ec22cf717829f59c697fa26d4ac22ad0f911f080a16d5fdf87774ee35cf -b90a849d2d23a223aa19f237861c793c50b0978a5129c89fd201270cf01fad6f -57c2d2b6b7a2ee58ac7955c3e3d1085cd8cfc8b308812907c8e2507ad5065501 -a41b344e55c7bff518188dace17be215cdb3ed003f7373b3ed5792ed3ad9aa93 -07a394409d6092353e621f526843c4dcf786375c022a46a074860d9d1bfaf974 -ea03a36c7717f33be663222fb8c6e9e4f0fb088b9383ec8a43c3262b6c7959d6 -63765555f13a30b00076139d9ae83666075c6ab82c2c3dd9c7cb03bf4bd30b83 -5ed4f0cd18880dad59be7bfa0231c9b6c09328de8299d955ca495558ad5d3ec3 -496b38aaffb4014fbc85052027c3c5fb91222264ec289c49f11b59b36b03097d -49b7a797e31288de30ec2b659940a96735bb658a7c5aa1a81e15d2708d117388 -84f3d361fbb320ecc6a19d2bc6b2ed0b6fafc28527a26cea8481f1e31e6f7873 -d7068492c5fe5fece28c6b02416c22ed77e33bc2bf62cf9a391fc0872b81a1ce -66001390175d8983abc372e5092fd03ce452b0eab00419cbcde263eccf372f1b -457b7309200df9d7850412740f9ca093eb84a1222792aaa87681ae2fab6e6d03 -4507c1d5fc872e8f7ece588811046e4a994de4f64590771d98287c2d4eeba1af -983b6af6b5576ae92305c9f3c3e59f361256535aff167f13c494b8e9baf36bae -4e001c2ca079d338fb113c8ac173094a6b94428c18f2a987cdc2b40b015bd2e1 -dc7e749e4f2ca9c6960b426b9e2f636202ac3a2cc3f1b1b06df0f03bb531e1aa -dd1d6fbea50903fd37f7f122b94b857d8d3c1ea45ad0f18735586294ef651273 -06b6fbf5bf090ca988ac646f7b7ad173f81fee4cbc06efa8aff60efd0f028b2d -e58153f1cd3110d1d3a165ce7301fb618782b17454e481bc222fe231bf58ed60 -19d9fbf829a8ecc937c505240be92ec8a0324f19d05bcabe5a56a3e1fefefb6a -4fa4505571ae92264ca42ca0a55cc59d137b37e77cdbb0b24fb21c56b9cce8c0 -698a02e232bcbc5c67a566f666f5e462bfa66c104015cbf6a6938185fdef85f0 -79f369ed2c47676fb8d13dae59499ca22bd33eb52a51ec661522070ab33c7f6e -0f3aa5e2f940c9d58a73e6388db14776f857cbd6fdaa84c2b6078f9fa2dba8fb -397c97d97183730701ed3295d7aebddf32b81207ade87c14018ffaeaad81337c -2a4ec23a859ed66eeac2da30a33333d53b69e995d5733e7ff8d4703d73a7f12d -9471b63f068a154896946d205062688b1f79646263431bbfa79d0e44c64fbe53 -9b92c412edcecee43756ac709c0cd382561485ba9b2fb6c2c5e84878ed274087 -cb9fe1f0eb9f08046c96a0a60781a5f87b9d3116b6b87b1a8cc131328b413ae4 -b27f5139ded670a4f58c7e2f55ee413758c9f46f9190e3398bffa8137588ae53 -3975a4028cf4137fbe23f8d3daab92ba0116deabccfe9feb00be9f8bb10e9cd7 -8039d71d12d43f98315d734f374461d17059b5f6d84c144f42e0e39c58bec2fd -e3c7e75bc1d445a110e31aa823f2d60ba8283ceb9f1a0fb381d635a8d653c479 -df1a7df836781b9d32ae33ebb3c01fd95b58ae75acf9e87655c7eb7114e4b08c -4ddcef44310b790c314e069556abb34fec9cc47fe25e0f89acfbdf2ae7c62725 -9d8227c27bee38324727681f4a6a58c2d111e38998b5c2e2be645d8a81ac5acb -aeb3aee8ff4066b8f5b6947c90b50daf49a42722b64ff219be7f050fbac500fa -392d2e44f60ed162a0c1c662549d796d907529a7f48468c064f02daef4843300 -9c61bfc7b21987c497941db6d8a7a8551e1af71deacd24b63971e000ecab3661 -631f3391dc3918369a5ef73982c020ed77566f06fef22a633828ae81b0f591c7 -34530b6a9d15c22a9edbe43ac4d4f76e8c2a352355646ecfa3acfad236f0f1af -61fc53a527bc4c5723c71dffffc2564e413f6cc8b7ad9ba1208474e7b26ded7c -b8b635b6d857a145d258fc7ef67609b4842c09de3857d3acb65058b1a9331dfa -7b951abdbff6b3f2b1b2f074e9c2ac8c23f222a3379a40f278c7a218d1b07f32 -aa25a8a6b7bbf585199c655aabbd017e4dc11c05389e180d9e7d0df6245b7384 -a255238cff530ffaef75dcfe45bf8a22b59fae6be781da5fac3302af8c509dd1 -ca6828ae04899e618e576288bd2a45582347e31d4b1d3e3e9e27ec479cf1e280 -02338b36d11863f61b1208a476b69dc0d1b4569500692a6041bce271d73ec488 -cccd132a530a4a0bd20e573a5b9eb01e20a6b214b4dcb4b0b5172d438ad09098 -8a06f9959060884b660b7e0c7d8ac5bca3af2cbede25fabcada56c450147cfe9 -cdd57ca6da4964c3d85db9ae5b66344ea37b462e5c6a8d67cab9c5984942b9b8 -575abeeaa27eadb22bb7db64455d2ea3a0e1e1489e4649084b5da888dd6a3ef5 -0eb0571fe1f2ce42b531e872a75e144905feb9df3a5222539cb57625c732b1c1 -f087cb5cfc1ca8a8099f1780eb4af54d45634f3b29413007cc43054c8ac0312b -36f8c050f21d068f1af7305258273257c66087849d1bb28970075057f6636434 -1da04e28aa10b9af5e4f964674116a14905480d346f054f0dbf6ee69d5543a7b -f1ffa9dbfef26c65187a76d85c88cdea8fd4351fa0a7deda8d53c9af5aa3b78a -e80cc845cd383cda82fdc2bb0e4e0ddeb4029558546d2bc03e3d8239eacb8463 -9e452c0562f4241302ffe682967d8635805c9733e2b7cbde2a57bca1df4d6e52 -914ad44b853ef8eb25c8c255619b467dba4329be5e76ece189de72c43d5e39b5 -07c385a14377d8eeba68406ab1dd40b8506147c55133bb604b048e1543bf1821 -60198c04cdab52fd275abe62f56e04289ae7a22f7d84cdf61a06589431557168 -619efb022f7eedefb5c3e3e9038bf6dd3e95fc73f1de8049b97631110560c93f -4e90ee6fba5bebd359541af331a0728131476e41e2b02d774f9da6b7e3e808df -21e46ea68503a8058188822dc774a9463ae60a60642bfa0b750c39c7f356aa19 -d7960ff34578f09f4d9caa5630d7550b22235f36ab2b4ac876dcdd0192a444a7 -bdc20ab4dacf72d375dc22677134e0b57cd79705e8a86dfcc9376e33b2fde193 -42769c0e78ae845c439a606480bfe38cf7a0f0428e692f1ccb54ae9490619a1d -91eaa2f539233af915e816d2d0c165828e1b877b7ada63e86b43207900e30473 -ebdfc72bec47311ccc4fb3c8d89de3ee82d6eba28a1e93a0864512f8a9df50fc -a7c06a0a0275ea9df6a496b158ae13f58943811e29ceeec98697ba3c3a1a2f51 -8b91189605191a3704754f6421f7c2fb0dabc1237d44ec18b222b197b069be43 -1309494d11a907096e04251978e090d85faa01af0672935cbef69e07ef513e83 -0e3b4defe3da096b0592fe2140bfa1a2f1d3471c6197f7c3fc3944f5a98c63ca -ce9e641feac457f804eb3654f8bbfbf57c8a5574185f09e13ed636b3b4b6cfe2 -649a1bd017a6230868ce99eb55dab3ad6e27e443ba96f0fd6382e095006aaa4a -7a8bc3e7c68853b2a32321a180d431522528bc2574cff6d37f565f58a32e2773 -bb5b38a0c4edf7b777efbff8c2f832ee9422247257d0cc25c5257122e76cdfb9 -b09d4dc5567d0e147c4d1ed623a65f44f60ad67601b7d285f5d5658901c594db -26061af5b560a3df1657f589741fd551c607142cb775981492bdfad888fc4cb8" +e6a116ee56fda449cdd67585161147cb77dd739667131576d95c0aee94e5ad3a +1d0084d8373617e25738a7b3462935369a039d56f82f64527ff0415c3db9e3e7 +b0740572e813b2ba281c190c50e8617dbce274ae16607cdb2f06f42a6c1e49af +561d8baac858b8b54d34fec81781645a1faf4b75923095380ce3eede566ee4bb +fc4f5bfc64ab7bcc0776317ed1a52d5f0c6d612f945bf8ae436a797f745a286b +cc31c6282534e067e6b09491bd8ce86e84b4c46d5c217a1931f029d9e746ff30 +9f55b5cb611c95672e90188ba63a1dfcdeec3c7998688821feb0ac7ef435320a +6ae5117b4636b74e6aea42271d109a1f295e3c5f2a1c13d935cccfd8e793df25 +bbe8e57e339423e88aef9fab8fd186ab3ccdf5bb3ba3828aec4b53db24feace7 +1bd46b57948be279d93b82f253d749e79919654374998ca814258bb8ecdf36bc +231a3bc39f30ca1990deccf7da656958755d2639a97e89396eabd19ffb91d444 +cf14dd3a7cbae9d247ba8ae43bd8449a758266d768315ac27ecaf790a7775a24 +96c7f00088e2c758071d95c79ec474b9d56ef34c7d11c83b62e069e6d0e15d5e +232ca5ce0105c67baed0ae7695d879621830595131ee5cd245149917bbc72c2b +fa3281d69c9f2dac9eda8e96157f2b191641852562fb713dd104c94412112e7f +632866f99885ac791216307f403faffdd36782b59ec4d71e5b80239a3f78782b +85c1b80c5a0d4f0b0b991963ddff203624486fbfe51c5012ce656f201449fd1d +4c8a3bfd1c4fb2975d5a8510a0bf1f15eb1d0bedb583aae05254954ae81c65cc +fa0e95bb08506b4978bf57829ab12b030ba995fd49fc6ce6800bad20c1de2b6e +a647e41baafbf943051c6632092074f6c753c303698aabfba075ef7e131c5ac7 +f1d6a52496f690a5588f7e7ed6e494ba8dbae32fb11a51a27885d442058fd5dc +193c492ac1473bc3c776d6eb36672eaaa10846882d71222d5bb0ae93eeaec72b +06fbcdacf39b7230c6ae7f97a6b11d61c649f0db5a48539cf7ac8da194bcfe86 +8d65c14c9946b82f3de6f06ddce3ffca2b8eccf6f8c114c77de5f37fe090c851 +1cef38483eab7bad50f814e854fd78b3aae5e94a4fdf886610d0a874c8a3c5c3 +68f738ae30690751e37d290ff4dc45d6464e659c3c24dd95077e44d5e70af42f +4b47102f9fc36e651d7501d94e36da372e7e71fd89eed8c13b0b39c64e645a04 +31992fc3284854d2ecd15c8c05ece2e6912ce8db48a41cab13249604fd0033d9 +c3d9c9f96826712ef327ba273e43bb628e6f1cfb751ff12719d1be659e3c8c7f +81481d249ac98833e51b0d847f8fb4091dac80b1ca613303f0067d3b0ae9b677 +88f5a080963cc08d56812683636e8b939c649028822a6c6ff1a2acf7d15254fd +4d335479465769e31ab9d315d1be373da2306b78370a2ca61929f1dce746cd1b +62970f8b0bde16afdb29067887c74ed00bc74d317621335683243a780d30d29d +f593570f85f3aed79f99038f93447e41a28f025c5233d75a0b8ca232fcdeec3a +dc0e43045727efa78a152ac0398196540cc17e1bd7c450c43a71484131f82701 +04e1a50f8030162244523f92d9cf0ba7a195ba742d292c64b78c88fc983b7584 +0d1890182a95cd2adcba8ed965e0553821d6a9597f577a1197bdcedd855aaad1 +acf0716f7f771d73cb21055428128d9498d633fda7763c3db9d427e8ba6e4243 +a115f95820f4d653053fec02b1c1400ab957a819722d5a29951aa1407c2024f1 +a62119d72e4f8e4b3f00a429ac0028fe6ca53f1294ae2089415ef2050c7f87a6 +263d142979b67853d37f60ab29f984b8e14a0609a6dd85da927383d9301e5499 +2a450c9aaf941ba8f9c0ec12354529f3dfb47d9de66685066634fd2e5359cfea +e931cbf3ace412f860dcc7e0b14d862459f0c54e6f8abffa83825645910f11e7 +9663469370dc0a6ed450bf4061f0bd491e7766740aafbbc79057534ac319967e +fc28470f937ab701a6262425a01e725d1c12e9fd5045750019608f00434ba93b +eec34716ad97a2fe2a1a8449c4f450aef326c2d13b75ec571dacfedae918ee5d +25df7f7d38327e8ff8388d9588ebf29423723f76f99b890db8d41c0d6dc6655d +d929734bc994f3b20f7c8cbd4e25d98d9081afd63af81e6fd5318688e6b57eac +4f8a8855b2680e8bc2323727d3a2d7aab0cdd9f718b1cfd3586f6b93430f88cf +fd7aa5fa31bf8160ae1bba834bdf43129c14978cacc775d3625bc42555844f2e +085d618e649720ab7a8649f4b5ad0e576aa5dbefee4ae0f23480f19b8dc48ca2 +d2c3dcede1bd71d85877b8f9b4b6e300275baa9e9f266d65066ed49ffd970fe1 +fad69dedf7db8d0ba39209dbb4a6e759c60e541c253101ec67b288cb2fed9ceb +7f0b62d524629a037505f8deb1e400c3da5fccf78c0de975655f973e79231285 +54454c19503de03176a98e7a9c1bae14bdc40886bb730b7f26e7b0d38d92a971 +1861bc9a195ea3b0319a8c1b8b664fe1e4b5e007ebdfa4f7d1784631da2f8c0f +c00e2a8254107817c1f2d27947bc91755629fa734035099693c04a7ff9065d90 +25665e8c4a73180dca5c6b271c4d89b8a800261b019ff2728a61954af10f5de4 +78868c7546daa620f186c72c84f51d1ff30fb007e3b3dba4dfc194c109525682 +857d6e655c21deef2c0b1010d911c420175e914ec2793239e27b849939f388e2 +56367d182c2815d059c41bbac11825a0b7c72b9b30a5adb57863c42a97fb6624 +4ceb5646daa509065fa5de098600d4b60160052240772d33cef78f8b6a34e697 +b812e5b4f681d38dd6ea9a707ce5297e79f25d7216f4436ec22ec580f0880b6e +abd34f2c16841f9a6159b4f6de967ea19f1920b941f89802ab8c34347a073932 +e42e3197753f83bbda085fad8f7b1582ccc0af48a9b4189f8987d8314ddc7e38 +7bdc757b4d74430d0821e6e3cfe6ae252655fa7c1f82478a1140b32d794f5f60 +a6a94c7bf40c3d50112284c704bec10db14997913d5696b700b78b7e5c7bbc01 +d7091eb558474f63d12ac1e182d397c708264f0465444d5bbe06340461409621 +34297b6aff54b29803c2c534fc31405cbc5a34a0ebaa1e2bd5be01674dec0355 +b7fd92c3e4bb7425457d1de0a4d0944766635bb984e6d31104704160e465c3d1 +02c74fc48145cc3b40d06c94210313b7f24975b45bab9aa877b392bf932713bc +9d0dc4348d0290b5308cfb3dc2e15583188ed457e5ea3e82e08974eac998519e +51d9943f124ca27928bd2812873b234715b038f2b1cd89cbc1faf9daee0dd0c8 +9b20181adeaf5e8a81f0014612d280b80d2d43b9c3da28b45fa2d94c5c16d3d6 +3d394c7bcc143c59fb9bebc8309f8ddd4c13ca35fd44400957729b9146b99879 +3f328c63bb70243cc2e74a6a4403f8755354c7b85f6ae87a74853de037a69a26 +beffa4c7fc7387a04fef9d96ad1cba47c4a4545e6f25d2826c96b11d1dbd8d36 +e7ba6289dd07bc11df9481bcb6dcf9159a84f163efec5ae92d25a294ef1f6cde +5fa121ca8cf3c8eab17332c9f43bd94414190ccd2827fe51b68946ed04856e77 +71949c2ebf794037b8bf4bd2452a8aaa72f603012fec0a921aead50eae2ef27a +391a6d7622d216673e5f2cf6391724ceecb257aac6089ab290dab510bb5ff92a +a80e1c178f1d27f2a551665faaab48445fab20238212ae5c0dce9b9cacc1247b +6357bdc635568f52b9c03b8785b4cf86b656fae69d2393ea7b53fc87360803c5 +12e9663e2a591de9b4eba5d689f25ff98e2db45781ada5877d8d21f093800eae +966d51bd93cf4b53721357770fca2c4bbe064a067bc044b1ba0e269213b442a5 +90d44b439af4204fb022e99e045540268d8ac078470e7a7d756671161d79d5db +cc67e32dc6aa0f36827e4a9f156b8476950cc876bbbd9668e7f928dc7c90aa9b +fceffdd06821fc224e5a7118e54f4ac14d73b175784f654646791878899ea385 +befcbbe52e769631c3792555e4e579684762c719696fb4c0e0d48a98e4a5d599 +32e697c5f5188085fc1bf08216ca8d562cd2c286ece23e61d9a6359ff6e78061 +" From 8ad43ce2cfc481b2274694b2e889b1555d7f7fd3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 08:23:07 +0200 Subject: [PATCH 0754/1145] gtksourceview: update to 3.24.2. --- srcpkgs/gtksourceview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template index 32580c8cd5..141572144b 100644 --- a/srcpkgs/gtksourceview/template +++ b/srcpkgs/gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview' pkgname=gtksourceview -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-static $(vopt_enable gir introspection)" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=717b6fe884ff9f25158bdc36f463790c608ada9f5e2e6f4dc7f1467c83711c25 +checksum=c96c88f1c6ea936db57239f489f5772940de9f9da90a194f51eba52da0cdb89f # Package build options build_options="gir" From acc86b0e677b9804a85046cec89947a94e2baddf Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 08:39:09 +0200 Subject: [PATCH 0755/1145] gnome-maps: update to 3.24.3. --- srcpkgs/gnome-maps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index f03dbb7b0a..b6929d3ed6 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.24.2 +version=3.24.3 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://live.gnome.org/Design/Apps/Maps" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=e49a759678538f58c49845a7a77f97d409c55ae3c650c7ed1c0f8ba5e4842202 +checksum=5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6 build_options="gir" if [ -z "$CROSS_BUILD" ]; then From 8ae1faf454dd1a6e25f3c94d800b2c2556e68598 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 23 May 2017 08:48:27 +0200 Subject: [PATCH 0756/1145] hugo: update to 0.21. --- srcpkgs/hugo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index d68b6c81d4..617e4a456e 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,6 +1,6 @@ # Template file for 'hugo' pkgname=hugo -version=0.20.7 +version=0.21 revision=1 build_style=go hostmakedepends="git-perl mercurial" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="SimPL-2" homepage="http://gohugo.io" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=81b0fa0743f8f075c76c7c0d258357e2da240aa62b6725ec7920f332673df7e2 +checksum=0de62da92e9457523463676536b57d4cae72b434edf9dcb650264cd122dfaa52 post_install() { vlicense LICENSE.md From edc793f983b598eabc55c48cd350c586e0f94780 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 09:19:29 +0200 Subject: [PATCH 0757/1145] gnome-recipes: update to 1.4.4. --- srcpkgs/gnome-recipes/patches/fix-musl.patch | 22 ++++++++++++++++++++ srcpkgs/gnome-recipes/template | 10 +++------ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/gnome-recipes/patches/fix-musl.patch diff --git a/srcpkgs/gnome-recipes/patches/fix-musl.patch b/srcpkgs/gnome-recipes/patches/fix-musl.patch new file mode 100644 index 0000000000..7757999c3a --- /dev/null +++ b/srcpkgs/gnome-recipes/patches/fix-musl.patch @@ -0,0 +1,22 @@ +diff --git a/src/gr-recipe-formatter.c b/src/gr-recipe-formatter.c +index 0299562..4b6ed47 100644 +--- src/gr-recipe-formatter.c ++++ src/gr-recipe-formatter.c +@@ -48,6 +48,7 @@ get_temperature_unit (void) + GSettings *settings = gr_settings_get (); + unit = g_settings_get_enum (settings, "temperature-unit"); + if (unit == GR_TEMPERATURE_UNIT_LOCALE) { ++#ifdef __GLIBC__ + const gchar *fmt; + + fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT); +@@ -55,6 +56,9 @@ get_temperature_unit (void) + unit = GR_TEMPERATURE_UNIT_FAHRENHEIT; + else + unit = GR_TEMPERATURE_UNIT_CELSIUS; ++#else ++ unit = GR_TEMPERATURE_UNIT_CELSIUS; ++#endif + } + + return unit; diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template index bdf5268e36..14a727fa35 100644 --- a/srcpkgs/gnome-recipes/template +++ b/srcpkgs/gnome-recipes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-recipes' pkgname=gnome-recipes -version=1.4.2 +version=1.4.4 revision=1 _libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7 hostmakedepends="glib intltool itstool pkg-config meson git" @@ -10,18 +10,14 @@ short_desc="GNOME puzzle game where you locate mines in the ocean" maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Recipes" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz - https://github.com/GNOME/libgd/archive/$_libgd_hash.tar.gz" -checksum="960a705eb15c22ef0ffb7c2cb59fc153a25c2d0624c16a00dda544e5526fe5a5 - 02c9ec9192a0f732390292a21f4d123b7595957301608288125ae79451cf4b40" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=b8e3bcee39b85437a68039ddb35f6f54cfb3ed7ab2a6320bb74dad4846f186e6 nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2155/steps/shell_3/logs/stdio do_configure() { # meson_post_install.py updates icon cache, desktop database etc. # nothing that we need. It fails in this setup, so make it a nop ln -sf /bin/true meson_post_install.py - rm -r subprojects/libgd - ln -sr ../libgd-$_libgd_hash subprojects/libgd meson --prefix=/usr --buildtype=plain build } From 86bde0b1f2a58c7340df98dc5af9e07949f40413 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 11:05:25 +0200 Subject: [PATCH 0758/1145] git-lfs: update to 2.1.1. --- srcpkgs/git-lfs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template index 3d0448279a..22bbd88918 100644 --- a/srcpkgs/git-lfs/template +++ b/srcpkgs/git-lfs/template @@ -1,6 +1,6 @@ # Template file for 'git-lfs' pkgname=git-lfs -version=2.0.2 +version=2.1.1 revision=1 nocross=1 build_style=go @@ -11,8 +11,8 @@ short_desc="Git extension for versioning large files" maintainer="Nicklaus McClendon " license="MIT" homepage="https://git-lfs.github.com/" -distfiles="https://github.com/git-lfs/${pkgname}/archive/${version}.tar.gz" -checksum=e266bdffa53e947ba1d0bf8944d73029384bad2ed05af92bc10918d07eec6b63 +distfiles="https://github.com/git-lfs/${pkgname}/archive/v${version}.tar.gz" +checksum=655c1e9bf931afb958c2b81de5c1c38b3ebd6831a04ca5fdcf58cba05e2948d8 pre_build() { chmod +x script/bootstrap From 4c2f35603b318cbf51fb8042114c2afe3f63593f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 11:14:16 +0200 Subject: [PATCH 0759/1145] gsmartcontrol: update to 0.9.0. --- ...m-gsmartcontrol-0.87-parser_crash_fix.diff | 44 ------------------- srcpkgs/gsmartcontrol/template | 6 +-- 2 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 srcpkgs/gsmartcontrol/patches/upstream-gsmartcontrol-0.87-parser_crash_fix.diff diff --git a/srcpkgs/gsmartcontrol/patches/upstream-gsmartcontrol-0.87-parser_crash_fix.diff b/srcpkgs/gsmartcontrol/patches/upstream-gsmartcontrol-0.87-parser_crash_fix.diff deleted file mode 100644 index 2b0aba87d0..0000000000 --- a/srcpkgs/gsmartcontrol/patches/upstream-gsmartcontrol-0.87-parser_crash_fix.diff +++ /dev/null @@ -1,44 +0,0 @@ -Fix provided by upstream gsmartcontrol.sf.net, in -HomePage > News > 2015-04-29: - The Linux binary packages have been updated with a patch that fixes crash on - startup for some smartmontools version and system configuration combinations. - The source patch can be downloaded separately as well. Note that he fix has - been included in the SVN version for some time now. - -direct link for this patch: -fix https://build.opensuse.org/source/home:alex_sh/gsmartcontrol/gsmartcontrol_parser_crash_fix.diff?rev=da33e1d56b052b483f576e5e6823da3b - -Index: src/applib/smartctl_parser.cpp -=================================================================== ---- src/applib/smartctl_parser.cpp (revision 106) -+++ src/applib/smartctl_parser.cpp (revision 107) -@@ -201,21 +201,20 @@ - while (section_start_pos != std::string::npos - && (section_start_pos = s.find("===", section_start_pos)) != std::string::npos) { - -- tmp_pos = s.find("\n", section_start_pos); // works with \r\n too. -+ tmp_pos = s.find("\n", section_start_pos); // works with \r\n too. This may be npos if nothing follows the header. - - // trim is needed to remove potential \r in the end - std::string section_header = hz::string_trim_copy(s.substr(section_start_pos, - (tmp_pos == std::string::npos ? tmp_pos : (tmp_pos - section_start_pos)) )); - -- if (tmp_pos != std::string::npos) -- ++tmp_pos; // set to start of the next section -- -- section_end_pos = s.find("===", tmp_pos); // start of the next section -- std::string section_body_str = hz::string_trim_copy(s.substr(tmp_pos, -- (section_end_pos == std::string::npos ? section_end_pos : section_end_pos - tmp_pos))); -- -+ std::string section_body_str; -+ if (tmp_pos != std::string::npos) { -+ section_end_pos = s.find("===", tmp_pos); // start of the next section -+ section_body_str = hz::string_trim_copy(s.substr(tmp_pos, -+ (section_end_pos == std::string::npos ? section_end_pos : section_end_pos - tmp_pos))); -+ } - status = parse_section(section_header, section_body_str) || status; -- section_start_pos = section_end_pos; -+ section_start_pos = (tmp_pos == std::string::npos ? std::string::npos : section_end_pos); - } - - if (!status) { diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template index 27d28a862e..3081dc09ba 100644 --- a/srcpkgs/gsmartcontrol/template +++ b/srcpkgs/gsmartcontrol/template @@ -1,7 +1,7 @@ # Template file for 'gsmartcontrol' pkgname=gsmartcontrol -version=0.8.7 -revision=2 +version=0.9.0 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtkmm2-devel pcre-devel desktop-file-utils" @@ -11,7 +11,7 @@ maintainer="yopito " license="GPL-3" homepage="http://gsmartcontrol.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=708fa803243abb852ed52050fc82cd3592a798c02743342441996e77f19ffec6 +checksum=5da6435aa0845acef134f72c2b5f6fce79f9c51bebe9d099402e0f21a3388651 CXXFLAGS="-std=c++11" From 2e0ec46334af55439a9fd7c7e95f164c044e762f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 12:02:25 +0200 Subject: [PATCH 0760/1145] php: update to 7.1.5. --- srcpkgs/php/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 640e9bb9e6..6c2bb1acc5 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template build file for 'php' pkgname=php -version=7.1.4 -revision=2 +version=7.1.5 +revision=1 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " license="PHP" @@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel sqlite-devel readline-devel libmysqlclient-devel" conf_files="/etc/php/php.ini" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=71514386adf3e963df087c2044a0b3747900b8b1fc8da3a99f0a0ae9180d300b +checksum=d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac # Needs (probably a lot of) work to make it cross compile nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio" From e6bc177d85297da01cccb18c4d52233a2f6b2f8b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 12:04:28 +0200 Subject: [PATCH 0761/1145] homebank: update to 5.1.5. --- srcpkgs/homebank/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template index 0b7b6ac884..8458f7995f 100644 --- a/srcpkgs/homebank/template +++ b/srcpkgs/homebank/template @@ -1,6 +1,6 @@ # Template file for 'homebank' pkgname=homebank -version=5.1.4 +version=5.1.5 revision=1 build_style=gnu-configure hostmakedepends="intltool pkg-config" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="GPL-2" homepage="http://homebank.free.fr/" distfiles="http://homebank.free.fr/public/${pkgname}-${version}.tar.gz" -checksum=0af35f848c9be864db838868c14977e3f873b54b20be24b6b30189766c5afd1f +checksum=5c3fd3478577e91a5d8e6e28fced58b5ad611eecb06e8f335a9585b817a1330f From 7789a80b2ca07a0d5f1b71ad943a36beaf0dff8c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 12:22:10 +0200 Subject: [PATCH 0762/1145] NetworkManager: update to 1.8.0. --- srcpkgs/NetworkManager/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 22eadf6aae..b85dbcbab9 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -10,7 +10,8 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient --with-kernel-firmware-dir=/usr/lib/firmware --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 --enable-modify-system --with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf - --with-session-tracking=consolekit --with-suspend-resume=upower + --with-session-tracking=$(vopt_if elogind logind consolekit) + --with-suspend-resume=upower --with-systemdsystemunitdir=no --enable-polkit-agent --enable-tests=no --with-systemd-journal=no --with-systemd-logind=no --disable-gtk-doc --with-dbus-sys-dir=/etc/dbus-1/system.d @@ -33,7 +34,7 @@ hostmakedepends=" makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel - $(vopt_if gir libgirepository-devel)" + $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)" lib32disabled=yes depends="dbus iproute2 dhclient wpa_supplicant openresolv" @@ -49,7 +50,7 @@ case "$XBPS_TARGET_MACHINE" in esac # Package build options -build_options="gir" +build_options="gir elogind" if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" fi @@ -59,6 +60,8 @@ pre_configure() { # Full switch to /run to not depend on /var/run being a symlink. sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure + + sed -e "s/HAVE_LIBSYSTEMD/0/" -i src/devices/wwan/nm-modem-manager.c } post_install() { From 65250eb9657666d7690e18496a9061b5bdf2b5d3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 12:32:26 +0200 Subject: [PATCH 0763/1145] linux4.9: update to 4.9.29. --- srcpkgs/linux4.9/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 6f8a24f132..dea37e9b37 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,6 +1,6 @@ # Template file for 'linux4.9' pkgname=linux4.9 -version=4.9.26 +version=4.9.29 revision=1 patch_args="-Np1" wrksrc="linux-${version}" @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=dfc615e19752dbd9f2b13ab4c211ffafe02150775d086deb24fe94398abce9d3 +checksum=51b6df767544e593e3161b0109a6a76be18bfc9d6cc1fb7fa92b48de6cff24cf nodebug=yes # -dbg package is generated below manually nostrip=yes From 7474acbc6124e7c8138aa83f77e895041abd1d05 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 12:36:00 +0200 Subject: [PATCH 0764/1145] lxcfs: update to 2.0.7. --- srcpkgs/lxcfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxcfs/template b/srcpkgs/lxcfs/template index c12131368c..cd70e10b1b 100644 --- a/srcpkgs/lxcfs/template +++ b/srcpkgs/lxcfs/template @@ -1,6 +1,6 @@ # Template file for 'lxcfs' pkgname=lxcfs -version=2.0.6 +version=2.0.7 revision=1 build_style=gnu-configure configure_args="--with-pamdir=/usr/lib/security" @@ -11,4 +11,4 @@ maintainer="Juan RP " homepage="https://linuxcontainers.org/lxcfs/" license="Apache-2.0" distfiles="https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz" -checksum=bb266d5de0c633188e8b2c4d62944df169371fb2e39655b3efe943acae27c9da +checksum=8c15abf36eaf244ac6906460de0fe8e818c6b96d59b7e5401066fa419b76b649 From c0dc3f4f2062c8eb14a112f13a8967a4dc6e178c Mon Sep 17 00:00:00 2001 From: lemmi Date: Tue, 23 May 2017 13:59:09 +0200 Subject: [PATCH 0765/1145] abcm2ps: update to 8.13.10. --- srcpkgs/abcm2ps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index c159846e68..75e33aa27f 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,6 +1,6 @@ # Template file for 'abcm2ps' pkgname=abcm2ps -version=8.13.9 +version=8.13.10 revision=1 build_style=configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="lemmi " license="GPL-2" homepage="http://moinejf.free.fr/" distfiles="${homepage}/abcm2ps-${version}.tar.gz" -checksum=372bc6d5bb5ba087b71abeb6240c806f940a59e9664f46e5f4f1faec52e815a7 +checksum=96a8133b587b8b8b92d485f52848134eb587379ff308b708a8e0bb64224bd90a pre_configure() { echo CC=${CC} >> custom From 2475f8e33d0f07d964dc1a5a48fbb4d85bd4a6c9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 23 May 2017 12:14:03 +0200 Subject: [PATCH 0766/1145] mcelog: update to 151. --- srcpkgs/mcelog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index aa20d23359..ec55e77b27 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=150 +version=151 revision=1 conf_files="/etc/mcelog/mcelog.conf" only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -10,7 +10,7 @@ license="GPL-2" homepage="http://www.mcelog.org/" _changelog="https://github.com/andikleen/mcelog/releases" distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz" -checksum=12917e445786adb5405615c5800d60e32eec14108a1859491cdd356ddb984eb5 +checksum=a98268d782c66bcb3c657b81038871a47d6c841f4a5322471c7def88e33eb9f8 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} From 316a71dc1d71527c88fd62ae4b93b8b0cd930907 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 23 May 2017 12:15:18 +0200 Subject: [PATCH 0767/1145] perl-Exporter-Tiny: update to 1.000000. --- srcpkgs/perl-Exporter-Tiny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Exporter-Tiny/template b/srcpkgs/perl-Exporter-Tiny/template index 3c45a133a9..4706914811 100644 --- a/srcpkgs/perl-Exporter-Tiny/template +++ b/srcpkgs/perl-Exporter-Tiny/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Exporter-Tiny' pkgname=perl-Exporter-Tiny -version=0.044 +version=1.000000 revision=1 wrksrc="Exporter-Tiny-$version" build_style=perl-module @@ -12,5 +12,5 @@ maintainer="Leah Neukirchen " homepage="http://search.cpan.org/~tobyink/Exporter-Tiny/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Exporter/Exporter-Tiny-${version}.tar.gz" -checksum=eda868cc2da094b685ceace4245b83de11f439feb98e0ec8246cfbb9109c88ab +checksum=ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078 noarch=yes From 883a5b121e4cf4f84e474582ee3c50830ec5bed2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 23 May 2017 12:18:48 +0200 Subject: [PATCH 0768/1145] skalibs: update to 2.5.1.1. --- srcpkgs/skalibs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index ef32f5d010..8d1c9543d9 100644 --- a/srcpkgs/skalibs/template +++ b/srcpkgs/skalibs/template @@ -1,6 +1,6 @@ # Template file for 'skalibs' pkgname=skalibs -version=2.5.1.0 +version=2.5.1.1 revision=1 nocross=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="bougyman " license="ISC" homepage="http://skarnet.org/software/skalibs/" distfiles="http://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=fe45621528bf17ef669218a0a5a0b9a88cd40b0de06b15d40123b5816a696560 +checksum=aa387f11a01751b37fd32603fdf9328a979f74f97f0172def1b0ad73b7e8d51d CFLAGS="-D_DEFAULT_SOURCE" From be42b83f5487350f5a35baa81917cf4df3b0002b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 23 May 2017 15:57:53 +0200 Subject: [PATCH 0769/1145] os-prober: depend on grub-utils. grub-mount is now preferred for checking partitions. --- srcpkgs/os-prober/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index f6f5d53203..ace0c3b1b2 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,9 +1,10 @@ # Template file for 'os-prober' pkgname=os-prober version=1.75 -revision=1 +revision=2 make_dirs="/var/lib/os-prober 0755 root root" short_desc="Utility to detect other OSes on a set of drives" +depends="grub-utils" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" license="GPL-2" From 09af75dd76c55b59545c7f2abdc49802b00d5120 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 23 May 2017 17:47:44 +0200 Subject: [PATCH 0770/1145] fwup: update to 0.14.3. --- srcpkgs/fwup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 0b90151912..ecf3d21143 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,6 +1,6 @@ # Template file for 'fwup' pkgname=fwup -version=0.14.2 +version=0.14.3 revision=1 build_style=gnu-configure configure_args="ac_vc_func_open_memstream=yes" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="Apache-2.0" homepage="https://github.com/fhunleth/fwup" distfiles="https://github.com/fhunleth/fwup/archive/v${version}.tar.gz" -checksum=2ef13f2e8c55d9914788e01c7e0d1c65526643f96a505237f013018e4d08abc5 +checksum=cf2e6ff729c21bc000dbe008211cf9d4901be9b42c82a06e4068deb638ea8f6e if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" From fbf9552e6b4f3a58e35e26bd481f723c78581ff5 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 19:29:23 +0200 Subject: [PATCH 0771/1145] tigervnc: update to 1.8.0 Fixes CVE-2017-7392-6. --- srcpkgs/tigervnc/template | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 9eba9f152c..f5cb4328cd 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -1,35 +1,36 @@ # Template file for 'tigervnc' pkgname=tigervnc -version=1.7.1 +version=1.8.0 revision=1 -_xorg_version=1.18.4 +_xorg_version=1.19.3 build_style=cmake short_desc="VNC client forked from TightVNC" maintainer="Evan Deaubl " license="GPL-2" hostmakedepends="automake xorg-util-macros font-util pkg-config libtool xtrans" makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel - randrproto fontsproto videoproto compositeproto scrnsaverproto - resourceproto libxkbfile-devel libXfont-devel gnutls-devel" + randrproto fontsproto videoproto compositeproto scrnsaverproto + resourceproto libxkbfile-devel libXfont2-devel gnutls-devel" depends="xauth xkeyboard-config" conflicts="turbovnc>=0" homepage="http://www.tigervnc.org" distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz - ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" -checksum="3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc - 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8" + ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" +checksum="9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 + 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98" post_configure() { cd ${wrksrc}/unix/xserver cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* . - patch -p1 <../xserver117.patch + patch -p1 <../xserver119.patch autoreconf -fiv - ./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr --with-pic \ - --without-dtrace --disable-static --disable-dri \ - --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ - --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ - --disable-config-hal --disable-config-udev --disable-dri2 --enable-glx \ - --disable-unit-tests --disable-selective-werror + ./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \ + --with-pic --without-dtrace --disable-static \ + --disable-xvfb --disable-xnest --disable-xorg --disable-dmx \ + --disable-xwin --disable-xwayland --disable-xephyr \ + --disable-kdrive --disable-config-hal --disable-config-udev \ + --disable-dri --enable-dri2 --enable-dri3 --enable-glx \ + --disable-unit-tests --disable-devel-docs --disable-selective-werror } post_build() { From 3fc4658d4d543dd71b94470ea392f8c12ed98549 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 19:30:31 +0200 Subject: [PATCH 0772/1145] wxWidgets: update to 3.0.3.1 --- srcpkgs/wxWidgets/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index 4f9c2d91ec..d80ed145c7 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,6 +1,6 @@ # Template file for 'wxWidgets' pkgname=wxWidgets -version=3.0.3 +version=3.0.3.1 revision=1 build_style=gnu-configure configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack @@ -8,12 +8,12 @@ configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack short_desc="The wxWidgets GUI toolkit library (version 3)" maintainer="Martin Riese " license="wxWindows" -homepage="http://www.wxwidgets.org/" +homepage="https://www.wxwidgets.org/" hostmakedepends="pkg-config" makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libnotify-devel libXinerama-devel libmspack-devel SDL-devel glu-devel webkitgtk2-devel" distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2" -checksum=08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b +checksum=3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4 # Cross compiling works, but then wx-config is wrong for native builds # on target. From baaa4b782f6e904edac891db02f5ceb2bb6797d8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 19:49:37 +0200 Subject: [PATCH 0773/1145] xkbcomp: update to 1.4.0 --- srcpkgs/xkbcomp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xkbcomp/template b/srcpkgs/xkbcomp/template index 469ea4033a..0ab1ca9256 100644 --- a/srcpkgs/xkbcomp/template +++ b/srcpkgs/xkbcomp/template @@ -1,15 +1,15 @@ # Template build file for 'xkbcomp'. pkgname=xkbcomp -version=1.3.1 +version=1.4.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config bison" makedepends="libX11-devel libxkbfile-devel" short_desc="XKBD keymap compiler" -homepage="http://xorg.freedesktop.org/" +homepage="https://www.x.org/" license="MIT" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -checksum=0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d +checksum=bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b post_install() { vlicense COPYING LICENSE From 123bd3b5d02b6f18c68d67b3412c1a36d700dbd0 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 19:49:53 +0200 Subject: [PATCH 0774/1145] libbson: update to 1.6.3 --- srcpkgs/libbson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libbson/template b/srcpkgs/libbson/template index 85bd86c587..646522ce6b 100644 --- a/srcpkgs/libbson/template +++ b/srcpkgs/libbson/template @@ -1,6 +1,6 @@ # Template file for 'libbson' pkgname=libbson -version=1.6.2 +version=1.6.3 revision=1 build_style=gnu-configure hostmakedepends="perl automake libtool" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="Apache-2.0" homepage="https://github.com/mongodb/libbson" distfiles="https://github.com/mongodb/libbson/archive/${version}.tar.gz" -checksum=d9a1b2229a4aac2edb1564b909f0770a972af9bf94994acce2b21b2905913aed +checksum=94bd5a0accee5da9af22c73e536c404eb110b08b00f2bb1cd813efddaa356312 pre_configure() { NOCONFIGURE=1 ./autogen.sh From 5fe6cb7217c6267d344b118695796092f9c6b33a Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:02:01 +0200 Subject: [PATCH 0775/1145] python-pycountry: update to 17.5.14 --- srcpkgs/python-pycountry/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-pycountry/template b/srcpkgs/python-pycountry/template index 21bf653ed1..a127e28ac3 100644 --- a/srcpkgs/python-pycountry/template +++ b/srcpkgs/python-pycountry/template @@ -1,6 +1,6 @@ # Template file for 'python-pycountry' pkgname=python-pycountry -version=17.1.8 +version=17.5.14 revision=1 wrksrc="pycountry-${version}" noarch=yes @@ -13,7 +13,7 @@ maintainer="Farhad Shahbazi " license="LGPL-2.1" homepage="http://pypi.python.org/pypi/pycountry" distfiles="${PYPI_SITE}/p/pycountry/pycountry-${version}.tar.gz" -checksum=c5ccad49e47caee92779bf83da81565159b1fe3d8f48b063068ac118b73dd1f8 +checksum=d31321e59a134aac326ac07d4b2595d63f7e7f755bcb503bdecca2bd1b54ff2f python3-pycountry_package() { noarch=yes From d9300ea1cdb03c0a0e211e7f572630b0ee0a6ce9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:02:14 +0200 Subject: [PATCH 0776/1145] python-icalendar: update to 3.11.4 --- srcpkgs/python-icalendar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-icalendar/template b/srcpkgs/python-icalendar/template index 39c186d2bf..7a62c0154d 100644 --- a/srcpkgs/python-icalendar/template +++ b/srcpkgs/python-icalendar/template @@ -1,6 +1,6 @@ # Template file for 'python-icalendar' pkgname=python-icalendar -version=3.11.3 +version=3.11.4 revision=1 wrksrc="icalendar-${version}" noarch=yes @@ -13,7 +13,7 @@ maintainer="Oliver Kiddle " license="2-clause-BSD" homepage="http://icalendar.readthedocs.org/" distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz" -checksum=6317d716563c41ca44b4694458f0a94734e35bb8c708994eb4503c8638d5d220 +checksum=5696b18f791bbbb5972b87ea3d3c42a855ae641b0608477a451aa23f7defa347 post_install() { vlicense LICENSE.rst LICENSE From 0ff89900e5fb16e1c81e780311aea8bd5bf38377 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:02:23 +0200 Subject: [PATCH 0777/1145] python-requests-toolbelt: update to 0.8.0 --- srcpkgs/python-requests-toolbelt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-requests-toolbelt/template b/srcpkgs/python-requests-toolbelt/template index 03fba07d52..c9394525a5 100644 --- a/srcpkgs/python-requests-toolbelt/template +++ b/srcpkgs/python-requests-toolbelt/template @@ -1,6 +1,6 @@ # Template file for 'python-requests-toolbelt' pkgname=python-requests-toolbelt -version=0.7.1 +version=0.8.0 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Oliver Kiddle " license="Apache-2.0" homepage="https://toolbelt.readthedocs.io" distfiles="${PYPI_SITE}/r/requests-toolbelt/requests-toolbelt-${version}.tar.gz" -checksum=c3843884269d79e492522f3e9f490917e074c1ddbb80111968970e721fe36eaf +checksum=f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5 python3-requests-toolbelt_package() { noarch=yes From 3442fb0ef1cface03e02c2d1ae846985179438fc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:02:35 +0200 Subject: [PATCH 0778/1145] python-texttable: update to 0.9.0 --- srcpkgs/python-texttable/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-texttable/template b/srcpkgs/python-texttable/template index 40e349a6b9..a4255aa174 100644 --- a/srcpkgs/python-texttable/template +++ b/srcpkgs/python-texttable/template @@ -1,6 +1,6 @@ # Template file for 'python-texttable' pkgname=python-texttable -version=0.8.8 +version=0.9.0 revision=1 noarch=yes wrksrc="texttable-${version}" @@ -13,7 +13,7 @@ maintainer="Sergi Alvarez " homepage="https://github.com/foutaise/texttable/" license="LGPL-3" distfiles="${PYPI_SITE}/t/texttable/texttable-${version}.tar.gz" -checksum=0be1ecd6468847fc2f3b57b6c1862d8c0ae6832c037c97db502053311eff9a99 +checksum=ea73c237071c3981c90854ed4dcd596d10719e568c606e94ce459e89081a6520 python3-texttable_package() { noarch=yes From e79cf9dcba70da8f94526b938164d94eaabed3fe Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:02:39 +0200 Subject: [PATCH 0779/1145] python-docker: update to 2.3.0 --- 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 d229942418..2349bf42e4 100644 --- a/srcpkgs/python-docker/template +++ b/srcpkgs/python-docker/template @@ -1,6 +1,6 @@ # Template file for 'python-docker' pkgname=python-docker -version=2.2.1 +version=2.3.0 revision=1 noarch=yes wrksrc="docker-${version}" @@ -15,7 +15,7 @@ maintainer="Sergi Alvarez " homepage="https://github.com/docker/docker-py" license="Apache-2.0" distfiles="${PYPI_SITE}/d/docker/docker-${version}.tar.gz" -checksum=a67de803a8b3a9ef5adb9ce881feb74ec33d373a4f6d6cbb1a26cad03e809ae2 +checksum=b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c python3-docker_package() { noarch=yes From 0ab763fa7ea52ef2560b6e67d25db907bf77b093 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:02:44 +0200 Subject: [PATCH 0780/1145] docker-compose: update to 1.13.0 --- srcpkgs/docker-compose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template index fb8165d448..3bf87c3710 100644 --- a/srcpkgs/docker-compose/template +++ b/srcpkgs/docker-compose/template @@ -1,6 +1,6 @@ # Template file for 'docker-compose' pkgname=docker-compose -version=1.12.0 +version=1.13.0 revision=1 noarch=yes wrksrc="compose-${version}" @@ -15,7 +15,7 @@ maintainer="pancake " homepage="https://docs.docker.com/compose/" license="Apache-2.0" distfiles="https://github.com/docker/compose/archive/${version}.tar.gz" -checksum=7a51cf38feb6d62e63e124bd6ea5d0de3527a01b997a609ba8b516a829e39b33 +checksum=0cace4a814cf629689f1738fc221eb0de12f6336ee682b8c9539568f63cf6785 pre_build() { # remove all upper bounds From 4c992f3af6f12364a313a890332871b46f290100 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:03:48 +0200 Subject: [PATCH 0781/1145] python-oauth2client: update to 4.1.0 --- srcpkgs/python-oauth2client/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-oauth2client/template b/srcpkgs/python-oauth2client/template index 8b6db5301c..0f773c8d6c 100644 --- a/srcpkgs/python-oauth2client/template +++ b/srcpkgs/python-oauth2client/template @@ -1,6 +1,6 @@ # Template file for 'python-oauth2client' pkgname=python-oauth2client -version=4.0.0 +version=4.1.0 revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" @@ -13,7 +13,7 @@ maintainer="Peter Bui " license="Apache-2.0" homepage="https://github.com/google/oauth2client/" distfiles="${PYPI_SITE}/o/oauth2client/oauth2client-${version}.tar.gz" -checksum=80be5420889694634b8517b4acd3292ace881d9d1aa9d590d37ec52faec238c7 +checksum=cd0a259a5d354fc7fcea5f1dc3f037e80f06091bc0303251ae177f92bb949e7f python3-oauth2client_package() { noarch=yes From 0cb4dd5724187bc5de38fe0952b225b973c6908e Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:03:51 +0200 Subject: [PATCH 0782/1145] python-twitter: update to 3.3 --- srcpkgs/python-twitter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-twitter/template b/srcpkgs/python-twitter/template index 4e3a52766e..9db3e66c40 100644 --- a/srcpkgs/python-twitter/template +++ b/srcpkgs/python-twitter/template @@ -1,6 +1,6 @@ # Template file for 'python-twitter' pkgname=python-twitter -version=3.2.1 +version=3.3 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="Peter Bui " license="Apache-2.0" homepage="https://github.com/bear/python-twitter" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=f621e035e114435114967a35a34d3346e59544df4c69fbedb1e382d9677087db +checksum=a9f2bd038a05ba384fa03e39949d1445349771ce7897aeb3c6d8774beba08185 pre_build() { sed -i '/setup_requires=/d' setup.py From bdc25b64a75d3989df7de94eb2e8ad753ecad5dd Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:04:28 +0200 Subject: [PATCH 0783/1145] python-pycryptodome: update to 3.4.6 --- srcpkgs/python-pycryptodome/template | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template index b34537a27d..aa52526ad2 100644 --- a/srcpkgs/python-pycryptodome/template +++ b/srcpkgs/python-pycryptodome/template @@ -1,31 +1,30 @@ # Template file for 'python-pycryptodome' pkgname=python-pycryptodome -version=3.4.3 +version=3.4.6 revision=1 wrksrc="pycryptodome-${version}" build_style=python-module -pycompile_module="pycryptodome" +pycompile_module="Crypto" +conflicts="python-crypto>=0" hostmakedepends="python-setuptools python3-setuptools" makedepends="python-devel python3-devel" -short_desc="PyCryptodome is a Python2 package of low-level cryptographic primitives" +short_desc="Python2 package of low-level cryptographic primitives" maintainer="Wietse Kuipers " -homepage="http://www.pycryptodome.org/" -license="BSD" +homepage="https://www.pycryptodome.org/" +license="Public Domain, 2-clause-BSD" distfiles="https://github.com/Legrandin/pycryptodome/archive/v${version}.tar.gz" -checksum=e10b7725deb6bcfc9500e5467ee68f68192bc4cbf5e89428eed73c3611fd6b24 - -pre_build() { - mkdir build -} +checksum=9beefd5d4e468108b43609246274469783945a89123d2525356eb86026967c69 post_install() { - vlicense LICENSE.rst + vlicense LICENSE.rst LICENSE } python3-pycryptodome_package() { - pycompile_module="pycryptodome" + pycompile_module="Crypto" + conflicts="python3-crypto>=0" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE.rst LICENSE } } From 9a4bc7e6732d5e71add6aa9a013e0223e9b8fc5c Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:06:02 +0200 Subject: [PATCH 0784/1145] streamlink: update to 0.6.0 --- srcpkgs/streamlink/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 73c8e59dfc..3093e003bf 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,18 +1,22 @@ # Template file for 'streamlink' pkgname=streamlink -version=0.3.0 +version=0.6.0 revision=1 +noarch=yes build_style=python3-module pycompile_module="streamlink streamlink_cli" -noarch=yes hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-requests python3-pycryptodome" +depends="python3-setuptools python3-requests python3-crypto python3-pycountry" short_desc="Utility extracting streams from services, forked from livestreamer" maintainer="wkuipers " -license="BSD" +license="2-clause-BSD" homepage="https://streamlink.github.io/" distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz" -checksum=c0a5cbc24b6cd9bd8d766bdc977562711ff0347fbff715e03f25904b6c8e120a +checksum=945a6a0e9e8c3965a83579506219baaa2f89801d463002650d8206adfa39a072 + +export STREAMLINK_USE_PYCRYPTO=1 +export STREAMLINK_USE_PYCOUNTRY=1 + post_install() { vlicense LICENSE } From b962e04a1456fbeb10ae61040ae410483db95a53 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 23 May 2017 20:07:44 +0200 Subject: [PATCH 0785/1145] python-zope.interface: update to 4.4.1 --- srcpkgs/python-zope.interface/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template index 445d6e4156..44f3e77511 100644 --- a/srcpkgs/python-zope.interface/template +++ b/srcpkgs/python-zope.interface/template @@ -1,6 +1,6 @@ # Template file for 'python-zope.interface' pkgname=python-zope.interface -version=4.4.0 +version=4.4.1 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://github.com/zopefoundation/zope.interface" license="ZPL-2.1" distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz" -checksum=e50e5e87cde9bf0ed59229fd372390c2d68b3674ae313858ef544d32051e2cd3 +checksum=350e3615d70a96678c3170eb5c96d4f72b8e7738861afbf030967d52c05722fe post_install() { # zope.interface provides the zope namespace From 51f7ae0bce775a6fb7b763320c0cd8fe8a6060fd Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 24 May 2017 00:13:14 +0200 Subject: [PATCH 0786/1145] grub: remove grub-utils subpackage --- srcpkgs/grub-utils | 1 - srcpkgs/grub/template | 16 ++++------------ 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/grub-utils diff --git a/srcpkgs/grub-utils b/srcpkgs/grub-utils deleted file mode 120000 index 2c8276e741..0000000000 --- a/srcpkgs/grub-utils +++ /dev/null @@ -1 +0,0 @@ -grub \ No newline at end of file diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index eb69690769..837d936db5 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.02~rc2 -revision=3 +revision=4 hostmakedepends="flex" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" @@ -14,10 +14,12 @@ homepage="http://www.gnu.org/software/grub/" distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz" checksum=053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 +replaces="grub-utils>=0" + only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes -subpackages="grub-utils grub-i386-efi" +subpackages="grub-i386-efi" case "$XBPS_TARGET_MACHINE" in x86_64*) subpackages+=" grub-x86_64-efi"; _GRUBX64=1;; esac @@ -127,16 +129,6 @@ do_install() { rm ${DESTDIR}/usr/bin/grub-sparc64-setup } -grub-utils_package() { - short_desc+=" - additional utilities" - depends="grub>=${version}" - pkg_install() { - vmove usr/bin/grub-menulst2cfg - vmove usr/bin/grub-fstest - vmove usr/bin/grub-mkfont - vmove usr/bin/grub-mount - } -} grub-x86_64-efi_package() { noarch=yes depends="grub>=$version dosfstools efibootmgr" From 2510ab8e0d1cabd720b86859fa5bb22866ae5073 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 24 May 2017 00:14:13 +0200 Subject: [PATCH 0787/1145] os-prober: remove grub-utils dependency --- srcpkgs/os-prober/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index ace0c3b1b2..805b4e4bbb 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,10 +1,9 @@ # Template file for 'os-prober' pkgname=os-prober version=1.75 -revision=2 +revision=3 make_dirs="/var/lib/os-prober 0755 root root" short_desc="Utility to detect other OSes on a set of drives" -depends="grub-utils" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" license="GPL-2" From 052b92966dfb8e211e98a9dce3c45169b6a4be05 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 24 May 2017 07:34:59 +0200 Subject: [PATCH 0788/1145] youtube-dl: update to 2017.05.23. --- 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 367b1add27..a391eb7f4f 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2017.05.18 +version=2017.05.23 revision=1 noarch=yes wrksrc="${pkgname}" @@ -14,7 +14,7 @@ maintainer="Juan RP " homepage="http://rg3.github.com/youtube-dl/" license="Public Domain" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=433c4ac9199c01251bd7504eedbbeaccdca932725196706a65476ec916cd2ded +checksum=8dc76390c1651950b9332651438e0169140369cf721f77fd88285ca4246342d9 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { From 3ab96a38ea6d93e70953a97f100e2a3027a9c241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 24 May 2017 09:56:03 +0200 Subject: [PATCH 0789/1145] simgear: update to 2017.2.1 --- srcpkgs/simgear/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index c51c013ff8..2b3fa8c714 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -1,6 +1,6 @@ # Template file for 'simgear' pkgname=simgear -version=2017.1.3 +version=2017.2.1 revision=1 # XXX: always keep in sync with flightgear version! build_style=cmake @@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=85304d985b4fc0dc00d9f7603b02d096e3c24ca4c98adc18dc9af1e2d0e3c310 +checksum=9924592c01cb41ad66a0ff1dc43b7678ceec69fb573d3f4e4637e26c247c7a9e # Suppress warnings regarding auto_ptr CXXFLAGS="-Wno-deprecated-declarations" From f1b748de19c33def946cc045294b0a0a04659f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 24 May 2017 09:56:58 +0200 Subject: [PATCH 0790/1145] flightgear: update to 2017.2.1 --- srcpkgs/flightgear/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index d1c7f59580..8d4095c5f8 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,13 +1,13 @@ # Template file for 'flightgear' pkgname=flightgear -version=2017.1.3 +version=2017.2.1 revision=2 build_style=cmake configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata" hostmakedepends="fltk pkg-config" makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-devel libgsm-devel glew-devel speex-devel sqlite-devel osg-devel plib-devel libcurl-devel - simgear $(vopt_if qt qt5-devel)" + simgear $(vopt_if qt 'qt5-devel qt5-declarative-devel')" depends="flightgear-data>=${version}" short_desc="Sophisticated flight simulator" maintainer="Jürgen Buchmüller " @@ -18,8 +18,8 @@ distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" _mirror=http://mirror.netcologne.de/gentoo/distfiles checksum=" - 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad - bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365" + c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b + c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4" case "$XBPS_TARGET_MACHINE" in aarch64-musl) @@ -31,13 +31,13 @@ build_options="qt" build_options_default="qt" if [ "$CROSS_BUILD" ]; then configure_args+=" -DSIMGEAR_COMPILE_TEST_EXITCODE=0" - hostmakedepends+=" qt5-host-tools $(vopt_if qt qt5-devel)" + hostmakedepends+=" qt5-host-tools $(vopt_if qt 'qt5-devel qt5-declarative-devel')" fi # Suppress warnings regarding auto_ptr CXXFLAGS="-Wno-deprecated-declarations" post_install() { - vinstall package/flightgear.desktop 644 usr/share/applications + vinstall package/RedHat/flightgear.desktop 644 usr/share/applications vinstall package/flightgear.ico 644 usr/share/icons vinstall ${FILESDIR}/flightgear.png 644 usr/share/pixmaps vinstall scripts/completion/fg-completion.bash 644 usr/share/bash-completion/completions/fgfs From 3a18da259bab2002c78e6ad44f361dc96a16355d Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 24 May 2017 12:19:14 +0200 Subject: [PATCH 0791/1145] New package: rocker-1.3.0 --- srcpkgs/rocker/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/rocker/template diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template new file mode 100644 index 0000000000..2fa289872d --- /dev/null +++ b/srcpkgs/rocker/template @@ -0,0 +1,17 @@ +# Template file for 'rocker' +pkgname=rocker +version=1.3.0 +revision=1 +build_style=go +depends="docker" +short_desc="Docker based build environment" +maintainer="Andrea Brancaleoni " +license="Apache-2.0" +go_import_path="github.com/grammarly/rocker" +homepage="https://$go_import_path" +distfiles="$homepage/archive/$version.tar.gz" +checksum=93e4c4f29e1a9d477fe04aa1918068183e9594995ccc7249891bf7679c23c8d5 + +post_install() { + vlicense LICENSE +} \ No newline at end of file From bb131b4dd12a11bd8249f0841fea465c3484c55a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 07:31:33 +0000 Subject: [PATCH 0792/1145] poppler: update to 0.55.0. --- srcpkgs/poppler/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 23ec8b2080..e37041f7c0 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,23 +3,23 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt{4,5}". # pkgname=poppler -version=0.54.0 +version=0.55.0 revision=1 build_style=gnu-configure -configure_args="--enable-zlib --enable-libcurl --enable-libjpeg - --enable-libtiff --disable-libopenjpeg --enable-cairo-output +configure_args="--enable-zlib --enable-libcurl + --enable-libtiff --enable-libopenjpeg=openjpeg2 --enable-cairo-output --enable-xpdf-headers --disable-poppler-qt4 --disable-poppler-qt5 --disable-gtk-test $(vopt_enable gir introspection)" hostmakedepends="automake libtool pkg-config glib-devel gettext-devel" makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel - libcurl-devel $(vopt_if gir gobject-introspection)" + libcurl-devel libopenjpeg2-devel $(vopt_if gir gobject-introspection)" depends="poppler-data" short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/$pkgname-$version.tar.xz" -checksum=10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 +checksum=537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 # Package build options build_options="gir" From 2db794c08d448a3d9df587df46126805da9ed7b9 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 07:35:03 +0000 Subject: [PATCH 0793/1145] poppler-qt4: update to 0.55.0. --- srcpkgs/poppler-qt4/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template index 673afb34a1..910a2d7b0d 100644 --- a/srcpkgs/poppler-qt4/template +++ b/srcpkgs/poppler-qt4/template @@ -4,24 +4,24 @@ # A CYCLIC DEPENDENCY: qt -> cups -> poppler -> qt. # pkgname=poppler-qt4 -version=0.54.0 +version=0.55.0 revision=1 wrksrc="poppler-${version}" build_style=gnu-configure -configure_args="--enable-zlib --enable-libcurl --enable-libjpeg - --enable-libtiff --disable-libopenjpeg --enable-cairo-output +configure_args="--enable-zlib --enable-libcurl --enable-libtiff + --enable-libopenjpeg=openjpeg2 --enable-cairo-output --enable-xpdf-headers --disable-gtk-test --disable-poppler-glib --enable-poppler-qt4 --disable-poppler-qt5 --disable-poppler-cpp --disable-utils --disable-static --disable-introspection" hostmakedepends="pkg-config qt-devel" makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel - fontconfig-devel cairo-devel qt-devel" + fontconfig-devel cairo-devel libopenjpeg2-devel qt-devel" short_desc="PDF rendering library - Qt4 bindings" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/poppler-$version.tar.xz" -checksum=10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 +checksum=537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 post_install() { rm -f ${DESTDIR}/usr/lib/libpoppler.* From f59b16b4465da67ec93084ee7d6bf0f3dc72bf28 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 22 May 2017 07:35:05 +0000 Subject: [PATCH 0794/1145] poppler-qt5: update to 0.55.0. --- srcpkgs/poppler-qt5/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index 1d2df9f34b..34d5142ef1 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,24 +4,24 @@ # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=0.54.0 +version=0.55.0 revision=1 wrksrc="poppler-${version}" build_style=gnu-configure -configure_args="--enable-zlib --enable-libcurl --enable-libjpeg - --enable-libtiff --disable-libopenjpeg --enable-cairo-output +configure_args="--enable-zlib --enable-libcurl --enable-libtiff + --enable-libopenjpeg=openjpeg2 --enable-cairo-output --enable-xpdf-headers --disable-gtk-test --disable-poppler-glib --disable-poppler-qt4 --enable-poppler-qt5 --disable-poppler-cpp --disable-utils --disable-static --disable-introspection" hostmakedepends="pkg-config qt5-devel" makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel - fontconfig-devel cairo-devel qt5-devel" + fontconfig-devel cairo-devel libopenjpeg2-devel qt5-devel" short_desc="PDF rendering library - Qt5 bindings" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/poppler-$version.tar.xz" -checksum=10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 +checksum=537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 post_install() { rm -f ${DESTDIR}/usr/lib/libpoppler.* From 81474ed8e4443f88edb54d839681ef6f7af04c1c Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 24 May 2017 13:49:14 +0200 Subject: [PATCH 0795/1145] New package: logstalgia-1.0.7 --- srcpkgs/logstalgia/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/logstalgia/template diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template new file mode 100644 index 0000000000..797974f3d1 --- /dev/null +++ b/srcpkgs/logstalgia/template @@ -0,0 +1,14 @@ +# Template file for 'logstalgia' +pkgname=logstalgia +version=1.0.7 +revision=1 +wrksrc="$pkgname-$version" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="freetype-devel pcre-devel glew-devel SDL2_image-devel boost-devel glm" +short_desc="Replay or stream website access logs as a retro arcade game" +maintainer="Andrea Brancaleoni " +license="GPL-3" +homepage="https://github.com/acaudwell/Logstalgia/" +distfiles="$homepage/releases/download/$pkgname-$version/$pkgname-$version.tar.gz" +checksum=5553fd03fb7be564538fe56e871eac6e3caf56f40e8abc4602d2553964f8f0e1 From 29759c7aaf5e29dcfaa0a627ce6af24193596f92 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 12:15:48 +0200 Subject: [PATCH 0796/1145] di: update to 4.44. --- srcpkgs/di/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/di/template b/srcpkgs/di/template index 6baae15459..74d102b75d 100644 --- a/srcpkgs/di/template +++ b/srcpkgs/di/template @@ -1,15 +1,15 @@ # Template file for 'di' pkgname=di -version=4.43 +version=4.44 revision=1 build_style=gnu-makefile make_install_args="INSTALL_DIR=\${DESTDIR}/usr" short_desc="A disk information utility" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " homepage="https://gentoo.com/di" license="zlib" distfiles="https://gentoo.com/di/${pkgname}-${version}.tar.gz" -checksum=c8374d2ab7a82274d733be01639f48440accf4c70c70b152f5fa3b1c8a9745e0 +checksum=963d00cadbf5a115ff31b31b0d6141be751c7b0a209e50990cb78e36d1a50320 post_install() { vlicense LICENSE From 31f0f9211d3bb8fa8186168ab2ac8094d9ae8be6 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 13:04:55 +0200 Subject: [PATCH 0797/1145] txr: update to 176. --- srcpkgs/txr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index 70bedb84d8..a834c0363f 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -1,6 +1,6 @@ # Template file for 'txr' pkgname=txr -version=174 +version=176 revision=1 build_style=configure hostmakedepends="bison flex" @@ -9,7 +9,7 @@ maintainer="Oliver Kiddle " license="2-clause-BSD" homepage="http://www.nongnu.org/txr/" distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2" -checksum=209fe8290081b1bc61c622cf2bf2ea330f2bea742508eb4d6b2589878f83fbe2 +checksum=239c14f0aaf2bc700a6fd7279b87e2d78f7170a73555e7b46a9cc6a74da5c8b3 case "$XBPS_TARGET_MACHINE" in aarch64*) broken="#error port me!" ;; From 16235ffb066b75d90acf2632dea42ec89a3d81db Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 13:07:39 +0200 Subject: [PATCH 0798/1145] dmidecode: update to 3.1. --- srcpkgs/dmidecode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template index b9ef9dc438..dbcb654bfa 100644 --- a/srcpkgs/dmidecode/template +++ b/srcpkgs/dmidecode/template @@ -1,6 +1,6 @@ # Template file for 'dmidecode' pkgname=dmidecode -version=3.0 +version=3.1 revision=1 build_style=gnu-makefile make_build_args="prefix=/usr sbindir=/usr/bin" @@ -10,4 +10,4 @@ maintainer="Juan RP " homepage="http://www.nongnu.org/dmidecode" license="GPL-2" distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45 +checksum=d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0 From 63dffbb2da29090d321521c924506b547fc60235 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 13:08:52 +0200 Subject: [PATCH 0799/1145] file: update to 5.31. --- srcpkgs/file/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/file/template b/srcpkgs/file/template index d44fec11a1..432296fa98 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -1,6 +1,6 @@ # Template file for 'file' pkgname=file -version=5.30 +version=5.31 revision=1 bootstrap=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.darwinsys.com/file/" license="2-clause-BSD" distfiles="ftp://ftp.astron.com/pub/file/file-${version}.tar.gz" -checksum=694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 +checksum=09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee if [ "$CROSS_BUILD" ]; then # XXX cross compilation needs exactly the same version for the host From 11e0f2888775e135d54361e5bf160444e531f14f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 13:12:46 +0200 Subject: [PATCH 0800/1145] linux4.1: fix update-check. --- srcpkgs/linux4.1/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/linux4.1/update diff --git a/srcpkgs/linux4.1/update b/srcpkgs/linux4.1/update new file mode 100644 index 0000000000..744199631e --- /dev/null +++ b/srcpkgs/linux4.1/update @@ -0,0 +1 @@ +pattern='linux-\K4\.1\.[\d.]+(?=\.tar\.xz)' From 83016501eaf7efce62c60da1b1463b89dc1c05bf Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 13:50:04 +0200 Subject: [PATCH 0801/1145] linux4.4: update to 4.4.69. --- srcpkgs/linux4.4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index a56450eda6..9d7afbee81 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,6 +1,6 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.66 +version=4.4.69 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -8,7 +8,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=9a440787c938b5a8850a274cf3cf726ba5b276e1f937ec3761c3b7dff420d483 +checksum=207bbc50aaf827d667a2762312bd6127887cc669ff7a7270b876e7102b8f84fa nocross=yes nodebug=yes From cf2190abedcedc23ac50f028dde8a3e77cadb5e7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 16:03:26 +0200 Subject: [PATCH 0802/1145] linux3.14: removed, EOL since 2016-11-11. --- srcpkgs/linux3.14/files/i386-dotconfig | 6733 ---------------------- srcpkgs/linux3.14/files/x86_64-dotconfig | 6733 ---------------------- srcpkgs/linux3.14/template | 217 - 3 files changed, 13683 deletions(-) delete mode 100644 srcpkgs/linux3.14/files/i386-dotconfig delete mode 100644 srcpkgs/linux3.14/files/x86_64-dotconfig delete mode 100644 srcpkgs/linux3.14/template diff --git a/srcpkgs/linux3.14/files/i386-dotconfig b/srcpkgs/linux3.14/files/i386-dotconfig deleted file mode 100644 index f183741955..0000000000 --- a/srcpkgs/linux3.14/files/i386-dotconfig +++ /dev/null @@ -1,6733 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.38 Kernel Configuration -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ZONE_DMA32 is not set -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_32_SMP=y -CONFIG_X86_HT=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="_1" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -# CONFIG_IRQ_DOMAIN_DEBUG is not set -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_KTIME_SCALAR=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -# CONFIG_TICK_CPU_ACCOUNTING is not set -CONFIG_IRQ_TIME_ACCOUNTING=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y - -# -# RCU Subsystem -# -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_FANOUT=32 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y -# CONFIG_TREE_RCU_TRACE is not set -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=1 -CONFIG_RCU_BOOST_DELAY=500 -CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_NOCB_CPU_NONE is not set -# CONFIG_RCU_NOCB_CPU_ZERO is not set -CONFIG_RCU_NOCB_CPU_ALL=y -CONFIG_IKCONFIG=m -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_SWAP_ENABLED=y -CONFIG_MEMCG_KMEM=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -# CONFIG_EXPERT is not set -CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_PCI_QUIRKS=y -# CONFIG_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -CONFIG_OPROFILE_EVENT_MULTIPLEX=y -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y -# CONFIG_JUMP_LABEL is not set -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_UPROBES=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE is not set -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_MODULE_SIG=y -# CONFIG_MODULE_SIG_FORCE is not set -CONFIG_MODULE_SIG_ALL=y -# CONFIG_MODULE_SIG_SHA1 is not set -# CONFIG_MODULE_SIG_SHA224 is not set -# CONFIG_MODULE_SIG_SHA256 is not set -# CONFIG_MODULE_SIG_SHA384 is not set -CONFIG_MODULE_SIG_SHA512=y -CONFIG_MODULE_SIG_HASH="sha512" -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_LBDAF=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_THROTTLING=y -CONFIG_BLK_CMDLINE_PARSER=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_CMDLINE_PARTITION=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_ZONE_DMA=y -CONFIG_SMP=y -CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_X86_INTEL_LPSS=y -# CONFIG_X86_32_IRIS is not set -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_PARAVIRT_SPINLOCKS is not set -CONFIG_XEN=y -CONFIG_XEN_DOM0=y -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=64 -CONFIG_XEN_SAVE_RESTORE=y -# CONFIG_XEN_DEBUG_FS is not set -CONFIG_KVM_GUEST=y -CONFIG_KVM_DEBUG_FS=y -# CONFIG_LGUEST_GUEST is not set -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_PARAVIRT_CLOCK=y -CONFIG_NO_BOOTMEM=y -# CONFIG_MEMTEST is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -CONFIG_M686=y -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MELAN is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -# CONFIG_X86_GENERIC is not set -CONFIG_X86_INTERNODE_CACHE_SHIFT=5 -CONFIG_X86_L1_CACHE_SHIFT=5 -# CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=5 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -CONFIG_SWIOTLB=y -CONFIG_IOMMU_HELPER=y -CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_X86_UP_APIC_MSI=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_MCE=y -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y -# CONFIG_X86_ANCIENT_MCE is not set -CONFIG_X86_MCE_THRESHOLD=y -CONFIG_X86_MCE_INJECT=m -CONFIG_X86_THERMAL_VECTOR=y -CONFIG_VM86=y -CONFIG_X86_16BIT=y -CONFIG_X86_ESPFIX32=y -# CONFIG_TOSHIBA is not set -CONFIG_I8K=m -# CONFIG_X86_REBOOTFIXUPS is not set -CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -# CONFIG_MICROCODE_INTEL_EARLY is not set -# CONFIG_MICROCODE_AMD_EARLY is not set -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -# CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_NEED_NODE_MEMMAP_SIZE=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ILLEGAL_POINTER_VALUE=0 -CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_NEED_BOUNCE_POOL=y -CONFIG_VIRT_TO_BUS=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CLEANCACHE=y -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -CONFIG_ZBUD=y -CONFIG_ZSWAP=y -CONFIG_ZSMALLOC=y -CONFIG_PGTABLE_MAPPING=y -# CONFIG_HIGHPTE is not set -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW=64 -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y -CONFIG_EFI=y -CONFIG_EFI_STUB=y -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -# CONFIG_KEXEC_JUMP is not set -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y - -# -# Power management and ACPI options -# -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set -CONFIG_PM_RUNTIME=y -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_CLK=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_EC_DEBUGFS=m -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_IPMI=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m -# CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_EINJ=m -CONFIG_ACPI_APEI_ERST_DEBUG=m -CONFIG_ACPI_EXTLOG=m -CONFIG_SFI=y -# CONFIG_APM is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# x86 CPU frequency scaling drivers -# -CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ_CPB=y -# CONFIG_X86_POWERNOW_K6 is not set -# CONFIG_X86_POWERNOW_K7 is not set -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_GX_SUSPMOD is not set -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -# CONFIG_X86_SPEEDSTEP_ICH is not set -# CONFIG_X86_SPEEDSTEP_SMI is not set -CONFIG_X86_P4_CLOCKMOD=m -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -# CONFIG_X86_LONGRUN is not set -# CONFIG_X86_LONGHAUL is not set -# CONFIG_X86_E_POWERSAVER is not set - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=m - -# -# CPU Idle -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set -CONFIG_INTEL_IDLE=y - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_XEN=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_PCIEAER=y -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEAER_INJECT=m -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -# CONFIG_PCIEASPM_POWERSAVE is not set -CONFIG_PCIEASPM_PERFORMANCE=y -CONFIG_PCIE_PME=y -CONFIG_PCI_MSI=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_HT_IRQ=y -CONFIG_PCI_ATS=y -CONFIG_PCI_IOV=y -CONFIG_PCI_PRI=y -CONFIG_PCI_PASID=y -CONFIG_PCI_IOAPIC=y -CONFIG_PCI_LABEL=y - -# -# PCI host controller drivers -# -CONFIG_ISA_DMA_API=y -# CONFIG_ISA is not set -# CONFIG_SCx200 is not set -# CONFIG_ALIX is not set -# CONFIG_NET5501 is not set -# CONFIG_GEOS is not set -CONFIG_AMD_NB=y -CONFIG_PCCARD=m -# CONFIG_PCMCIA is not set -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_IBM is not set -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_RAPIDIO=m -CONFIG_RAPIDIO_TSI721=m -CONFIG_RAPIDIO_DISC_TIMEOUT=30 -CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y -CONFIG_RAPIDIO_DMA_ENGINE=y -CONFIG_RAPIDIO_DEBUG=y -CONFIG_RAPIDIO_ENUM_BASIC=m - -# -# RapidIO Switch drivers -# -CONFIG_RAPIDIO_TSI57X=m -CONFIG_RAPIDIO_CPS_XX=m -CONFIG_RAPIDIO_TSI568=m -CONFIG_RAPIDIO_CPS_GEN2=m -# CONFIG_X86_SYSFB is not set - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -CONFIG_HAVE_AOUT=y -# CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_MISC=m -CONFIG_COREDUMP=y -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_IOSF_MBI=m -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_IP_FIB_TRIE_STATS is not set -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_INET_UDP_DIAG is not set -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=m -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_DEFAULT_RENO=y -CONFIG_DEFAULT_TCP_CONG="reno" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -# CONFIG_IPV6_MROUTE is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CONNTRACK_PROCFS is not set -CONFIG_NF_CONNTRACK_EVENTS=y -# CONFIG_NF_CONNTRACK_TIMEOUT is not set -# CONFIG_NF_CONNTRACK_TIMESTAMP is not set -CONFIG_NF_CONNTRACK_LABELS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_QUEUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_INET=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m -CONFIG_NFT_CT=m -CONFIG_NFT_RBTREE=m -CONFIG_NFT_HASH=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_NAT=m -CONFIG_NFT_QUEUE=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_REJECT_INET=m -CONFIG_NFT_COMPAT=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -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_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPCOMP=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_L2TP=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NETPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_REJECT_IPV4=m -CONFIG_NF_TABLES_ARP=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -# CONFIG_IP_NF_SECURITY is not set -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m -CONFIG_NFT_REJECT_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -# CONFIG_IP6_NF_SECURITY is not set -CONFIG_NF_NAT_IPV6=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -CONFIG_NF_TABLES_BRIDGE=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -# CONFIG_NET_DCCPPROBE is not set -CONFIG_IP_SCTP=m -# CONFIG_NET_SCTPPROBE is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -CONFIG_RDS=m -# CONFIG_RDS_RDMA is not set -CONFIG_RDS_TCP=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -CONFIG_TIPC_PORTS=8191 -CONFIG_TIPC_MEDIA_IB=y -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -CONFIG_L2TP_DEBUGFS=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_GARP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -# CONFIG_DECNET is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_IPX=m -CONFIG_IPX_INTERN=y -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_PHONET=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_6LOWPAN_IPHC=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=m -CONFIG_NET_SCH_HHF=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -# CONFIG_NET_CLS_CGROUP is not set -CONFIG_NET_CLS_BPF=m -# CONFIG_NET_EMATCH is not set -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -CONFIG_DCB=y -CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=y -CONFIG_OPENVSWITCH_VXLAN=y -CONFIG_VSOCKETS=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y -CONFIG_NETLINK_DIAG=m -CONFIG_NET_MPLS_GSO=m -CONFIG_HSR=m -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=m -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_NET_TCPPROBE is not set -# CONFIG_NET_DROP_MONITOR is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -# CONFIG_TOSHIBA_FIR is not set -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_REGULATOR=m -CONFIG_RFKILL_GPIO=m -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_RDMA is not set -# CONFIG_NET_9P_DEBUG is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -CONFIG_CAIF_USB=m -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y -CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m -CONFIG_NFC_NCI=m -CONFIG_NFC_NCI_SPI=y -CONFIG_NFC_HCI=m -# CONFIG_NFC_SHDLC is not set - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_MEI_PHY=m -CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m -CONFIG_NFC_PN544=m -CONFIG_NFC_PN544_MEI=m -CONFIG_NFC_MICROREAD=m -CONFIG_NFC_MICROREAD_MEI=m -CONFIG_NFC_MRVL=m -CONFIG_NFC_MRVL_USB=m - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -CONFIG_SYS_HYPERVISOR=y -# CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y - -# -# Bus devices -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK is not set -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_SM_FTL is not set -# CONFIG_MTD_OOPS is not set -CONFIG_MTD_SWAP=m - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_TS5500 is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -CONFIG_MTD_DOCG3=m -CONFIG_BCH_CONST_M=14 -CONFIG_BCH_CONST_T=4 -# CONFIG_MTD_NAND is not set -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_UBI is not set -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_GSC is not set -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_BLK_DEV_FD=m -# CONFIG_PARIDE is not set -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m -CONFIG_BLK_DEV_OSD=m -CONFIG_BLK_DEV_SX8=m -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=m -# CONFIG_BLK_DEV_HD is not set -CONFIG_BLK_DEV_RBD=m -CONFIG_BLK_DEV_RSXX=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m -CONFIG_ATMEL_PWM=m -CONFIG_DUMMY_IRQ=m -# CONFIG_IBM_ASM is not set -CONFIG_PHANTOM=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ATMEL_SSC=m -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_CS5535_MFGPT=m -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -CONFIG_CS5535_CLOCK_EVENT_SRC=m -CONFIG_HP_ILO=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1780=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -CONFIG_TI_DAC7512=m -CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y -CONFIG_BMP085_I2C=m -CONFIG_BMP085_SPI=m -CONFIG_PCH_PHUB=m -CONFIG_USB_SWITCH_FSA9480=m -CONFIG_LATTICE_ECP3_CONFIG=m -CONFIG_SRAM=y -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93XX46=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m - -# -# Altera FPGA firmware download module -# -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=m -CONFIG_VMWARE_VMCI=m - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_FC_TGT_ATTRS is not set -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVSAS_TASKLET is not set -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ESAS2R=m -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT2SAS_LOGGING is not set -CONFIG_SCSI_MPT3SAS=m -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT3SAS_LOGGING is not set -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -CONFIG_SCSI_UFSHCD_PLATFORM=m -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -# CONFIG_SCSI_FLASHPOINT is not set -CONFIG_VMWARE_PVSCSI=m -CONFIG_HYPERV_STORAGE=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -CONFIG_SCSI_EATA_TAGGED_QUEUE=y -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_ISCI=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -# CONFIG_SCSI_IPR_TRACE is not set -# CONFIG_SCSI_IPR_DUMP is not set -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_TCM_QLA2XXX=m -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PM8001=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_DH=m -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=0 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_AHCI_IMX=m -CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=m -CONFIG_SATA_HIGHBANK=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_RCAR=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -# CONFIG_PATA_CS5535 is not set -CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -CONFIG_PATA_HPT3X3_DMA=y -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SCH=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# PIO-only SFF controllers -# -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_RZ1000=m - -# -# Generic fallback / legacy drivers -# -CONFIG_PATA_ACPI=m -CONFIG_ATA_GENERIC=m -# CONFIG_PATA_LEGACY is not set -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m -CONFIG_DM_CACHE_CLEANER=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_DM_FLAKEY=m -CONFIG_DM_VERITY=m -CONFIG_DM_SWITCH=m -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_SBP_TARGET=m -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LAN is not set -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y -CONFIG_I2O_CONFIG=m -# CONFIG_I2O_CONFIG_OLD_IOCTL is not set -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=m -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -CONFIG_NET_FC=y -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_VXLAN=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_NTB_NETDEV=m -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_VIRTIO_NET=m -CONFIG_NLMON=m -CONFIG_SUNGEM_PHY=m -# CONFIG_ARCNET is not set -CONFIG_ATM_DRIVERS=y -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -CONFIG_ATM_NICSTAR_USE_SUNI=y -CONFIG_ATM_NICSTAR_USE_IDT77105=y -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_ATM_SOLOS=m - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m -CONFIG_CAIF_VIRTIO=m -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_RING=m -CONFIG_VHOST=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123_61_65=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD8111_ETH=m -CONFIG_PCNET32=y -CONFIG_NET_VENDOR_ARC=y -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_ALX=m -CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=m -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CALXEDA_XGMAC=m -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF=m -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_DNET=m -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -# CONFIG_PCMCIA_XIRCOM is not set -CONFIG_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_NET_VENDOR_HP=y -CONFIG_HP100=m -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=y -CONFIG_E1000=y -CONFIG_E1000E=y -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -# CONFIG_IXGBE_DCB is not set -CONFIG_IXGBEVF=m -CONFIG_I40E=m -CONFIG_I40E_VXLAN=y -CONFIG_I40E_DCB=y -CONFIG_I40EVF=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_IP1000=m -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -# CONFIG_SKGE_GENESIS is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_MLX5_CORE=m -CONFIG_NET_VENDOR_MICREL=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=m -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=m -CONFIG_NET_VENDOR_OKI=y -# CONFIG_PCH_GBE is not set -CONFIG_ETHOC=m -# CONFIG_NET_PACKET_ENGINE is not set -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLCNIC_SRIOV=y -CONFIG_QLCNIC_DCB=y -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R8169=m -CONFIG_SH_ETH=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_EPIC100=m -CONFIG_SMSC911X=m -# CONFIG_SMSC911X_ARCH_HOOKS is not set -CONFIG_SMSC9420=m -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -CONFIG_STMMAC_PLATFORM=y -CONFIG_STMMAC_PCI=y -# CONFIG_STMMAC_DEBUG_FS is not set -# CONFIG_STMMAC_DA is not set -CONFIG_NET_VENDOR_SUN=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=m -CONFIG_WIZNET_W5300=m -# CONFIG_WIZNET_BUS_DIRECT is not set -# CONFIG_WIZNET_BUS_INDIRECT is not set -CONFIG_WIZNET_BUS_ANY=y -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_NET_SB1000=m -CONFIG_PHYLIB=y - -# -# MII PHY device drivers -# -CONFIG_AT803X_PHY=m -CONFIG_AMD_PHY=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_BCM87XX_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_MICREL_PHY=m -# CONFIG_FIXED_PHY is not set -CONFIG_MDIO_BITBANG=m -CONFIG_MDIO_GPIO=m -CONFIG_MICREL_KS8995MA=m -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9700=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_WLAN=y -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_AIRO=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m -# CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_ATH_COMMON=m -CONFIG_ATH_CARDS=m -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -# CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_WOW=y -CONFIG_ATH9K_LEGACY_RATE_CONTROL=y -CONFIG_ATH9K_RFKILL=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -CONFIG_CARL9170_HWRNG=y -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -# CONFIG_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -# CONFIG_WIL6210_TRACING is not set -CONFIG_ATH10K=m -CONFIG_ATH10K_PCI=m -# CONFIG_ATH10K_DEBUG is not set -# CONFIG_ATH10K_DEBUGFS is not set -# CONFIG_ATH10K_TRACING is not set -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set -CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_SSB=y -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -# CONFIG_B43LEGACY_DEBUG is not set -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -# CONFIG_BRCMFMAC is not set -# CONFIG_BRCM_TRACING is not set -# CONFIG_BRCMDBG is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -# CONFIG_IWLWIFI_DEVICE_TRACING is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_HERMES=m -CONFIG_HERMES_PRISM=y -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_ORINOCO_USB=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -# CONFIG_P54_SPI_DEFAULT_EEPROM is not set -CONFIG_P54_LEDS=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_PCI=m -CONFIG_RTLWIFI_USB=m -CONFIG_RTLWIFI_DEBUG=y -CONFIG_RTL8192C_COMMON=m -CONFIG_WL_TI=y -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -CONFIG_WLCORE_SPI=m -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m -CONFIG_CW1200=m -CONFIG_CW1200_WLAN_SDIO=m -CONFIG_CW1200_WLAN_SPI=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -CONFIG_IEEE802154_MRF24J40=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_VMXNET3=m -CONFIG_HYPERV_NET=m -# CONFIG_ISDN is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_QT2160=m -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TCA8418=m -# CONFIG_KEYBOARD_MATRIX is not set -# CONFIG_KEYBOARD_LM8323 is not set -CONFIG_KEYBOARD_LM8333=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -# CONFIG_KEYBOARD_NEWTON is not set -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_SAMSUNG=m -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -CONFIG_KEYBOARD_STMPE=m -# CONFIG_KEYBOARD_XTKBD is not set -CONFIG_KEYBOARD_CROS_EC=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_CYPRESS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_SERIAL=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_CYAPA=m -CONFIG_MOUSE_VSXXXAA=m -# CONFIG_MOUSE_GPIO is not set -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_AS5011=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m -CONFIG_TOUCHSCREEN_BU21013=m -CONFIG_TOUCHSCREEN_CY8CTMG110=m -CONFIG_TOUCHSCREEN_CYTTSP_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP_SPI=m -CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m -CONFIG_TOUCHSCREEN_DA9052=m -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_ILI210X=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -# CONFIG_TOUCHSCREEN_UCB1400 is not set -CONFIG_TOUCHSCREEN_PIXCIR=m -# CONFIG_TOUCHSCREEN_WM831X is not set -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m -CONFIG_TOUCHSCREEN_TSC2005=m -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_W90X900=m -# CONFIG_TOUCHSCREEN_PCAP is not set -CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_STMPE=m -CONFIG_TOUCHSCREEN_SUR40=m -CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_TOUCHSCREEN_ZFORCE=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_AD714X_I2C=m -CONFIG_INPUT_AD714X_SPI=m -CONFIG_INPUT_ARIZONA_HAPTICS=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_MPU3050=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_GP2A=m -CONFIG_INPUT_GPIO_TILT_POLLED=m -# CONFIG_INPUT_WISTRON_BTNS is not set -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set -CONFIG_INPUT_DA9052_ONKEY=m -# CONFIG_INPUT_WM831X_ON is not set -# CONFIG_INPUT_PCAP is not set -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_IMS_PCU=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -CONFIG_INPUT_IDEAPAD_SLIDEBAR=m - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_ARC_PS2=m -CONFIG_HYPERV_KEYBOARD=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_NOZOMI=m -CONFIG_ISI=m -CONFIG_N_HDLC=m -CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m -CONFIG_DEVKMEM=y - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_8250_DW=m - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX310X=y -CONFIG_SERIAL_MRST_MAX3110=m -CONFIG_SERIAL_MFD_HSU=m -CONFIG_SERIAL_UARTLITE=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_SCCNXP=y -CONFIG_SERIAL_SCCNXP_CONSOLE=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -CONFIG_SERIAL_IFX6X60=m -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -CONFIG_SERIAL_FSL_LPUART=m -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=m -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_ATMEL=m -CONFIG_HW_RANDOM_GEODE=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -# CONFIG_HW_RANDOM_EXYNOS is not set -CONFIG_HW_RANDOM_TPM=m -CONFIG_NVRAM=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -# CONFIG_SONYPI is not set -CONFIG_MWAVE=m -# CONFIG_PC8736x_GPIO is not set -# CONFIG_NSC_GPIO is not set -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HPET_MMAP_DEFAULT=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_TIS_I2C_ATMEL=m -CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_TCG_TIS_I2C_NUVOTON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=m -CONFIG_TCG_XEN=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=m - -# -# Multiplexer I2C Chip support -# -CONFIG_I2C_MUX_GPIO=m -CONFIG_I2C_MUX_PCA9541=m -CONFIG_I2C_MUX_PCA954x=m -CONFIG_I2C_MUX_PINCTRL=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_ISMT=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# ACPI drivers -# -CONFIG_I2C_SCMI=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_CBUS_GPIO=m -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PLATFORM=m -CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_EG20T=m -CONFIG_I2C_GPIO=m -CONFIG_I2C_KEMPLD=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -# CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -# CONFIG_I2C_XILINX is not set - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_ROBOTFUZZ_OSIF=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_SC18IS602=m -CONFIG_SPI_TOPCLIFF_PCH=m -CONFIG_SPI_XCOMM=m -CONFIG_SPI_XILINX=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_DW_PCI=m -CONFIG_SPI_DW_MID_DMA=y -CONFIG_SPI_DW_MMIO=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m -CONFIG_HSI=m -CONFIG_HSI_BOARDINFO=y - -# -# HSI clients -# -CONFIG_HSI_CHAR=m - -# -# PPS support -# -CONFIG_PPS=y -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -CONFIG_PPS_CLIENT_KTIMER=m -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=y - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PTP_1588_CLOCK_PCH=m -CONFIG_PINCTRL=y - -# -# Pin controllers -# -CONFIG_PINMUX=y -CONFIG_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_ACPI=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=m -CONFIG_GPIO_DA9052=m -CONFIG_GPIO_MAX730X=m - -# -# Memory mapped GPIO drivers: -# -CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_GPIO_IT8761E=m -CONFIG_GPIO_F7188X=m -CONFIG_GPIO_SCH311X=m -CONFIG_GPIO_TS5500=m -CONFIG_GPIO_SCH=m -CONFIG_GPIO_ICH=m -CONFIG_GPIO_VX855=m -CONFIG_GPIO_LYNXPOINT=y - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_ARIZONA=m -CONFIG_GPIO_LP3943=m -CONFIG_GPIO_MAX7300=m -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_STMPE=y -# CONFIG_GPIO_TPS65912 is not set -# CONFIG_GPIO_WM831X is not set -CONFIG_GPIO_ADP5588=m - -# -# PCI GPIO expanders: -# -CONFIG_GPIO_CS5535=m -CONFIG_GPIO_AMD8111=m -# CONFIG_GPIO_INTEL_MID is not set -CONFIG_GPIO_PCH=m -CONFIG_GPIO_ML_IOH=m -CONFIG_GPIO_TIMBERDALE=y -CONFIG_GPIO_RDC321X=m - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MC33880=m - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=m - -# -# LPC GPIO expanders: -# -CONFIG_GPIO_KEMPLD=m - -# -# MODULbus GPIO expanders: -# -CONFIG_GPIO_JANZ_TTL=m - -# -# USB GPIO expanders: -# -CONFIG_GPIO_VIPERBOARD=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2408_READBACK=y -CONFIG_W1_SLAVE_DS2413=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -CONFIG_W1_SLAVE_DS2433_CRC=y -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_DS2781=m -CONFIG_W1_SLAVE_DS28E04=m -CONFIG_W1_SLAVE_BQ27000=m -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_GENERIC_ADC_BATTERY=m -# CONFIG_WM831X_BACKUP is not set -# CONFIG_WM831X_POWER is not set -CONFIG_TEST_POWER=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2780=m -CONFIG_BATTERY_DS2781=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_SBS=m -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_BQ27X00_I2C=y -CONFIG_BATTERY_BQ27X00_PLATFORM=y -CONFIG_BATTERY_DA9052=m -CONFIG_BATTERY_MAX17040=m -CONFIG_BATTERY_MAX17042=m -CONFIG_CHARGER_PCF50633=m -CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_MAX8903=m -CONFIG_CHARGER_LP8727=m -CONFIG_CHARGER_GPIO=m -CONFIG_CHARGER_MANAGER=y -CONFIG_CHARGER_BQ2415X=m -CONFIG_CHARGER_BQ24190=m -CONFIG_CHARGER_BQ24735=m -CONFIG_CHARGER_SMB347=m -# CONFIG_POWER_RESET is not set -CONFIG_POWER_AVS=y -CONFIG_HWMON=m -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7314=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7X10=m -CONFIG_SENSORS_ADT7310=m -CONFIG_SENSORS_ADT7410=m -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_K10TEMP=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_DA9052_ADC=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_GPIO_FAN=m -CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_HTU21=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IIO_HWMON=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_JC42=m -CONFIG_SENSORS_LINEAGE=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM73=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_LM95234=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NCT6775=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_PMBUS=m -CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_LM25066=m -CONFIG_SENSORS_LTC2978=m -CONFIG_SENSORS_MAX16064=m -CONFIG_SENSORS_MAX34440=m -CONFIG_SENSORS_MAX8688=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_ZL6100=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMM665=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -CONFIG_SENSORS_SCH5636=m -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=m -CONFIG_SENSORS_INA2XX=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA_CPUTEMP=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -# CONFIG_SENSORS_WM831X is not set -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_ATK0110=m -CONFIG_THERMAL=m -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_GOV_FAIR_SHARE is not set -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_GOV_USER_SPACE=y -# CONFIG_THERMAL_EMULATION is not set -CONFIG_INTEL_POWERCLAMP=m -CONFIG_X86_PKG_TEMP_THERMAL=m -CONFIG_ACPI_INT3403_THERMAL=m - -# -# Texas Instruments thermal drivers -# -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_DA9052_WATCHDOG=m -# CONFIG_WM831X_WATCHDOG is not set -CONFIG_DW_WATCHDOG=m -CONFIG_RETU_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m -CONFIG_GEODE_WDT=m -CONFIG_SC520_WDT=m -CONFIG_SBC_FITPC2_WATCHDOG=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_IE6XX_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_KEMPLD_WDT=m -CONFIG_HPWDT_NMI_DECODING=y -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -# CONFIG_SBC7240_WDT is not set -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_VIA_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m -CONFIG_MEN_A21_WDT=m -CONFIG_XEN_WDT=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y -CONFIG_SSB_DRIVER_GPIO=y -CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -CONFIG_BCMA_HOST_SOC=y -CONFIG_BCMA_DRIVER_GMAC_CMN=y -CONFIG_BCMA_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=m -CONFIG_MFD_CROS_EC=m -CONFIG_MFD_CROS_EC_I2C=m -CONFIG_PMIC_DA9052=y -CONFIG_MFD_DA9052_SPI=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_MC13XXX_SPI=m -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_HTC_PASIC3=m -CONFIG_LPC_ICH=m -CONFIG_LPC_SCH=m -CONFIG_MFD_JANZ_CMODIO=m -CONFIG_MFD_KEMPLD=m -CONFIG_EZX_PCAP=y -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_RDC321X=m -CONFIG_MFD_RTSX_PCI=m -CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_ABX500_CORE=y -CONFIG_MFD_STMPE=y - -# -# STMicroelectronics STMPE Interface Drivers -# -CONFIG_STMPE_SPI=y -CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_MFD_LP3943=m -CONFIG_TPS6105X=m -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65217=m -CONFIG_MFD_TPS65912=y -CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_LM3533=m -CONFIG_MFD_TIMBERDALE=m -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_VX855=m -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -CONFIG_MFD_ARIZONA_SPI=m -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -# CONFIG_MFD_WM8997 is not set -CONFIG_MFD_WM831X=y -CONFIG_MFD_WM831X_SPI=y -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=m -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_USERSPACE_CONSUMER=m -CONFIG_REGULATOR_ACT8865=m -CONFIG_REGULATOR_AD5398=m -CONFIG_REGULATOR_ANATOP=m -CONFIG_REGULATOR_ARIZONA=m -CONFIG_REGULATOR_DA9052=m -CONFIG_REGULATOR_DA9210=m -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_GPIO=m -CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP872X=m -CONFIG_REGULATOR_LP8755=m -CONFIG_REGULATOR_MAX1586=m -CONFIG_REGULATOR_MAX8649=m -CONFIG_REGULATOR_MAX8660=m -CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_MAX8973=m -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_PCAP=m -CONFIG_REGULATOR_PCF50633=m -CONFIG_REGULATOR_PFUZE100=m -CONFIG_REGULATOR_TPS51632=m -CONFIG_REGULATOR_TPS6105X=m -CONFIG_REGULATOR_TPS62360=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_TPS65217=m -CONFIG_REGULATOR_TPS6524X=m -# CONFIG_REGULATOR_TPS65912 is not set -# CONFIG_REGULATOR_WM831X is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_RC_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DMA_CONTIG=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_DVB_CORE=m -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -CONFIG_DVB_DYNAMIC_MINORS=y - -# -# Media drivers -# -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_RC_DECODERS=y -CONFIG_LIRC=m -CONFIG_IR_LIRC_CODEC=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -CONFIG_IR_IMON=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STK1135=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_VIDEO_USBTV=m - -# -# Analog TV USB devices -# -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_TLG2300=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160_COMMON=m -CONFIG_VIDEO_STK1160_AC97=y -CONFIG_VIDEO_STK1160=m - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m - -# -# Digital TV USB devices -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_V4L2=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_MEYE=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_ENABLE_VP3054=y -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7164=m - -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_VIDEO_TIMBERDALE=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_SCALE_CROP=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_VIDEO_RCAR_VIN=m -CONFIG_VIDEO_SH_MOBILE_CSI2=m -CONFIG_VIDEO_SH_MOBILE_CEU=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=m -CONFIG_VIDEO_RENESAS_VSP1=m -# CONFIG_V4L_TEST_DRIVERS is not set - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -# CONFIG_MEDIA_PARPORT_SUPPORT is not set -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_SI4713=m -CONFIG_PLATFORM_SI4713=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_TIMBERDALE=m -CONFIG_RADIO_WL1273=m - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Audio/Video compression chips -# -CONFIG_VIDEO_SAA6752HS=m - -# -# Miscellaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# - -# -# soc_camera sensor drivers -# -CONFIG_SOC_CAMERA_IMX074=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_SOC_CAMERA_MT9T112=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_OV2640=m -CONFIG_SOC_CAMERA_OV5642=m -CONFIG_SOC_CAMERA_OV6650=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_SOC_CAMERA_OV9640=m -CONFIG_SOC_CAMERA_OV9740=m -CONFIG_SOC_CAMERA_RJ54N1=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88TS2022=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_M88DS3103=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_IT913X_FE=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m - -# -# Tools to develop new frontends -# -# CONFIG_DVB_DUMMY_FE is not set - -# -# Graphics support -# -CONFIG_AGP=m -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -# CONFIG_AGP_NVIDIA is not set -CONFIG_AGP_SIS=m -# CONFIG_AGP_SWORKS is not set -CONFIG_AGP_VIA=m -# CONFIG_AGP_EFFICEON is not set -CONFIG_INTEL_GTT=m -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -CONFIG_VGA_SWITCHEROO=y -CONFIG_DRM=m -CONFIG_DRM_USB=m -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set -CONFIG_DRM_TTM=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_UMS is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y -CONFIG_DRM_I915_FBDEV=y -CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y -# CONFIG_DRM_I915_UMS is not set -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_DRM_VMWGFX=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -CONFIG_DRM_MGAG200=m -CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_DRM_QXL=m -CONFIG_DRM_BOCHS=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -# CONFIG_FB_DDC is not set -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -# CONFIG_FB_SVGALIB is not set -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_UVESA=m -CONFIG_FB_VESA=y -CONFIG_FB_EFI=y -# CONFIG_FB_N411 is not set -# CONFIG_FB_HGA is not set -CONFIG_FB_OPENCORES=m -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set -# CONFIG_FB_I810 is not set -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -CONFIG_FB_VIA=m -CONFIG_FB_VIA_DIRECT_PROCFS=y -CONFIG_FB_VIA_X_COMPATIBILITY=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_TMIO is not set -# CONFIG_FB_SM501 is not set -# CONFIG_FB_SMSCUFX is not set -CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=m -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_AUO_K190X is not set -CONFIG_FB_HYPERV=m -# CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_L4F00242T03=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI922X=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_LCD_S6E63M0=m -CONFIG_LCD_LD9040=m -CONFIG_LCD_AMS369FG06=m -CONFIG_LCD_LMS501KF03=m -CONFIG_LCD_HX8357=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_ATMEL_PWM=m -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PWM=m -CONFIG_BACKLIGHT_DA9052=m -CONFIG_BACKLIGHT_APPLE=m -CONFIG_BACKLIGHT_SAHARA=m -# CONFIG_BACKLIGHT_WM831X is not set -CONFIG_BACKLIGHT_ADP8860=m -CONFIG_BACKLIGHT_ADP8870=m -CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_LM3630A=m -CONFIG_BACKLIGHT_LM3639=m -CONFIG_BACKLIGHT_LP855X=m -CONFIG_BACKLIGHT_OT200=m -CONFIG_BACKLIGHT_TPS65217=m -CONFIG_BACKLIGHT_GPIO=m -CONFIG_BACKLIGHT_LV5207LP=m -CONFIG_BACKLIGHT_BD6107=m - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -# CONFIG_LOGO is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -CONFIG_SOUND_OSS_CORE_PRECLAIM=y -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_COMPRESS_OFFLOAD=m -CONFIG_SND_JACK=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_KCTL_JACK=y -CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_RAWMIDI_SEQ=m -CONFIG_SND_OPL3_LIB_SEQ=m -# CONFIG_SND_OPL4_LIB_SEQ is not set -# CONFIG_SND_SBAWE_SEQ is not set -CONFIG_SND_EMU10K1_SEQ=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -# CONFIG_SND_PCSP is not set -CONFIG_SND_DUMMY=m -CONFIG_SND_ALOOP=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1 -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB16_DSP=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ASIHPI=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_ES1968_INPUT=y -# CONFIG_SND_ES1968_RADIO is not set -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=64 -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -CONFIG_SND_HDA_INPUT_JACK=y -# CONFIG_SND_HDA_PATCH_LOADER is not set -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_SIGMATEL=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_CODEC_CIRRUS=m -CONFIG_SND_HDA_CODEC_CONEXANT=m -CONFIG_SND_HDA_CODEC_CA0110=m -CONFIG_SND_HDA_CODEC_CA0132=m -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=m -CONFIG_SND_HDA_CODEC_SI3054=m -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_INPUT=y -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -# CONFIG_SND_SIS7019 is not set -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_SPI=y -CONFIG_SND_AT73C213=m -CONFIG_SND_AT73C213_TARGET_BITRATE=48000 -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m -# CONFIG_SND_FIREWIRE_SPEAKERS is not set -# CONFIG_SND_ISIGHT is not set -CONFIG_SND_SCS1X=m -CONFIG_SND_SOC=m -CONFIG_SND_ATMEL_SOC=m -CONFIG_SND_DESIGNWARE_I2S=m -CONFIG_SND_SOC_I2C_AND_SPI=m -CONFIG_SND_SOC_SI476X=m -CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -CONFIG_HID_APPLEIR=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -CONFIG_HID_ELECOM=m -CONFIG_HID_ELO=m -CONFIG_HID_EZKEY=m -CONFIG_HID_HOLTEK=m -# CONFIG_HOLTEK_FF is not set -CONFIG_HID_HUION=m -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LENOVO_TPKBD=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PRIMAX=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_SONY_FF=y -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_HYPERV_MOUSE=m -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_XINMO=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# I2C HID support -# -CONFIG_I2C_HID=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OTG=y -CONFIG_USB_OTG_WHITELIST=y -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_XHCI_HCD=m -CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=m -CONFIG_USB_EHCI_HCD_PLATFORM=m -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ISP1760_HCD=m -CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_FUSBH200_HCD=m -CONFIG_USB_FOTG210_HCD=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_HCD_PCI=m -CONFIG_USB_OHCI_HCD_SSB=y -CONFIG_USB_OHCI_HCD_PLATFORM=m -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -# CONFIG_USB_SL811_HCD_ISO is not set -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_RENESAS_USBHS_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -CONFIG_USB_HCD_BCMA=m -CONFIG_USB_HCD_SSB=m -# CONFIG_USB_HCD_TEST_MODE is not set -CONFIG_USB_RENESAS_USBHS=m - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_STORAGE_ENE_UB6250=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_USB_MUSB_UX500=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_DWC3=m -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_DUAL_ROLE=y - -# -# Platform Glue Driver Support -# -CONFIG_USB_DWC3_OMAP=m -CONFIG_USB_DWC3_EXYNOS=m -CONFIG_USB_DWC3_PCI=m -CONFIG_USB_DWC3_KEYSTONE=m - -# -# Debugging features -# -# CONFIG_USB_DWC3_DEBUG is not set -CONFIG_USB_DWC2=m -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_CHIPIDEA=m -# CONFIG_USB_CHIPIDEA_UDC is not set -CONFIG_USB_CHIPIDEA_HOST=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_SIMPLE=m -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_F81232=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MXUPORT=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QCAUX=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_ZTE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=m -# CONFIG_USB_SERIAL_DEBUG is not set - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_YUREX=m -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_USB_OTG_FSM=m -CONFIG_NOP_USB_XCEIV=m -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m -CONFIG_USB_GPIO_VBUS=m -CONFIG_TAHVO_USB=m -# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 - -# -# USB Peripheral Controller -# -CONFIG_USB_FOTG210_UDC=m -CONFIG_USB_GR_UDC=m -CONFIG_USB_R8A66597=m -CONFIG_USB_RENESAS_USBHS_UDC=m -CONFIG_USB_PXA27X=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_MV_U3D=m -CONFIG_USB_M66592=m -CONFIG_USB_AMD5536UDC=m -CONFIG_USB_NET2272=m -# CONFIG_USB_NET2272_DMA is not set -CONFIG_USB_NET2280=m -CONFIG_USB_GOKU=m -CONFIG_USB_EG20T=m -CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_PHONET=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_CONFIGFS=m -# CONFIG_USB_CONFIGFS_SERIAL is not set -# CONFIG_USB_CONFIGFS_ACM is not set -# CONFIG_USB_CONFIGFS_OBEX is not set -# CONFIG_USB_CONFIGFS_NCM is not set -# CONFIG_USB_CONFIGFS_ECM is not set -# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set -# CONFIG_USB_CONFIGFS_RNDIS is not set -# CONFIG_USB_CONFIGFS_EEM is not set -# CONFIG_USB_CONFIGFS_PHONET is not set -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -# CONFIG_USB_CONFIGFS_F_LB_SS is not set -# CONFIG_USB_CONFIGFS_F_FS is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_AUDIO=m -CONFIG_GADGET_UAC1=y -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -# CONFIG_USB_FUNCTIONFS_ETH is not set -# CONFIG_USB_FUNCTIONFS_RNDIS is not set -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_GADGET_TARGET=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set -CONFIG_USB_G_NOKIA=m -CONFIG_USB_G_ACM_MS=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_MULTI_RNDIS=y -CONFIG_USB_G_MULTI_CDC=y -CONFIG_USB_G_HID=m -CONFIG_USB_G_DBGP=m -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set -CONFIG_MMC_CLKGATE=y - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -# CONFIG_MMC_RICOH_MMC is not set -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_SDHCI_PXAV2=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_REALTEK_PCI=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m -CONFIG_MS_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -CONFIG_LEDS_ATMEL_PWM=m -CONFIG_LEDS_LM3530=m -CONFIG_LEDS_LM3533=m -CONFIG_LEDS_LM3642=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_PCA9532_GPIO=y -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_LP5562=m -CONFIG_LEDS_LP8501=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_PCA9685=m -# CONFIG_LEDS_WM831X_STATUS is not set -CONFIG_LEDS_DA9052=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_INTEL_SS4200=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_DELL_NETBOOKS=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_BLINKM=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -# CONFIG_ACCESSIBILITY is not set -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_CXGB4=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_OCRDMA=m -CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_SRPT=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_ISERT=m -CONFIG_EDAC=y -CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_MCE_INJ=m -CONFIG_EDAC_MM_EDAC=m -# CONFIG_EDAC_AMD76X is not set -# CONFIG_EDAC_E7XXX is not set -CONFIG_EDAC_E752X=m -# CONFIG_EDAC_I82875P is not set -CONFIG_EDAC_I82975X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I3200=m -CONFIG_EDAC_X38=m -CONFIG_EDAC_I5400=m -CONFIG_EDAC_I7CORE=m -# CONFIG_EDAC_I82860 is not set -# CONFIG_EDAC_R82600 is not set -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_EDAC_I7300=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -CONFIG_RTC_DRV_TEST=m - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_DS3232=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_ISL12057=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF2127=m -CONFIG_RTC_DRV_PCF8523=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_BQ32K=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV3029C2=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m -CONFIG_RTC_DRV_RX4581=m - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_DA9052=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_DS2404=m -CONFIG_RTC_DRV_WM831X=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_PCAP=m -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_MOXART=m - -# -# HID Sensor RTC drivers -# -CONFIG_RTC_DRV_HID_SENSOR_TIME=m -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_INTEL_MID_DMAC=m -CONFIG_INTEL_IOATDMA=m -CONFIG_DW_DMAC_CORE=m -CONFIG_DW_DMAC=m -CONFIG_DW_DMAC_PCI=m -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=m -CONFIG_DMA_ENGINE=y -CONFIG_DMA_ACPI=y - -# -# DMA Clients -# -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y -CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_DMEM_GENIRQ=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -CONFIG_UIO_MF624=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO=m -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_VGA=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=m - -# -# Virtio drivers -# -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set - -# -# Microsoft Hyper-V guest support -# -CONFIG_HYPERV=m -CONFIG_HYPERV_UTILS=m -CONFIG_HYPERV_BALLOON=m - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -# CONFIG_XEN_SELFBALLOONING is not set -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=m -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_ACPI_PROCESSOR=m -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_STAGING=y -CONFIG_ET131X=m -CONFIG_SLICOSS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_HOST=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m -CONFIG_ECHO=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 -CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_KCOMEDILIB=m -CONFIG_COMEDI_BOND=m -CONFIG_COMEDI_TEST=m -CONFIG_COMEDI_PARPORT=m -CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SKEL=m -CONFIG_COMEDI_SSV_DNP=m -# CONFIG_COMEDI_ISA_DRIVERS is not set -CONFIG_COMEDI_PCI_DRIVERS=y -CONFIG_COMEDI_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=m -CONFIG_COMEDI_ADDI_APCI_035=m -CONFIG_COMEDI_ADDI_APCI_1032=m -CONFIG_COMEDI_ADDI_APCI_1500=m -CONFIG_COMEDI_ADDI_APCI_1516=m -CONFIG_COMEDI_ADDI_APCI_1564=m -CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3120=m -CONFIG_COMEDI_ADDI_APCI_3501=m -CONFIG_COMEDI_ADDI_APCI_3XXX=m -CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7X3X=m -CONFIG_COMEDI_ADL_PCI8164=m -CONFIG_COMEDI_ADL_PCI9111=m -CONFIG_COMEDI_ADL_PCI9118=m -CONFIG_COMEDI_ADV_PCI1710=m -CONFIG_COMEDI_ADV_PCI1723=m -CONFIG_COMEDI_ADV_PCI1724=m -CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200_PCI=m -CONFIG_COMEDI_AMPLC_PC236_PCI=m -CONFIG_COMEDI_AMPLC_PC263_PCI=m -CONFIG_COMEDI_AMPLC_PCI224=m -CONFIG_COMEDI_AMPLC_PCI230=m -CONFIG_COMEDI_CONTEC_PCI_DIO=m -CONFIG_COMEDI_DAS08_PCI=m -CONFIG_COMEDI_DT3000=m -CONFIG_COMEDI_DYNA_PCI10XX=m -CONFIG_COMEDI_GSC_HPDI=m -CONFIG_COMEDI_MF6X4=m -CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_DAQBOARD2000=m -CONFIG_COMEDI_JR3_PCI=m -CONFIG_COMEDI_KE_COUNTER=m -CONFIG_COMEDI_CB_PCIDAS64=m -CONFIG_COMEDI_CB_PCIDAS=m -CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIMDAS=m -CONFIG_COMEDI_CB_PCIMDDA=m -CONFIG_COMEDI_ME4000=m -CONFIG_COMEDI_ME_DAQ=m -CONFIG_COMEDI_NI_6527=m -CONFIG_COMEDI_NI_65XX=m -CONFIG_COMEDI_NI_660X=m -CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC_PCI=m -CONFIG_COMEDI_NI_PCIDIO=m -CONFIG_COMEDI_NI_PCIMIO=m -CONFIG_COMEDI_RTD520=m -CONFIG_COMEDI_S626=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIOCMD=m -CONFIG_COMEDI_USB_DRIVERS=y -CONFIG_COMEDI_DT9812=m -CONFIG_COMEDI_USBDUX=m -CONFIG_COMEDI_USBDUXFAST=m -CONFIG_COMEDI_USBDUXSIGMA=m -CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_8255=m -CONFIG_COMEDI_FC=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_DAS08=m -CONFIG_COMEDI_NI_LABPC=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -CONFIG_R8187SE=m -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y -CONFIG_88EU_P2P=y -CONFIG_R8821AE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m -# CONFIG_RTS5208_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -# CONFIG_DX_SEP is not set - -# -# IIO staging drivers -# - -# -# Accelerometers -# -CONFIG_ADIS16201=m -CONFIG_ADIS16203=m -CONFIG_ADIS16204=m -CONFIG_ADIS16209=m -CONFIG_ADIS16220=m -CONFIG_ADIS16240=m -CONFIG_LIS3L02DQ=m -CONFIG_SCA3000=m - -# -# Analog to digital converters -# -CONFIG_AD7291=m -CONFIG_AD7606=m -CONFIG_AD7606_IFACE_PARALLEL=m -CONFIG_AD7606_IFACE_SPI=m -CONFIG_AD799X=m -CONFIG_AD799X_RING_BUFFER=y -CONFIG_AD7780=m -CONFIG_AD7816=m -CONFIG_AD7192=m -CONFIG_AD7280=m - -# -# Analog digital bi-direction converters -# -CONFIG_ADT7316=m -CONFIG_ADT7316_SPI=m -CONFIG_ADT7316_I2C=m - -# -# Capacitance to digital converters -# -CONFIG_AD7150=m -CONFIG_AD7152=m -CONFIG_AD7746=m - -# -# Direct Digital Synthesis -# -CONFIG_AD5930=m -CONFIG_AD9832=m -CONFIG_AD9834=m -CONFIG_AD9850=m -CONFIG_AD9852=m -CONFIG_AD9910=m -CONFIG_AD9951=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16060=m - -# -# Network Analyzer, Impedance Converters -# -CONFIG_AD5933=m - -# -# Light sensors -# -CONFIG_SENSORS_ISL29018=m -CONFIG_SENSORS_ISL29028=m -CONFIG_TSL2583=m -CONFIG_TSL2x7x=m - -# -# Magnetometer sensors -# -CONFIG_SENSORS_HMC5843=m - -# -# Active energy metering IC -# -CONFIG_ADE7753=m -CONFIG_ADE7754=m -CONFIG_ADE7758=m -CONFIG_ADE7759=m -CONFIG_ADE7854=m -CONFIG_ADE7854_I2C=m -CONFIG_ADE7854_SPI=m - -# -# Resolver to digital converters -# -CONFIG_AD2S90=m -CONFIG_AD2S1200=m -CONFIG_AD2S1210=m - -# -# Triggers - standalone -# -CONFIG_IIO_PERIODIC_RTC_TRIGGER=m -CONFIG_IIO_SIMPLE_DUMMY=m -# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set -# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set -CONFIG_FB_SM7XX=m -CONFIG_CRYSTALHD=m -CONFIG_FB_XGI=m -CONFIG_ACPI_QUICKSTART=m -CONFIG_USB_ENESTORAGE=m -CONFIG_BCM_WIMAX=m -CONFIG_FT1000=m -CONFIG_FT1000_USB=m - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m -CONFIG_I2C_BCM2048=m -CONFIG_DVB_CXD2099=m -CONFIG_VIDEO_DT3155=m -CONFIG_DT3155_CCIR=y -CONFIG_DT3155_STREAMING=y -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_USB_MSI3101=m -CONFIG_VIDEO_V4L2_INT_DEVICE=m -CONFIG_VIDEO_TCM825X=m -CONFIG_USB_SN9C102=m -# CONFIG_SOLO6X10 is not set -# CONFIG_LIRC_STAGING is not set - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_USB_WPAN_HCD=m -CONFIG_WIMAX_GDM72XX=m -# CONFIG_WIMAX_GDM72XX_QOS is not set -# CONFIG_WIMAX_GDM72XX_K_MODE is not set -# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set -CONFIG_WIMAX_GDM72XX_USB=y -# CONFIG_WIMAX_GDM72XX_SDIO is not set -# CONFIG_WIMAX_GDM72XX_USB_PM is not set -CONFIG_LTE_GDM724X=m -CONFIG_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_FWTTY_MAX_TOTAL_PORTS=64 -CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_LUSTRE_FS=m -CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 -# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set -CONFIG_LUSTRE_LLITE_LLOOP=m -CONFIG_LNET=m -CONFIG_LNET_MAX_PAYLOAD=1048576 -CONFIG_LNET_SELFTEST=m -CONFIG_LNET_XPRT_IB=m -CONFIG_XILLYBUS=m -CONFIG_XILLYBUS_PCIE=m -CONFIG_DGNC=m -CONFIG_DGAP=m -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_AIO=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_FUJITSU_TABLET=m -CONFIG_AMILO_RFKILL=m -# CONFIG_TC1100_WMI is not set -CONFIG_HP_ACCEL=m -CONFIG_HP_WIRELESS=m -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -CONFIG_SONYPI_COMPAT=y -CONFIG_IDEAPAD_LAPTOP=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_SENSORS_HDAPS=m -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ASUS_WMI=m -CONFIG_ASUS_NB_WMI=m -CONFIG_EEEPC_WMI=m -CONFIG_ACPI_WMI=m -CONFIG_MSI_WMI=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_TOSHIBA_BT_RFKILL=m -CONFIG_ACPI_CMPC=m -CONFIG_INTEL_IPS=m -CONFIG_IBM_RTL=m -CONFIG_XO15_EBOOK=m -CONFIG_SAMSUNG_LAPTOP=m -CONFIG_MXM_WMI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_SAMSUNG_Q10=m -CONFIG_APPLE_GMUX=m -CONFIG_INTEL_RST=m -CONFIG_INTEL_SMARTCONNECT=m -CONFIG_PVPANIC=m -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_LAPTOP=m -CONFIG_CHROMEOS_PSTORE=m -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -CONFIG_COMMON_CLK_WM831X=m -CONFIG_COMMON_CLK_SI5351=m - -# -# Hardware Spinlock drivers -# -CONFIG_CLKSRC_I8253=y -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -CONFIG_MAILBOX=y -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_FLOPPY_WA=y - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=m -CONFIG_STE_MODEM_RPROC=m - -# -# Rpmsg drivers -# -CONFIG_PM_DEVFREQ=y - -# -# DEVFREQ Governors -# -CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y -CONFIG_DEVFREQ_GOV_PERFORMANCE=y -CONFIG_DEVFREQ_GOV_POWERSAVE=y -CONFIG_DEVFREQ_GOV_USERSPACE=y - -# -# DEVFREQ Drivers -# -CONFIG_EXTCON=y - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ADC_JACK=m -CONFIG_EXTCON_ARIZONA=m -CONFIG_MEMORY=y -CONFIG_IIO=m -CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set -CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_TRIGGERED_BUFFER=m -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 - -# -# Accelerometers -# -CONFIG_BMA180=m -CONFIG_HID_SENSOR_ACCEL_3D=m -CONFIG_IIO_ST_ACCEL_3AXIS=m -CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m -CONFIG_KXSD9=m - -# -# Analog to digital converters -# -CONFIG_AD_SIGMA_DELTA=m -CONFIG_AD7266=m -CONFIG_AD7298=m -CONFIG_AD7476=m -CONFIG_AD7791=m -CONFIG_AD7793=m -CONFIG_AD7887=m -CONFIG_AD7923=m -CONFIG_MAX1363=m -CONFIG_MCP320X=m -CONFIG_MCP3422=m -CONFIG_NAU7802=m -CONFIG_TI_ADC081C=m -CONFIG_TI_AM335X_ADC=m -CONFIG_VIPERBOARD_ADC=m - -# -# Amplifiers -# -CONFIG_AD8366=m - -# -# Hid Sensor IIO Common -# -CONFIG_HID_SENSOR_IIO_COMMON=m -CONFIG_HID_SENSOR_IIO_TRIGGER=m -CONFIG_IIO_ST_SENSORS_I2C=m -CONFIG_IIO_ST_SENSORS_SPI=m -CONFIG_IIO_ST_SENSORS_CORE=m - -# -# Digital to analog converters -# -CONFIG_AD5064=m -CONFIG_AD5360=m -CONFIG_AD5380=m -CONFIG_AD5421=m -CONFIG_AD5446=m -CONFIG_AD5449=m -CONFIG_AD5504=m -CONFIG_AD5624R_SPI=m -CONFIG_AD5686=m -CONFIG_AD5755=m -CONFIG_AD5764=m -CONFIG_AD5791=m -CONFIG_AD7303=m -CONFIG_MAX517=m -CONFIG_MCP4725=m - -# -# Frequency Synthesizers DDS/PLL -# - -# -# Clock Generator/Distribution -# -CONFIG_AD9523=m - -# -# Phase-Locked Loop (PLL) frequency synthesizers -# -CONFIG_ADF4350=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16080=m -CONFIG_ADIS16130=m -CONFIG_ADIS16136=m -CONFIG_ADIS16260=m -CONFIG_ADXRS450=m -CONFIG_HID_SENSOR_GYRO_3D=m -CONFIG_IIO_ST_GYRO_3AXIS=m -CONFIG_IIO_ST_GYRO_I2C_3AXIS=m -CONFIG_IIO_ST_GYRO_SPI_3AXIS=m -CONFIG_ITG3200=m - -# -# Humidity sensors -# -CONFIG_DHT11=m - -# -# Inertial measurement units -# -CONFIG_ADIS16400=m -CONFIG_ADIS16480=m -CONFIG_IIO_ADIS_LIB=m -CONFIG_IIO_ADIS_LIB_BUFFER=y -CONFIG_INV_MPU6050_IIO=m - -# -# Light sensors -# -CONFIG_ADJD_S311=m -CONFIG_APDS9300=m -CONFIG_CM32181=m -CONFIG_CM36651=m -CONFIG_GP2AP020A00F=m -CONFIG_HID_SENSOR_ALS=m -CONFIG_SENSORS_LM3533=m -CONFIG_TCS3472=m -CONFIG_SENSORS_TSL2563=m -CONFIG_TSL4531=m -CONFIG_VCNL4000=m - -# -# Magnetometer sensors -# -CONFIG_AK8975=m -CONFIG_MAG3110=m -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -CONFIG_IIO_ST_MAGN_3AXIS=m -CONFIG_IIO_ST_MAGN_I2C_3AXIS=m -CONFIG_IIO_ST_MAGN_SPI_3AXIS=m - -# -# Inclinometer sensors -# -CONFIG_HID_SENSOR_INCLINOMETER_3D=m - -# -# Triggers - standalone -# -CONFIG_IIO_INTERRUPT_TRIGGER=m -CONFIG_IIO_SYSFS_TRIGGER=m - -# -# Pressure sensors -# -CONFIG_MPL3115=m -CONFIG_IIO_ST_PRESS=m -CONFIG_IIO_ST_PRESS_I2C=m -CONFIG_IIO_ST_PRESS_SPI=m - -# -# Temperature sensors -# -CONFIG_TMP006=m -CONFIG_NTB=m -# CONFIG_VME_BUS is not set -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_LP3943=m -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m -CONFIG_RESET_CONTROLLER=y -CONFIG_FMC=m -CONFIG_FMC_FAKEDEV=m -CONFIG_FMC_TRIVIAL=m -CONFIG_FMC_WRITE_EEPROM=m -CONFIG_FMC_CHARDEV=m - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set -# CONFIG_BCM_KONA_USB2_PHY is not set -CONFIG_POWERCAP=y -CONFIG_INTEL_RAPL=m - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=m -CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -CONFIG_ISCSI_IBFT_FIND=y -CONFIG_ISCSI_IBFT=m -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y -CONFIG_EFI_RUNTIME_MAP=y -CONFIG_UEFI_CPER=y - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -# CONFIG_OCFS2_DEBUG_MASKLOG is not set -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_ASSERT is not set -CONFIG_NILFS2_FS=m -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=m -CONFIG_CUSE=m - -# -# Caches -# -CONFIG_FSCACHE=m -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=m -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -# CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m -# CONFIG_ECRYPT_FS_MESSAGING is not set -# CONFIG_HFS_FS is not set -CONFIG_HFSPLUS_FS=m -CONFIG_HFSPLUS_FS_POSIX_ACL=y -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set -CONFIG_LOGFS=m -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -CONFIG_SQUASHFS_DECOMP_MULTI=y -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -CONFIG_HPFS_FS=m -# CONFIG_QNX4FS_FS is not set -CONFIG_QNX6FS_FS=m -# CONFIG_QNX6FS_DEBUG is not set -# CONFIG_ROMFS_FS is not set -CONFIG_PSTORE=y -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -# CONFIG_SYSV_FS is not set -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -# CONFIG_EXOFS_FS is not set -CONFIG_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_F2FS_FS_SECURITY=y -CONFIG_F2FS_CHECK_FS=y -CONFIG_EFIVAR_FS=y -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -CONFIG_NFS_SWAP=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" -CONFIG_NFS_V4_1_MIGRATION=y -CONFIG_NFS_V4_SECURITY_LABEL=y -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -# CONFIG_NFSD_V4_SECURITY_LABEL is not set -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set -CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y -CONFIG_CEPH_FS_POSIX_ACL=y -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_UPCALL is not set -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y -CONFIG_NCP_FS=m -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -# CONFIG_NCPFS_EXTRAS is not set -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y -CONFIG_9P_FS_POSIX_ACL=y -CONFIG_9P_FS_SECURITY=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 -# CONFIG_BOOT_PRINTK_DELAY is not set -CONFIG_DYNAMIC_DEBUG=y - -# -# Compile-time checks and compiler options -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -CONFIG_STRIP_ASM_SYMS=y -# CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_VIRTUAL is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_HIGHMEM is not set -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -# CONFIG_LOCKUP_DETECTOR is not set -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -# CONFIG_SCHED_DEBUG is not set -# CONFIG_SCHEDSTATS is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_WRITECOUNT is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_VERBOSE is not set -# CONFIG_RCU_CPU_STALL_INFO is not set -# CONFIG_RCU_TRACE is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -# CONFIG_FUNCTION_GRAPH_TRACER is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -# CONFIG_TRACER_SNAPSHOT is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_KPROBE_EVENT=y -CONFIG_UPROBE_EVENT=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=y -# CONFIG_FUNCTION_PROFILER is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_MMIOTRACE is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set - -# -# Runtime Testing -# -CONFIG_LKDTM=m -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -CONFIG_TEST_STRING_HELPERS=m -CONFIG_TEST_KSTRTOX=m -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_TEST_MODULE is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_STRICT_DEVMEM=y -CONFIG_X86_VERBOSE_BOOTUP=y -CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set -CONFIG_EARLY_PRINTK_EFI=y -# CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set -CONFIG_DEBUG_SET_MODULE_RONX=y -# CONFIG_DEBUG_NX_TEST is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -# CONFIG_DEBUG_BOOT_PARAMS is not set -# CONFIG_CPA_DEBUG is not set -# CONFIG_OPTIMIZE_INLINING is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set -# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set - -# -# Security options -# -CONFIG_KEYS=y -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -# CONFIG_SECURITY_NETWORK is not set -CONFIG_SECURITY_PATH=y -CONFIG_INTEL_TXT=y -# CONFIG_SECURITY_SMACK is not set -# CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set -CONFIG_SECURITY_YAMA=y -# CONFIG_SECURITY_YAMA_STACKED is not set -# CONFIG_IMA is not set -CONFIG_DEFAULT_SECURITY_YAMA=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="yama" -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=m -CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=y -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ABLK_HELPER=y -CONFIG_CRYPTO_GLUE_HELPER_X86=y - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_SEQIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=y - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=m -CONFIG_CRYPTO_CRCT10DIF=m -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_AES_NI_INTEL=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=y -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=y -CONFIG_CRYPTO_SERPENT_SSE2_586=y -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=y -CONFIG_CRYPTO_TWOFISH_586=y - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_LZ4=m -CONFIG_CRYPTO_LZ4HC=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_GEODE=m -CONFIG_CRYPTO_DEV_CCP=y -CONFIG_CRYPTO_DEV_CCP_DD=m -CONFIG_CRYPTO_DEV_CCP_CRYPTO=m -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_PUBLIC_KEY_ALGO_RSA=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQ_ROUTING=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -# CONFIG_KVM_MMU_AUDIT is not set -CONFIG_KVM_DEVICE_ASSIGNMENT=y -# CONFIG_LGUEST is not set -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_IO=y -CONFIG_PERCPU_RWSEM=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -CONFIG_AUDIT_GENERIC=y -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=m -CONFIG_LZ4HC_COMPRESS=m -CONFIG_LZ4_DECOMPRESS=y -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_XZ_DEC_TEST=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_BCH=m -CONFIG_BCH_CONST_PARAMS=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_LRU_CACHE=m -CONFIG_AVERAGE=y -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_MPILIB=y -CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y -CONFIG_FONT_SUPPORT=y -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set -CONFIG_FONT_AUTOSELECT=y diff --git a/srcpkgs/linux3.14/files/x86_64-dotconfig b/srcpkgs/linux3.14/files/x86_64-dotconfig deleted file mode 100644 index 97fb89bb8e..0000000000 --- a/srcpkgs/linux3.14/files/x86_64-dotconfig +++ /dev/null @@ -1,6733 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.38 Kernel Configuration -# -CONFIG_64BIT=y -CONFIG_X86_64=y -CONFIG_X86=y -CONFIG_INSTRUCTION_DECODER=y -CONFIG_OUTPUT_FORMAT="elf64-x86-64" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_MMU=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_ARCH_HAS_CPU_AUTOPROBE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ZONE_DMA32=y -CONFIG_AUDIT_ARCH=y -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y -CONFIG_X86_64_SMP=y -CONFIG_X86_HT=y -CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="_1" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -# CONFIG_IRQ_DOMAIN_DEBUG is not set -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y -CONFIG_GENERIC_CMOS_UPDATE=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -# CONFIG_TICK_CPU_ACCOUNTING is not set -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -CONFIG_IRQ_TIME_ACCOUNTING=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y - -# -# RCU Subsystem -# -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_CONTEXT_TRACKING=y -CONFIG_RCU_USER_QS=y -CONFIG_CONTEXT_TRACKING_FORCE=y -CONFIG_RCU_FANOUT=64 -CONFIG_RCU_FANOUT_LEAF=16 -# CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y -# CONFIG_TREE_RCU_TRACE is not set -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=1 -CONFIG_RCU_BOOST_DELAY=500 -CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_NOCB_CPU_NONE is not set -# CONFIG_RCU_NOCB_CPU_ZERO is not set -CONFIG_RCU_NOCB_CPU_ALL=y -CONFIG_IKCONFIG=m -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y -CONFIG_ARCH_SUPPORTS_INT128=y -CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y -CONFIG_ARCH_USES_NUMA_PROT_NONE=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y -CONFIG_NUMA_BALANCING=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_SWAP_ENABLED=y -CONFIG_MEMCG_KMEM=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_MM_OWNER=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_HAVE_PCSPKR_PLATFORM=y -# CONFIG_EXPERT is not set -CONFIG_UID16=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_PCI_QUIRKS=y -# CONFIG_EMBEDDED is not set -CONFIG_HAVE_PERF_EVENTS=y - -# -# Kernel Performance Events And Counters -# -CONFIG_PERF_EVENTS=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -CONFIG_SLUB_CPU_PARTIAL=y -CONFIG_SYSTEM_TRUSTED_KEYRING=y -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -CONFIG_OPROFILE=m -CONFIG_OPROFILE_EVENT_MULTIPLEX=y -CONFIG_HAVE_OPROFILE=y -CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y -# CONFIG_JUMP_LABEL is not set -CONFIG_KPROBES_ON_FTRACE=y -CONFIG_UPROBES=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y -CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_KPROBES_ON_FTRACE=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y -CONFIG_HAVE_USER_RETURN_NOTIFIER=y -CONFIG_HAVE_PERF_EVENTS_NMI=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y -CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y -CONFIG_HAVE_CMPXCHG_LOCAL=y -CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE is not set -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARCH_SOFT_DIRTY=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_COMPAT_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_MODULE_SIG=y -# CONFIG_MODULE_SIG_FORCE is not set -CONFIG_MODULE_SIG_ALL=y -# CONFIG_MODULE_SIG_SHA1 is not set -# CONFIG_MODULE_SIG_SHA224 is not set -# CONFIG_MODULE_SIG_SHA256 is not set -# CONFIG_MODULE_SIG_SHA384 is not set -CONFIG_MODULE_SIG_SHA512=y -CONFIG_MODULE_SIG_HASH="sha512" -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_BLK_DEV_BSG=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_THROTTLING=y -CONFIG_BLK_CMDLINE_PARSER=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_CMDLINE_PARTITION=y -CONFIG_BLOCK_COMPAT=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_CFQ_GROUP_IOSCHED=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_PADATA=y -CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_ZONE_DMA=y -CONFIG_SMP=y -CONFIG_X86_X2APIC=y -CONFIG_X86_MPPARSE=y -# CONFIG_X86_EXTENDED_PLATFORM is not set -CONFIG_X86_INTEL_LPSS=y -CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_PARAVIRT_SPINLOCKS is not set -CONFIG_XEN=y -CONFIG_XEN_DOM0=y -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=500 -CONFIG_XEN_SAVE_RESTORE=y -# CONFIG_XEN_DEBUG_FS is not set -CONFIG_XEN_PVH=y -CONFIG_KVM_GUEST=y -CONFIG_KVM_DEBUG_FS=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_PARAVIRT_CLOCK=y -CONFIG_NO_BOOTMEM=y -# CONFIG_MEMTEST is not set -# CONFIG_MK8 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_MATOM is not set -CONFIG_GENERIC_CPU=y -CONFIG_X86_INTERNODE_CACHE_SHIFT=6 -CONFIG_X86_L1_CACHE_SHIFT=6 -CONFIG_X86_TSC=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=64 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -CONFIG_GART_IOMMU=y -# CONFIG_CALGARY_IOMMU is not set -CONFIG_SWIOTLB=y -CONFIG_IOMMU_HELPER=y -# CONFIG_MAXSMP is not set -CONFIG_NR_CPUS=64 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_X86_UP_APIC_MSI=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_MCE=y -CONFIG_X86_MCE_INTEL=y -CONFIG_X86_MCE_AMD=y -CONFIG_X86_MCE_THRESHOLD=y -CONFIG_X86_MCE_INJECT=m -CONFIG_X86_THERMAL_VECTOR=y -CONFIG_X86_16BIT=y -CONFIG_X86_ESPFIX64=y -CONFIG_I8K=m -CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -# CONFIG_MICROCODE_INTEL_EARLY is not set -# CONFIG_MICROCODE_AMD_EARLY is not set -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_DIRECT_GBPAGES=y -CONFIG_NUMA=y -CONFIG_AMD_NUMA=y -CONFIG_X86_64_ACPI_NUMA=y -CONFIG_NODES_SPAN_OTHER_NODES=y -# CONFIG_NUMA_EMU is not set -CONFIG_NODES_SHIFT=6 -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_MEMORY_PROBE=y -CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y -CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MEMBLOCK_NODE_MAP=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_MOVABLE_NODE=y -CONFIG_HAVE_BOOTMEM_INFO_NODE=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTPLUG_SPARSE=y -CONFIG_MEMORY_HOTREMOVE=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_BALLOON_COMPACTION=y -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_NEED_BOUNCE_POOL=y -CONFIG_VIRT_TO_BUS=y -CONFIG_MMU_NOTIFIER=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y -CONFIG_MEMORY_FAILURE=y -# CONFIG_HWPOISON_INJECT is not set -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y -# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CLEANCACHE=y -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -CONFIG_ZBUD=y -CONFIG_ZSWAP=y -CONFIG_ZSMALLOC=y -CONFIG_PGTABLE_MAPPING=y -CONFIG_X86_CHECK_BIOS_CORRUPTION=y -CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y -CONFIG_X86_RESERVE_LOW=64 -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_ARCH_RANDOM=y -CONFIG_X86_SMAP=y -CONFIG_EFI=y -CONFIG_EFI_STUB=y -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -# CONFIG_CRASH_DUMP is not set -# CONFIG_KEXEC_JUMP is not set -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_PHYSICAL_ALIGN=0x1000000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -CONFIG_USE_PERCPU_NUMA_NODE_ID=y - -# -# Power management and ACPI options -# -CONFIG_ARCH_HIBERNATION_HEADER=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set -CONFIG_PM_RUNTIME=y -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_CLK=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y -# CONFIG_ACPI_PROCFS_POWER is not set -CONFIG_ACPI_EC_DEBUGFS=m -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_IPMI=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_PROCESSOR_AGGREGATOR=m -CONFIG_ACPI_THERMAL=m -CONFIG_ACPI_NUMA=y -# CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=y -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=y -CONFIG_ACPI_HOTPLUG_MEMORY=y -CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=y -CONFIG_ACPI_CUSTOM_METHOD=m -CONFIG_ACPI_BGRT=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_MEMORY_FAILURE=y -CONFIG_ACPI_APEI_EINJ=m -CONFIG_ACPI_APEI_ERST_DEBUG=m -CONFIG_ACPI_EXTLOG=m -CONFIG_SFI=y - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# x86 CPU frequency scaling drivers -# -CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_ACPI_CPUFREQ_CPB=y -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -CONFIG_X86_P4_CLOCKMOD=m - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=m - -# -# CPU Idle -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set -CONFIG_INTEL_IDLE=y - -# -# Memory power savings -# -CONFIG_I7300_IDLE_IOAT_CHANNEL=y -CONFIG_I7300_IDLE=m - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_XEN=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_PCIEAER=y -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEAER_INJECT=m -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -# CONFIG_PCIEASPM_DEFAULT is not set -# CONFIG_PCIEASPM_POWERSAVE is not set -CONFIG_PCIEASPM_PERFORMANCE=y -CONFIG_PCIE_PME=y -CONFIG_PCI_MSI=y -# CONFIG_PCI_DEBUG is not set -CONFIG_PCI_REALLOC_ENABLE_AUTO=y -CONFIG_PCI_STUB=m -CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_HT_IRQ=y -CONFIG_PCI_ATS=y -CONFIG_PCI_IOV=y -CONFIG_PCI_PRI=y -CONFIG_PCI_PASID=y -CONFIG_PCI_IOAPIC=y -CONFIG_PCI_LABEL=y - -# -# PCI host controller drivers -# -CONFIG_ISA_DMA_API=y -CONFIG_AMD_NB=y -CONFIG_PCCARD=m -# CONFIG_PCMCIA is not set -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_RAPIDIO=m -CONFIG_RAPIDIO_TSI721=m -CONFIG_RAPIDIO_DISC_TIMEOUT=30 -CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y -CONFIG_RAPIDIO_DMA_ENGINE=y -CONFIG_RAPIDIO_DEBUG=y -CONFIG_RAPIDIO_ENUM_BASIC=m - -# -# RapidIO Switch drivers -# -CONFIG_RAPIDIO_TSI57X=m -CONFIG_RAPIDIO_CPS_XX=m -CONFIG_RAPIDIO_TSI568=m -CONFIG_RAPIDIO_CPS_GEN2=m -# CONFIG_X86_SYSFB is not set - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -# CONFIG_HAVE_AOUT is not set -CONFIG_BINFMT_MISC=m -CONFIG_COREDUMP=y -CONFIG_IA32_EMULATION=y -# CONFIG_IA32_AOUT is not set -# CONFIG_X86_X32 is not set -CONFIG_COMPAT=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y -CONFIG_X86_DEV_DMA_OPS=y -CONFIG_IOSF_MBI=m -CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=m -CONFIG_UNIX=y -CONFIG_UNIX_DIAG=m -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_IP_FIB_TRIE_STATS is not set -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_ROUTE_CLASSID=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -# CONFIG_INET_UDP_DIAG is not set -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=m -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_DEFAULT_RENO=y -CONFIG_DEFAULT_TCP_CONG="reno" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -# CONFIG_IPV6_MROUTE is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_ACCT=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CONNTRACK_PROCFS is not set -CONFIG_NF_CONNTRACK_EVENTS=y -# CONFIG_NF_CONNTRACK_TIMEOUT is not set -# CONFIG_NF_CONNTRACK_TIMESTAMP is not set -CONFIG_NF_CONNTRACK_LABELS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_QUEUE_CT=y -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_INET=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m -CONFIG_NFT_CT=m -CONFIG_NFT_RBTREE=m -CONFIG_NFT_HASH=m -CONFIG_NFT_COUNTER=m -CONFIG_NFT_LOG=m -CONFIG_NFT_LIMIT=m -CONFIG_NFT_NAT=m -CONFIG_NFT_QUEUE=m -CONFIG_NFT_REJECT=m -CONFIG_NFT_REJECT_INET=m -CONFIG_NFT_COMPAT=m -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m - -# -# Xtables targets -# -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -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_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m - -# -# Xtables matches -# -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPCOMP=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_L2TP=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NETPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETNET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS SH scheduler -# -CONFIG_IP_VS_SH_TAB_BITS=8 - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_NFCT=y -CONFIG_IP_VS_PE_SIP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_REJECT_IPV4=m -CONFIG_NF_TABLES_ARP=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -# CONFIG_IP_NF_SECURITY is not set -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m -CONFIG_NFT_REJECT_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -# CONFIG_IP6_NF_SECURITY is not set -CONFIG_NF_NAT_IPV6=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -CONFIG_NF_TABLES_BRIDGE=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_TFRC_LIB=y - -# -# DCCP Kernel Hacking -# -# CONFIG_IP_DCCP_DEBUG is not set -# CONFIG_NET_DCCPPROBE is not set -CONFIG_IP_SCTP=m -# CONFIG_NET_SCTPPROBE is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y -# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set -# CONFIG_SCTP_COOKIE_HMAC_MD5 is not set -CONFIG_SCTP_COOKIE_HMAC_SHA1=y -CONFIG_RDS=m -# CONFIG_RDS_RDMA is not set -CONFIG_RDS_TCP=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -CONFIG_TIPC_PORTS=8191 -CONFIG_TIPC_MEDIA_IB=y -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -CONFIG_L2TP_DEBUGFS=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_STP=m -CONFIG_GARP=m -CONFIG_MRP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_NET_DSA=m -CONFIG_NET_DSA_TAG_DSA=y -CONFIG_NET_DSA_TAG_EDSA=y -CONFIG_NET_DSA_TAG_TRAILER=y -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_VLAN_8021Q_MVRP=y -# CONFIG_DECNET is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_IPX=m -CONFIG_IPX_INTERN=y -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_PHONET=m -CONFIG_IEEE802154=m -CONFIG_IEEE802154_6LOWPAN=m -CONFIG_6LOWPAN_IPHC=m -CONFIG_MAC802154=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_QFQ=m -CONFIG_NET_SCH_CODEL=m -CONFIG_NET_SCH_FQ_CODEL=m -CONFIG_NET_SCH_FQ=m -CONFIG_NET_SCH_HHF=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_SCH_PLUG=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -# CONFIG_NET_CLS_CGROUP is not set -CONFIG_NET_CLS_BPF=m -# CONFIG_NET_EMATCH is not set -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y -CONFIG_DCB=y -CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -# CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_GRE=y -CONFIG_OPENVSWITCH_VXLAN=y -CONFIG_VSOCKETS=m -CONFIG_VMWARE_VMCI_VSOCKETS=m -CONFIG_NETLINK_MMAP=y -CONFIG_NETLINK_DIAG=m -CONFIG_NET_MPLS_GSO=m -CONFIG_HSR=m -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=m -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_BPF_JIT=y -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_NET_TCPPROBE is not set -# CONFIG_NET_DROP_MONITOR is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_ATH3K=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIUART_3WIRE=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_BT_WILINK=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_LEDS=y -CONFIG_RFKILL_INPUT=y -CONFIG_RFKILL_REGULATOR=m -CONFIG_RFKILL_GPIO=m -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_RDMA is not set -# CONFIG_NET_9P_DEBUG is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -CONFIG_CAIF_USB=m -CONFIG_CEPH_LIB=m -# CONFIG_CEPH_LIB_PRETTYDEBUG is not set -CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y -CONFIG_NFC=m -CONFIG_NFC_DIGITAL=m -CONFIG_NFC_NCI=m -CONFIG_NFC_NCI_SPI=y -CONFIG_NFC_HCI=m -# CONFIG_NFC_SHDLC is not set - -# -# Near Field Communication (NFC) devices -# -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_MEI_PHY=m -CONFIG_NFC_SIM=m -CONFIG_NFC_PORT100=m -CONFIG_NFC_PN544=m -CONFIG_NFC_PN544_MEI=m -CONFIG_NFC_MICROREAD=m -CONFIG_NFC_MICROREAD_MEI=m -CONFIG_NFC_MRVL=m -CONFIG_NFC_MRVL_USB=m -CONFIG_HAVE_BPF_JIT=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -CONFIG_SYS_HYPERVISOR=y -# CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -CONFIG_DMA_SHARED_BUFFER=y - -# -# Bus devices -# -CONFIG_CONNECTOR=y -CONFIG_PROC_EVENTS=y -CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_CMDLINE_PARTS=m -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK is not set -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_SM_FTL is not set -# CONFIG_MTD_OOPS is not set -CONFIG_MTD_SWAP=m - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_TS5500 is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -CONFIG_MTD_DOCG3=m -CONFIG_BCH_CONST_M=14 -CONFIG_BCH_CONST_T=4 -# CONFIG_MTD_NAND is not set -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_UBI is not set -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_GSC is not set -CONFIG_PARPORT_AX88796=m -CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_NULL_BLK=m -CONFIG_BLK_DEV_FD=m -# CONFIG_PARIDE is not set -CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m -CONFIG_ZRAM=m -# CONFIG_ZRAM_DEBUG is not set -CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_DRBD=m -# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m -CONFIG_BLK_DEV_SKD=m -CONFIG_BLK_DEV_OSD=m -CONFIG_BLK_DEV_SX8=m -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_VIRTIO_BLK=m -# CONFIG_BLK_DEV_HD is not set -CONFIG_BLK_DEV_RBD=m -CONFIG_BLK_DEV_RSXX=m - -# -# Misc devices -# -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_AD525X_DPOT=m -CONFIG_AD525X_DPOT_I2C=m -CONFIG_AD525X_DPOT_SPI=m -CONFIG_ATMEL_PWM=m -CONFIG_DUMMY_IRQ=m -# CONFIG_IBM_ASM is not set -CONFIG_PHANTOM=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ATMEL_SSC=m -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_CS5535_MFGPT=m -CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 -CONFIG_CS5535_CLOCK_EVENT_SRC=m -CONFIG_HP_ILO=m -CONFIG_APDS9802ALS=m -CONFIG_ISL29003=m -CONFIG_ISL29020=m -CONFIG_SENSORS_TSL2550=m -CONFIG_SENSORS_BH1780=m -CONFIG_SENSORS_BH1770=m -CONFIG_SENSORS_APDS990X=m -CONFIG_HMC6352=m -CONFIG_DS1682=m -CONFIG_TI_DAC7512=m -CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y -CONFIG_BMP085_I2C=m -CONFIG_BMP085_SPI=m -CONFIG_PCH_PHUB=m -CONFIG_USB_SWITCH_FSA9480=m -CONFIG_LATTICE_ECP3_CONFIG=m -CONFIG_SRAM=y -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_MAX6875=m -CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93XX46=m -CONFIG_CB710_CORE=m -# CONFIG_CB710_DEBUG is not set -CONFIG_CB710_DEBUG_ASSUMPTIONS=y - -# -# Texas Instruments shared transport line discipline -# -CONFIG_TI_ST=m -CONFIG_SENSORS_LIS3_I2C=m - -# -# Altera FPGA firmware download module -# -CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=m -CONFIG_INTEL_MEI_ME=m -CONFIG_VMWARE_VMCI=m - -# -# Intel MIC Host Driver -# -CONFIG_INTEL_MIC_HOST=m - -# -# Intel MIC Card Driver -# -CONFIG_INTEL_MIC_CARD=m -CONFIG_GENWQE=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_FC_TGT_ATTRS is not set -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_CXGB4_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m -CONFIG_SCSI_BNX2X_FCOE=m -CONFIG_BE2ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_3W_SAS=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_MVSAS=m -# CONFIG_SCSI_MVSAS_DEBUG is not set -# CONFIG_SCSI_MVSAS_TASKLET is not set -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_ESAS2R=m -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT2SAS_LOGGING is not set -CONFIG_SCSI_MPT3SAS=m -CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT3SAS_LOGGING is not set -CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFSHCD_PCI=m -CONFIG_SCSI_UFSHCD_PLATFORM=m -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -# CONFIG_SCSI_FLASHPOINT is not set -CONFIG_VMWARE_PVSCSI=m -CONFIG_HYPERV_STORAGE=m -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -CONFIG_SCSI_EATA_TAGGED_QUEUE=y -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_ISCI=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -# CONFIG_SCSI_IPR_TRACE is not set -# CONFIG_SCSI_IPR_DUMP is not set -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_TCM_QLA2XXX=m -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -# CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PM8001=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_VIRTIO=m -CONFIG_SCSI_CHELSIO_FCOE=m -CONFIG_SCSI_DH=m -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=0 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y -CONFIG_SATA_PMP=y - -# -# Controllers with non-SFF native interface -# -CONFIG_SATA_AHCI=m -CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_AHCI_IMX=m -CONFIG_SATA_INIC162X=m -CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y - -# -# SFF controllers with custom DMA interface -# -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_SX4=m -CONFIG_ATA_BMDMA=y - -# -# SATA SFF controllers with BMDMA -# -CONFIG_ATA_PIIX=m -CONFIG_SATA_HIGHBANK=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_RCAR=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_SVW=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m - -# -# PATA SFF controllers with BMDMA -# -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -CONFIG_PATA_HPT3X3_DMA=y -CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RDC=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SCH=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# PIO-only SFF controllers -# -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_RZ1000=m - -# -# Generic fallback / legacy drivers -# -CONFIG_PATA_ACPI=m -CONFIG_ATA_GENERIC=m -# CONFIG_PATA_LEGACY is not set -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BCACHE=m -# CONFIG_BCACHE_DEBUG is not set -# CONFIG_BCACHE_CLOSURES_DEBUG is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=m -CONFIG_DM_BIO_PRISON=m -CONFIG_DM_PERSISTENT_DATA=m -# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m -CONFIG_DM_CACHE_CLEANER=m -CONFIG_DM_MIRROR=m -CONFIG_DM_LOG_USERSPACE=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_QL=m -CONFIG_DM_MULTIPATH_ST=m -CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y -CONFIG_DM_FLAKEY=m -CONFIG_DM_VERITY=m -CONFIG_DM_SWITCH=m -CONFIG_TARGET_CORE=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_LOOPBACK_TARGET=m -CONFIG_TCM_FC=m -CONFIG_ISCSI_TARGET=m -CONFIG_SBP_TARGET=m -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LAN is not set -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_SBP2=m -CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_EXT_ADAPTEC_DMA64=y -CONFIG_I2O_CONFIG=m -# CONFIG_I2O_CONFIG_OLD_IOCTL is not set -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m -CONFIG_MACINTOSH_DRIVERS=y -CONFIG_MAC_EMUMOUSEBTN=m -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_NET_CORE=y -CONFIG_BONDING=m -CONFIG_DUMMY=m -CONFIG_EQUALIZER=m -CONFIG_NET_FC=y -CONFIG_IFB=m -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_MACVLAN=m -CONFIG_MACVTAP=m -CONFIG_VXLAN=m -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_NTB_NETDEV=m -CONFIG_RIONET=m -CONFIG_RIONET_TX_SIZE=128 -CONFIG_RIONET_RX_SIZE=128 -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_VIRTIO_NET=m -CONFIG_NLMON=m -CONFIG_SUNGEM_PHY=m -# CONFIG_ARCNET is not set -CONFIG_ATM_DRIVERS=y -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -CONFIG_ATM_NICSTAR_USE_SUNI=y -CONFIG_ATM_NICSTAR_USE_IDT77105=y -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -# CONFIG_ATM_FORE200E_USE_TASKLET is not set -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_ATM_SOLOS=m - -# -# CAIF transport drivers -# -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m -CONFIG_CAIF_VIRTIO=m -CONFIG_VHOST_NET=m -CONFIG_VHOST_SCSI=m -CONFIG_VHOST_RING=m -CONFIG_VHOST=m - -# -# Distributed Switch Architecture drivers -# -CONFIG_NET_DSA_MV88E6XXX=m -CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123_61_65=m -CONFIG_ETHERNET=y -CONFIG_MDIO=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_NET_VENDOR_ADAPTEC=y -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_NET_VENDOR_ALTEON=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_NET_VENDOR_AMD=y -CONFIG_AMD8111_ETH=m -CONFIG_PCNET32=y -CONFIG_NET_VENDOR_ARC=y -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_ALX=m -CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m -CONFIG_MACB=m -CONFIG_NET_VENDOR_BROADCOM=y -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_BNX2=m -CONFIG_CNIC=m -CONFIG_TIGON3=m -CONFIG_BNX2X=m -CONFIG_BNX2X_SRIOV=y -CONFIG_NET_VENDOR_BROCADE=y -CONFIG_BNA=m -CONFIG_NET_CALXEDA_XGMAC=m -CONFIG_NET_VENDOR_CHELSIO=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3=m -CONFIG_CHELSIO_T4=m -CONFIG_CHELSIO_T4VF=m -CONFIG_NET_VENDOR_CISCO=y -CONFIG_ENIC=m -CONFIG_DNET=m -CONFIG_NET_VENDOR_DEC=y -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_DE2104X_DSL=0 -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -# CONFIG_PCMCIA_XIRCOM is not set -CONFIG_NET_VENDOR_DLINK=y -CONFIG_DL2K=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_NET_VENDOR_EMULEX=y -CONFIG_BE2NET=m -CONFIG_NET_VENDOR_EXAR=y -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_NET_VENDOR_HP=y -CONFIG_HP100=m -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=y -CONFIG_E1000=y -CONFIG_E1000E=y -CONFIG_IGB=m -CONFIG_IGB_HWMON=y -CONFIG_IGB_DCA=y -CONFIG_IGBVF=m -CONFIG_IXGB=m -CONFIG_IXGBE=m -CONFIG_IXGBE_HWMON=y -CONFIG_IXGBE_DCA=y -# CONFIG_IXGBE_DCB is not set -CONFIG_IXGBEVF=m -CONFIG_I40E=m -CONFIG_I40E_VXLAN=y -CONFIG_I40E_DCB=y -CONFIG_I40EVF=m -CONFIG_NET_VENDOR_I825XX=y -CONFIG_IP1000=m -CONFIG_JME=m -CONFIG_NET_VENDOR_MARVELL=y -CONFIG_MVMDIO=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -# CONFIG_SKGE_GENESIS is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_MLX5_CORE=m -CONFIG_NET_VENDOR_MICREL=y -CONFIG_KS8842=m -CONFIG_KS8851=m -CONFIG_KS8851_MLL=m -CONFIG_KSZ884X_PCI=m -CONFIG_NET_VENDOR_MICROCHIP=y -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_NET_VENDOR_MYRI=y -CONFIG_MYRI10GE=m -CONFIG_MYRI10GE_DCA=y -CONFIG_FEALNX=m -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NATSEMI=m -CONFIG_NS83820=m -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=m -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=m -CONFIG_NET_VENDOR_OKI=y -# CONFIG_PCH_GBE is not set -CONFIG_ETHOC=m -# CONFIG_NET_PACKET_ENGINE is not set -CONFIG_NET_VENDOR_QLOGIC=y -CONFIG_QLA3XXX=m -CONFIG_QLCNIC=m -CONFIG_QLCNIC_SRIOV=y -CONFIG_QLCNIC_DCB=y -CONFIG_QLGE=m -CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_ATP=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -CONFIG_8139TOO_TUNE_TWISTER=y -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R8169=m -CONFIG_SH_ETH=m -CONFIG_NET_VENDOR_RDC=y -CONFIG_R6040=m -CONFIG_NET_VENDOR_SEEQ=y -CONFIG_NET_VENDOR_SILAN=y -CONFIG_SC92031=m -CONFIG_NET_VENDOR_SIS=y -CONFIG_SIS900=m -CONFIG_SIS190=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_SFC_MCDI_MON=y -CONFIG_SFC_SRIOV=y -CONFIG_NET_VENDOR_SMSC=y -CONFIG_EPIC100=m -CONFIG_SMSC911X=m -# CONFIG_SMSC911X_ARCH_HOOKS is not set -CONFIG_SMSC9420=m -CONFIG_NET_VENDOR_STMICRO=y -CONFIG_STMMAC_ETH=m -CONFIG_STMMAC_PLATFORM=y -CONFIG_STMMAC_PCI=y -# CONFIG_STMMAC_DEBUG_FS is not set -# CONFIG_STMMAC_DA is not set -CONFIG_NET_VENDOR_SUN=y -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NIU=m -CONFIG_NET_VENDOR_TEHUTI=y -CONFIG_TEHUTI=m -CONFIG_NET_VENDOR_TI=y -CONFIG_TLAN=m -CONFIG_NET_VENDOR_VIA=y -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_VIA_VELOCITY=m -CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=m -CONFIG_WIZNET_W5300=m -# CONFIG_WIZNET_BUS_DIRECT is not set -# CONFIG_WIZNET_BUS_INDIRECT is not set -CONFIG_WIZNET_BUS_ANY=y -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_NET_SB1000=m -CONFIG_PHYLIB=y - -# -# MII PHY device drivers -# -CONFIG_AT803X_PHY=m -CONFIG_AMD_PHY=m -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_BCM87XX_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_MICREL_PHY=m -# CONFIG_FIXED_PHY is not set -CONFIG_MDIO_BITBANG=m -CONFIG_MDIO_GPIO=m -CONFIG_MICREL_KS8995MA=m -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOATM=m -CONFIG_PPPOE=m -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_SLIP=m -CONFIG_SLHC=m -# CONFIG_SLIP_COMPRESSED is not set -# CONFIG_SLIP_SMART is not set -# CONFIG_SLIP_MODE_SLIP6 is not set - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_RTL8152=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_HUAWEI_CDC_NCM=m -CONFIG_USB_NET_CDC_MBIM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SR9700=m -CONFIG_USB_NET_SR9800=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -CONFIG_USB_NET_QMI_WWAN=m -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_CDC_PHONET=m -CONFIG_USB_IPHETH=m -CONFIG_USB_SIERRA_NET=m -CONFIG_USB_VL600=m -CONFIG_WLAN=y -CONFIG_LIBERTAS_THINFIRM=m -# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_AIRO=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -CONFIG_ADM8211=m -# CONFIG_MAC80211_HWSIM is not set -CONFIG_MWL8K=m -CONFIG_ATH_COMMON=m -CONFIG_ATH_CARDS=m -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -# CONFIG_ATH5K_TRACER is not set -CONFIG_ATH5K_PCI=y -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -CONFIG_ATH9K=m -CONFIG_ATH9K_PCI=y -# CONFIG_ATH9K_AHB is not set -# CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_WOW=y -CONFIG_ATH9K_LEGACY_RATE_CONTROL=y -CONFIG_ATH9K_RFKILL=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -CONFIG_CARL9170_HWRNG=y -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_ATH6KL_USB=m -# CONFIG_ATH6KL_DEBUG is not set -# CONFIG_ATH6KL_TRACING is not set -CONFIG_AR5523=m -CONFIG_WIL6210=m -CONFIG_WIL6210_ISR_COR=y -# CONFIG_WIL6210_TRACING is not set -CONFIG_ATH10K=m -CONFIG_ATH10K_PCI=m -# CONFIG_ATH10K_DEBUG is not set -# CONFIG_ATH10K_DEBUGFS is not set -# CONFIG_ATH10K_TRACING is not set -CONFIG_WCN36XX=m -# CONFIG_WCN36XX_DEBUGFS is not set -CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_SSB=y -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -CONFIG_B43_HWRNG=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_HWRNG=y -# CONFIG_B43LEGACY_DEBUG is not set -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m -# CONFIG_BRCMFMAC is not set -# CONFIG_BRCM_TRACING is not set -# CONFIG_BRCMDBG is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -CONFIG_IWLDVM=m -CONFIG_IWLMVM=m -CONFIG_IWLWIFI_OPMODE_MODULAR=y - -# -# Debugging Options -# -# CONFIG_IWLWIFI_DEBUG is not set -# CONFIG_IWLWIFI_DEVICE_TRACING is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m -CONFIG_IWL3945=m - -# -# iwl3945 / iwl4965 Debugging Options -# -# CONFIG_IWLEGACY_DEBUG is not set -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_MESH=y -CONFIG_HERMES=m -CONFIG_HERMES_PRISM=y -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_ORINOCO_USB=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -# CONFIG_P54_SPI_DEFAULT_EEPROM is not set -CONFIG_P54_LEDS=y -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2800PCI=m -CONFIG_RT2800PCI_RT33XX=y -CONFIG_RT2800PCI_RT35XX=y -CONFIG_RT2800PCI_RT53XX=y -CONFIG_RT2800PCI_RT3290=y -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2800_LIB_MMIO=m -CONFIG_RT2X00_LIB_MMIO=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CE=m -CONFIG_RTL8192SE=m -CONFIG_RTL8192DE=m -CONFIG_RTL8723AE=m -CONFIG_RTL8188EE=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_PCI=m -CONFIG_RTLWIFI_USB=m -CONFIG_RTLWIFI_DEBUG=y -CONFIG_RTL8192C_COMMON=m -CONFIG_WL_TI=y -CONFIG_WL1251=m -CONFIG_WL1251_SPI=m -CONFIG_WL1251_SDIO=m -CONFIG_WL12XX=m -CONFIG_WL18XX=m -CONFIG_WLCORE=m -CONFIG_WLCORE_SPI=m -CONFIG_WLCORE_SDIO=m -CONFIG_WILINK_PLATFORM_DATA=y -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m -CONFIG_MWIFIEX_USB=m -CONFIG_CW1200=m -CONFIG_CW1200_WLAN_SDIO=m -CONFIG_CW1200_WLAN_SPI=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m -CONFIG_IEEE802154_FAKEHARD=m -CONFIG_IEEE802154_FAKELB=m -CONFIG_IEEE802154_AT86RF230=m -CONFIG_IEEE802154_MRF24J40=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_VMXNET3=m -CONFIG_HYPERV_NET=m -# CONFIG_ISDN is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m -CONFIG_INPUT_SPARSEKMAP=m -CONFIG_INPUT_MATRIXKMAP=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ADP5588=m -CONFIG_KEYBOARD_ADP5589=m -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_QT1070=m -CONFIG_KEYBOARD_QT2160=m -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_TCA6416=m -CONFIG_KEYBOARD_TCA8418=m -# CONFIG_KEYBOARD_MATRIX is not set -# CONFIG_KEYBOARD_LM8323 is not set -CONFIG_KEYBOARD_LM8333=m -CONFIG_KEYBOARD_MAX7359=m -CONFIG_KEYBOARD_MCS=m -CONFIG_KEYBOARD_MPR121=m -# CONFIG_KEYBOARD_NEWTON is not set -CONFIG_KEYBOARD_OPENCORES=m -CONFIG_KEYBOARD_SAMSUNG=m -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -CONFIG_KEYBOARD_STMPE=m -# CONFIG_KEYBOARD_XTKBD is not set -CONFIG_KEYBOARD_CROS_EC=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_CYPRESS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -CONFIG_MOUSE_PS2_ELANTECH=y -CONFIG_MOUSE_PS2_SENTELIC=y -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_SERIAL=y -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_CYAPA=m -CONFIG_MOUSE_VSXXXAA=m -# CONFIG_MOUSE_GPIO is not set -CONFIG_MOUSE_SYNAPTICS_I2C=m -CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_AS5011=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_HANWANG=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879_SPI=m -CONFIG_TOUCHSCREEN_ATMEL_MXT=m -CONFIG_TOUCHSCREEN_AUO_PIXCIR=m -CONFIG_TOUCHSCREEN_BU21013=m -CONFIG_TOUCHSCREEN_CY8CTMG110=m -CONFIG_TOUCHSCREEN_CYTTSP_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP_SPI=m -CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m -CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m -CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m -CONFIG_TOUCHSCREEN_DA9052=m -CONFIG_TOUCHSCREEN_DYNAPRO=m -CONFIG_TOUCHSCREEN_HAMPSHIRE=m -CONFIG_TOUCHSCREEN_EETI=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_ILI210X=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_WACOM_I2C=m -CONFIG_TOUCHSCREEN_MAX11801=m -CONFIG_TOUCHSCREEN_MCS5000=m -CONFIG_TOUCHSCREEN_MMS114=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_EDT_FT5X06=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m -# CONFIG_TOUCHSCREEN_UCB1400 is not set -CONFIG_TOUCHSCREEN_PIXCIR=m -# CONFIG_TOUCHSCREEN_WM831X is not set -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_MC13783=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_USB_JASTEC=y -CONFIG_TOUCHSCREEN_USB_ELO=y -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y -CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y -CONFIG_TOUCHSCREEN_USB_NEXIO=y -CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC_SERIO=m -CONFIG_TOUCHSCREEN_TSC2005=m -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_W90X900=m -# CONFIG_TOUCHSCREEN_PCAP is not set -CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_STMPE=m -CONFIG_TOUCHSCREEN_SUR40=m -CONFIG_TOUCHSCREEN_TPS6507X=m -CONFIG_TOUCHSCREEN_ZFORCE=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AD714X=m -CONFIG_INPUT_AD714X_I2C=m -CONFIG_INPUT_AD714X_SPI=m -CONFIG_INPUT_ARIZONA_HAPTICS=m -CONFIG_INPUT_BMA150=m -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_MPU3050=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_GP2A=m -CONFIG_INPUT_GPIO_TILT_POLLED=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_PCF8574=m -# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set -CONFIG_INPUT_DA9052_ONKEY=m -# CONFIG_INPUT_WM831X_ON is not set -# CONFIG_INPUT_PCAP is not set -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_ADXL34X_SPI=m -CONFIG_INPUT_IMS_PCU=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m -CONFIG_INPUT_IDEAPAD_SLIDEBAR=m - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_SERIO_ALTERA_PS2=m -CONFIG_SERIO_PS2MULT=m -CONFIG_SERIO_ARC_PS2=m -CONFIG_HYPERV_KEYBOARD=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_NOZOMI=m -CONFIG_ISI=m -CONFIG_N_HDLC=m -CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m -CONFIG_DEVKMEM=y - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_8250_DW=m - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_MAX310X=y -CONFIG_SERIAL_MRST_MAX3110=m -CONFIG_SERIAL_MFD_HSU=m -CONFIG_SERIAL_UARTLITE=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_SCCNXP=y -CONFIG_SERIAL_SCCNXP_CONSOLE=y -CONFIG_SERIAL_TIMBERDALE=m -CONFIG_SERIAL_ALTERA_JTAGUART=m -CONFIG_SERIAL_ALTERA_UART=m -CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 -CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 -CONFIG_SERIAL_IFX6X60=m -CONFIG_SERIAL_PCH_UART=m -CONFIG_SERIAL_ARC=m -CONFIG_SERIAL_ARC_NR_PORTS=1 -CONFIG_SERIAL_RP2=m -CONFIG_SERIAL_RP2_NR_UARTS=32 -CONFIG_SERIAL_FSL_LPUART=m -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=m -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_ATMEL=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -# CONFIG_HW_RANDOM_EXYNOS is not set -CONFIG_HW_RANDOM_TPM=m -CONFIG_NVRAM=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_MWAVE=m -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HPET_MMAP_DEFAULT=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_TIS_I2C_ATMEL=m -CONFIG_TCG_TIS_I2C_INFINEON=m -CONFIG_TCG_TIS_I2C_NUVOTON=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TCG_ST33_I2C=m -CONFIG_TCG_XEN=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_MUX=m - -# -# Multiplexer I2C Chip support -# -CONFIG_I2C_MUX_GPIO=m -CONFIG_I2C_MUX_PCA9541=m -CONFIG_I2C_MUX_PCA954x=m -CONFIG_I2C_MUX_PINCTRL=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_SMBUS=m -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_ISMT=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# ACPI drivers -# -CONFIG_I2C_SCMI=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_CBUS_GPIO=m -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PLATFORM=m -CONFIG_I2C_DESIGNWARE_PCI=m -CONFIG_I2C_EG20T=m -CONFIG_I2C_GPIO=m -CONFIG_I2C_KEMPLD=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_PCA_PLATFORM=m -# CONFIG_I2C_PXA_PCI is not set -CONFIG_I2C_SIMTEC=m -# CONFIG_I2C_XILINX is not set - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_DIOLAN_U2C=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_ROBOTFUZZ_OSIF=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m -CONFIG_I2C_VIPERBOARD=m - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_ALTERA=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_OC_TINY=m -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=m -CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_SC18IS602=m -CONFIG_SPI_TOPCLIFF_PCH=m -CONFIG_SPI_XCOMM=m -CONFIG_SPI_XILINX=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_DW_PCI=m -CONFIG_SPI_DW_MID_DMA=y -CONFIG_SPI_DW_MMIO=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m -CONFIG_HSI=m -CONFIG_HSI_BOARDINFO=y - -# -# HSI clients -# -CONFIG_HSI_CHAR=m - -# -# PPS support -# -CONFIG_PPS=y -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -CONFIG_PPS_CLIENT_KTIMER=m -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=y - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PTP_1588_CLOCK_PCH=m -CONFIG_PINCTRL=y - -# -# Pin controllers -# -CONFIG_PINMUX=y -CONFIG_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_ACPI=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=m -CONFIG_GPIO_DA9052=m -CONFIG_GPIO_MAX730X=m - -# -# Memory mapped GPIO drivers: -# -CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_GPIO_IT8761E=m -CONFIG_GPIO_F7188X=m -CONFIG_GPIO_SCH311X=m -CONFIG_GPIO_TS5500=m -CONFIG_GPIO_SCH=m -CONFIG_GPIO_ICH=m -CONFIG_GPIO_VX855=m -CONFIG_GPIO_LYNXPOINT=y - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_ARIZONA=m -CONFIG_GPIO_LP3943=m -CONFIG_GPIO_MAX7300=m -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m -CONFIG_GPIO_STMPE=y -# CONFIG_GPIO_TPS65912 is not set -# CONFIG_GPIO_WM831X is not set -CONFIG_GPIO_ADP5588=m - -# -# PCI GPIO expanders: -# -CONFIG_GPIO_CS5535=m -CONFIG_GPIO_AMD8111=m -# CONFIG_GPIO_INTEL_MID is not set -CONFIG_GPIO_PCH=m -CONFIG_GPIO_ML_IOH=m -CONFIG_GPIO_TIMBERDALE=y -CONFIG_GPIO_RDC321X=m - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MC33880=m - -# -# AC97 GPIO expanders: -# -CONFIG_GPIO_UCB1400=m - -# -# LPC GPIO expanders: -# -CONFIG_GPIO_KEMPLD=m - -# -# MODULbus GPIO expanders: -# -CONFIG_GPIO_JANZ_TTL=m - -# -# USB GPIO expanders: -# -CONFIG_GPIO_VIPERBOARD=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2408=m -CONFIG_W1_SLAVE_DS2408_READBACK=y -CONFIG_W1_SLAVE_DS2413=m -CONFIG_W1_SLAVE_DS2423=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -CONFIG_W1_SLAVE_DS2433_CRC=y -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_DS2780=m -CONFIG_W1_SLAVE_DS2781=m -CONFIG_W1_SLAVE_DS28E04=m -CONFIG_W1_SLAVE_BQ27000=m -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_GENERIC_ADC_BATTERY=m -# CONFIG_WM831X_BACKUP is not set -# CONFIG_WM831X_POWER is not set -CONFIG_TEST_POWER=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_DS2780=m -CONFIG_BATTERY_DS2781=m -CONFIG_BATTERY_DS2782=m -CONFIG_BATTERY_SBS=m -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_BQ27X00_I2C=y -CONFIG_BATTERY_BQ27X00_PLATFORM=y -CONFIG_BATTERY_DA9052=m -CONFIG_BATTERY_MAX17040=m -CONFIG_BATTERY_MAX17042=m -CONFIG_CHARGER_PCF50633=m -CONFIG_CHARGER_ISP1704=m -CONFIG_CHARGER_MAX8903=m -CONFIG_CHARGER_LP8727=m -CONFIG_CHARGER_GPIO=m -CONFIG_CHARGER_MANAGER=y -CONFIG_CHARGER_BQ2415X=m -CONFIG_CHARGER_BQ24190=m -CONFIG_CHARGER_BQ24735=m -CONFIG_CHARGER_SMB347=m -# CONFIG_POWER_RESET is not set -CONFIG_POWER_AVS=y -CONFIG_HWMON=m -CONFIG_HWMON_VID=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Native drivers -# -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7314=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7X10=m -CONFIG_SENSORS_ADT7310=m -CONFIG_SENSORS_ADT7410=m -CONFIG_SENSORS_ADT7411=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_ASC7621=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_K10TEMP=m -CONFIG_SENSORS_FAM15H_POWER=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS620=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_DA9052_ADC=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_G762=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_GPIO_FAN=m -CONFIG_SENSORS_HIH6130=m -CONFIG_SENSORS_HTU21=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IIO_HWMON=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_JC42=m -CONFIG_SENSORS_LINEAGE=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM73=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4151=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LTC4261=m -CONFIG_SENSORS_LM95234=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_LM95245=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX16065=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX1668=m -CONFIG_SENSORS_MAX197=m -CONFIG_SENSORS_MAX6639=m -CONFIG_SENSORS_MAX6642=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_MAX6697=m -CONFIG_SENSORS_MCP3021=m -CONFIG_SENSORS_NCT6775=m -CONFIG_SENSORS_NTC_THERMISTOR=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_PMBUS=m -CONFIG_SENSORS_PMBUS=m -CONFIG_SENSORS_ADM1275=m -CONFIG_SENSORS_LM25066=m -CONFIG_SENSORS_LTC2978=m -CONFIG_SENSORS_MAX16064=m -CONFIG_SENSORS_MAX34440=m -CONFIG_SENSORS_MAX8688=m -CONFIG_SENSORS_UCD9000=m -CONFIG_SENSORS_UCD9200=m -CONFIG_SENSORS_ZL6100=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SHT21=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMM665=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_EMC1403=m -CONFIG_SENSORS_EMC2103=m -CONFIG_SENSORS_EMC6W201=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SENSORS_SCH5627=m -CONFIG_SENSORS_SCH5636=m -CONFIG_SENSORS_ADS1015=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m -CONFIG_SENSORS_AMC6821=m -CONFIG_SENSORS_INA209=m -CONFIG_SENSORS_INA2XX=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_TMP102=m -CONFIG_SENSORS_TMP401=m -CONFIG_SENSORS_TMP421=m -CONFIG_SENSORS_VIA_CPUTEMP=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83795=m -# CONFIG_SENSORS_W83795_FANCTRL is not set -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -# CONFIG_SENSORS_WM831X is not set -CONFIG_SENSORS_APPLESMC=m -CONFIG_SENSORS_MC13783_ADC=m - -# -# ACPI drivers -# -CONFIG_SENSORS_ACPI_POWER=m -CONFIG_SENSORS_ATK0110=m -CONFIG_THERMAL=m -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_GOV_FAIR_SHARE is not set -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_GOV_USER_SPACE=y -# CONFIG_THERMAL_EMULATION is not set -CONFIG_INTEL_POWERCLAMP=m -CONFIG_X86_PKG_TEMP_THERMAL=m -CONFIG_ACPI_INT3403_THERMAL=m - -# -# Texas Instruments thermal drivers -# -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_DA9052_WATCHDOG=m -# CONFIG_WM831X_WATCHDOG is not set -CONFIG_DW_WATCHDOG=m -CONFIG_RETU_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_F71808E_WDT=m -CONFIG_SP5100_TCO=m -CONFIG_GEODE_WDT=m -CONFIG_SC520_WDT=m -CONFIG_SBC_FITPC2_WATCHDOG=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_IE6XX_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_KEMPLD_WDT=m -CONFIG_HPWDT_NMI_DECODING=y -CONFIG_SC1200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_NV_TCO=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_VIA_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m -CONFIG_MEN_A21_WDT=m -CONFIG_XEN_WDT=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y -CONFIG_SSB_DRIVER_GPIO=y -CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -CONFIG_BCMA_HOST_SOC=y -CONFIG_BCMA_DRIVER_GMAC_CMN=y -CONFIG_BCMA_DRIVER_GPIO=y -# CONFIG_BCMA_DEBUG is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -CONFIG_MFD_CS5535=m -CONFIG_MFD_CROS_EC=m -CONFIG_MFD_CROS_EC_I2C=m -CONFIG_PMIC_DA9052=y -CONFIG_MFD_DA9052_SPI=y -CONFIG_MFD_MC13XXX=m -CONFIG_MFD_MC13XXX_SPI=m -CONFIG_MFD_MC13XXX_I2C=m -CONFIG_HTC_PASIC3=m -CONFIG_LPC_ICH=m -CONFIG_LPC_SCH=m -CONFIG_MFD_JANZ_CMODIO=m -CONFIG_MFD_KEMPLD=m -CONFIG_EZX_PCAP=y -CONFIG_MFD_VIPERBOARD=m -CONFIG_MFD_RETU=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_UCB1400_CORE=m -CONFIG_MFD_RDC321X=m -CONFIG_MFD_RTSX_PCI=m -CONFIG_MFD_SI476X_CORE=m -CONFIG_MFD_SM501=m -CONFIG_MFD_SM501_GPIO=y -CONFIG_ABX500_CORE=y -CONFIG_MFD_STMPE=y - -# -# STMicroelectronics STMPE Interface Drivers -# -CONFIG_STMPE_SPI=y -CONFIG_MFD_SYSCON=y -CONFIG_MFD_TI_AM335X_TSCADC=m -CONFIG_MFD_LP3943=m -CONFIG_TPS6105X=m -CONFIG_TPS65010=m -CONFIG_TPS6507X=m -CONFIG_MFD_TPS65217=m -CONFIG_MFD_TPS65912=y -CONFIG_MFD_TPS65912_SPI=y -CONFIG_MFD_WL1273_CORE=m -CONFIG_MFD_LM3533=m -CONFIG_MFD_TIMBERDALE=m -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_VX855=m -CONFIG_MFD_ARIZONA=y -CONFIG_MFD_ARIZONA_I2C=m -CONFIG_MFD_ARIZONA_SPI=m -CONFIG_MFD_WM5102=y -CONFIG_MFD_WM5110=y -# CONFIG_MFD_WM8997 is not set -CONFIG_MFD_WM831X=y -CONFIG_MFD_WM831X_SPI=y -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -CONFIG_REGULATOR_FIXED_VOLTAGE=m -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_USERSPACE_CONSUMER=m -CONFIG_REGULATOR_ACT8865=m -CONFIG_REGULATOR_AD5398=m -CONFIG_REGULATOR_ANATOP=m -CONFIG_REGULATOR_ARIZONA=m -CONFIG_REGULATOR_DA9052=m -CONFIG_REGULATOR_DA9210=m -CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_GPIO=m -CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP872X=m -CONFIG_REGULATOR_LP8755=m -CONFIG_REGULATOR_MAX1586=m -CONFIG_REGULATOR_MAX8649=m -CONFIG_REGULATOR_MAX8660=m -CONFIG_REGULATOR_MAX8952=m -CONFIG_REGULATOR_MAX8973=m -CONFIG_REGULATOR_MC13XXX_CORE=m -CONFIG_REGULATOR_MC13783=m -CONFIG_REGULATOR_MC13892=m -CONFIG_REGULATOR_PCAP=m -CONFIG_REGULATOR_PCF50633=m -CONFIG_REGULATOR_PFUZE100=m -CONFIG_REGULATOR_TPS51632=m -CONFIG_REGULATOR_TPS6105X=m -CONFIG_REGULATOR_TPS62360=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_TPS65217=m -CONFIG_REGULATOR_TPS6524X=m -# CONFIG_REGULATOR_TPS65912 is not set -# CONFIG_REGULATOR_WM831X is not set -CONFIG_MEDIA_SUPPORT=m - -# -# Multimedia core support -# -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_RC_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -CONFIG_VIDEO_TUNER=m -CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DMA_CONTIG=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_DVB_CORE=m -CONFIG_DVB_NET=y -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_MAX_ADAPTERS=8 -CONFIG_DVB_DYNAMIC_MINORS=y - -# -# Media drivers -# -CONFIG_RC_CORE=m -CONFIG_RC_MAP=m -CONFIG_RC_DECODERS=y -CONFIG_LIRC=m -CONFIG_IR_LIRC_CODEC=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m -CONFIG_IR_SANYO_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m -CONFIG_IR_ENE=m -CONFIG_IR_IMON=m -CONFIG_IR_MCEUSB=m -CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m -CONFIG_IR_NUVOTON=m -CONFIG_IR_REDRAT3=m -CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGUANA=m -CONFIG_IR_TTUSBIR=m -CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_MEDIA_USB_SUPPORT=y - -# -# Webcam devices -# -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STK1135=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_VIDEO_USBTV=m - -# -# Analog TV USB devices -# -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_TLG2300=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160_COMMON=m -CONFIG_VIDEO_STK1160_AC97=y -CONFIG_VIDEO_STK1160=m - -# -# Analog/digital TV USB devices -# -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_AU0828_V4L2=y -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_RC=y -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m - -# -# Digital TV USB devices -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_FRIIO=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_V2=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_AF9035=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_AZ6007=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_USB_EC168=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_IT913X=m -CONFIG_DVB_USB_LME2510=m -CONFIG_DVB_USB_MXL111SF=m -CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set - -# -# Webcam, TV (analog/digital) USB devices -# -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_V4L2=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX_RC=m -CONFIG_MEDIA_PCI_SUPPORT=y - -# -# Media capture support -# -CONFIG_VIDEO_MEYE=m - -# -# Media capture/analog TV support -# -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_IVTV_ALSA=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m - -# -# Media capture/analog/hybrid TV support -# -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CX18_ALSA=m -CONFIG_VIDEO_CX23885=m -CONFIG_MEDIA_ALTERA_CI=m -CONFIG_VIDEO_CX25821=m -CONFIG_VIDEO_CX25821_ALSA=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_ENABLE_VP3054=y -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_RC=y -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7164=m - -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m -CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_MANTIS_CORE=m -CONFIG_DVB_MANTIS=m -CONFIG_DVB_HOPPER=m -CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m -CONFIG_VIDEO_TIMBERDALE=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_SCALE_CROP=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_VIDEO_RCAR_VIN=m -CONFIG_VIDEO_SH_MOBILE_CSI2=m -CONFIG_VIDEO_SH_MOBILE_CEU=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_VIDEO_SH_VEU=m -CONFIG_VIDEO_RENESAS_VSP1=m -# CONFIG_V4L_TEST_DRIVERS is not set - -# -# Supported MMC/SDIO adapters -# -CONFIG_SMS_SDIO_DRV=m -# CONFIG_MEDIA_PARPORT_SUPPORT is not set -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_TEA575X=m -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_SI4713=m -CONFIG_PLATFORM_SI4713=m -CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_TIMBERDALE=m -CONFIG_RADIO_WL1273=m - -# -# Texas Instruments WL128x FM driver (ST based) -# -CONFIG_RADIO_WL128X=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -# CONFIG_DVB_FIREDTV is not set -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set - -# -# Media ancillary drivers (tuners, sensors, i2c, frontends) -# -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_VIDEO_IR_I2C=m - -# -# Audio decoders, processors and mixers -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Camera sensor devices -# -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_MT9V011=m - -# -# Flash devices -# - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m - -# -# Audio/Video compression chips -# -CONFIG_VIDEO_SAA6752HS=m - -# -# Miscellaneous helper chips -# -CONFIG_VIDEO_M52790=m - -# -# Sensors used on soc_camera driver -# - -# -# soc_camera sensor drivers -# -CONFIG_SOC_CAMERA_IMX074=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_SOC_CAMERA_MT9T112=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_OV2640=m -CONFIG_SOC_CAMERA_OV5642=m -CONFIG_SOC_CAMERA_OV6650=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_SOC_CAMERA_OV9640=m -CONFIG_SOC_CAMERA_OV9740=m -CONFIG_SOC_CAMERA_RJ54N1=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_MEDIA_TUNER=m -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88TS2022=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m - -# -# Multistandard (satellite) frontends -# -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_STV090x=m -CONFIG_DVB_STV6110x=m -CONFIG_DVB_M88DS3103=m - -# -# Multistandard (cable + terrestrial) frontends -# -CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_RTL2830=m -CONFIG_DVB_RTL2832=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_LG2160=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m -CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m -CONFIG_DVB_DIB8000=m -CONFIG_DVB_MB86A20S=m - -# -# Digital terrestrial only tuners/PLL -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_TUNER_DIB0090=m - -# -# SEC control devices for DVB-S -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m -CONFIG_DVB_IT913X_FE=m -CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m - -# -# Tools to develop new frontends -# -# CONFIG_DVB_DUMMY_FE is not set - -# -# Graphics support -# -CONFIG_AGP=m -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -CONFIG_AGP_SIS=m -CONFIG_AGP_VIA=m -CONFIG_INTEL_GTT=m -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -CONFIG_VGA_SWITCHEROO=y -CONFIG_DRM=m -CONFIG_DRM_USB=m -CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_KMS_FB_HELPER=y -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set -CONFIG_DRM_TTM=m - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_I2C_NXP_TDA998X=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -# CONFIG_DRM_RADEON_UMS is not set -CONFIG_DRM_NOUVEAU=m -CONFIG_NOUVEAU_DEBUG=5 -CONFIG_NOUVEAU_DEBUG_DEFAULT=3 -CONFIG_DRM_NOUVEAU_BACKLIGHT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y -CONFIG_DRM_I915_FBDEV=y -CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y -# CONFIG_DRM_I915_UMS is not set -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_DRM_VMWGFX=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y -CONFIG_DRM_UDL=m -CONFIG_DRM_AST=m -CONFIG_DRM_MGAG200=m -CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_DRM_QXL=m -CONFIG_DRM_BOCHS=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_HDMI=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -# CONFIG_FB_DDC is not set -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -# CONFIG_FB_SVGALIB is not set -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_UVESA=m -CONFIG_FB_VESA=y -CONFIG_FB_EFI=y -# CONFIG_FB_N411 is not set -# CONFIG_FB_HGA is not set -CONFIG_FB_OPENCORES=m -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -CONFIG_FB_VIA=m -CONFIG_FB_VIA_DIRECT_PROCFS=y -CONFIG_FB_VIA_X_COMPATIBILITY=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_TMIO is not set -# CONFIG_FB_SM501 is not set -# CONFIG_FB_SMSCUFX is not set -CONFIG_FB_UDL=m -# CONFIG_FB_GOLDFISH is not set -# CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=m -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_AUO_K190X is not set -CONFIG_FB_HYPERV=m -# CONFIG_FB_SIMPLE is not set -# CONFIG_EXYNOS_VIDEO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_L4F00242T03=m -CONFIG_LCD_LMS283GF05=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI922X=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_LCD_S6E63M0=m -CONFIG_LCD_LD9040=m -CONFIG_LCD_AMS369FG06=m -CONFIG_LCD_LMS501KF03=m -CONFIG_LCD_HX8357=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_ATMEL_PWM=m -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_LM3533=m -CONFIG_BACKLIGHT_PWM=m -CONFIG_BACKLIGHT_DA9052=m -CONFIG_BACKLIGHT_APPLE=m -CONFIG_BACKLIGHT_SAHARA=m -# CONFIG_BACKLIGHT_WM831X is not set -CONFIG_BACKLIGHT_ADP8860=m -CONFIG_BACKLIGHT_ADP8870=m -CONFIG_BACKLIGHT_PCF50633=m -CONFIG_BACKLIGHT_LM3630A=m -CONFIG_BACKLIGHT_LM3639=m -CONFIG_BACKLIGHT_LP855X=m -CONFIG_BACKLIGHT_OT200=m -CONFIG_BACKLIGHT_TPS65217=m -CONFIG_BACKLIGHT_GPIO=m -CONFIG_BACKLIGHT_LV5207LP=m -CONFIG_BACKLIGHT_BD6107=m - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -# CONFIG_LOGO is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -CONFIG_SOUND_OSS_CORE_PRECLAIM=y -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_COMPRESS_OFFLOAD=m -CONFIG_SND_JACK=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_KCTL_JACK=y -CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_RAWMIDI_SEQ=m -CONFIG_SND_OPL3_LIB_SEQ=m -# CONFIG_SND_OPL4_LIB_SEQ is not set -# CONFIG_SND_SBAWE_SEQ is not set -CONFIG_SND_EMU10K1_SEQ=m -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -# CONFIG_SND_PCSP is not set -CONFIG_SND_DUMMY=m -CONFIG_SND_ALOOP=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1 -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB16_DSP=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ASIHPI=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_CTXFI=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_ES1968_INPUT=y -# CONFIG_SND_ES1968_RADIO is not set -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_DSP_LOADER=y -CONFIG_SND_HDA_PREALLOC_SIZE=64 -CONFIG_SND_HDA_HWDEP=y -CONFIG_SND_HDA_RECONFIG=y -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_INPUT_BEEP_MODE=1 -CONFIG_SND_HDA_INPUT_JACK=y -# CONFIG_SND_HDA_PATCH_LOADER is not set -CONFIG_SND_HDA_CODEC_REALTEK=m -CONFIG_SND_HDA_CODEC_ANALOG=m -CONFIG_SND_HDA_CODEC_SIGMATEL=m -CONFIG_SND_HDA_CODEC_VIA=m -CONFIG_SND_HDA_CODEC_HDMI=m -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_CODEC_CIRRUS=m -CONFIG_SND_HDA_CODEC_CONEXANT=m -CONFIG_SND_HDA_CODEC_CA0110=m -CONFIG_SND_HDA_CODEC_CA0132=m -CONFIG_SND_HDA_CODEC_CA0132_DSP=y -CONFIG_SND_HDA_CODEC_CMEDIA=m -CONFIG_SND_HDA_CODEC_SI3054=m -CONFIG_SND_HDA_GENERIC=m -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_LOLA=m -CONFIG_SND_LX6464ES=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MAESTRO3_INPUT=y -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_SPI=y -CONFIG_SND_AT73C213=m -CONFIG_SND_AT73C213_TARGET_BITRATE=48000 -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_UA101=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -CONFIG_SND_USB_CAIAQ_INPUT=y -CONFIG_SND_USB_US122L=m -CONFIG_SND_USB_6FIRE=m -CONFIG_SND_USB_HIFACE=m -CONFIG_SND_FIREWIRE=y -CONFIG_SND_FIREWIRE_LIB=m -CONFIG_SND_DICE=m -# CONFIG_SND_FIREWIRE_SPEAKERS is not set -# CONFIG_SND_ISIGHT is not set -CONFIG_SND_SCS1X=m -CONFIG_SND_SOC=m -CONFIG_SND_ATMEL_SOC=m -CONFIG_SND_DESIGNWARE_I2S=m -CONFIG_SND_SOC_I2C_AND_SPI=m -CONFIG_SND_SOC_SI476X=m -CONFIG_SND_SIMPLE_CARD=m -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m - -# -# HID support -# -CONFIG_HID=m -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_ACRUX=m -CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m -CONFIG_HID_APPLEIR=m -CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CYPRESS=m -CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y -CONFIG_HID_EMS_FF=m -CONFIG_HID_ELECOM=m -CONFIG_HID_ELO=m -CONFIG_HID_EZKEY=m -CONFIG_HID_HOLTEK=m -# CONFIG_HOLTEK_FF is not set -CONFIG_HID_HUION=m -CONFIG_HID_KEYTOUCH=m -CONFIG_HID_KYE=m -CONFIG_HID_UCLOGIC=m -CONFIG_HID_WALTOP=m -CONFIG_HID_GYRATION=m -CONFIG_HID_ICADE=m -CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LCPOWER=m -CONFIG_HID_LENOVO_TPKBD=m -CONFIG_HID_LOGITECH=m -CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y -CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_MULTITOUCH=m -CONFIG_HID_NTRIG=m -CONFIG_HID_ORTEK=m -CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y -CONFIG_HID_PETALYNX=m -CONFIG_HID_PICOLCD=m -CONFIG_HID_PICOLCD_FB=y -CONFIG_HID_PICOLCD_BACKLIGHT=y -CONFIG_HID_PICOLCD_LCD=y -CONFIG_HID_PICOLCD_LEDS=y -CONFIG_HID_PICOLCD_CIR=y -CONFIG_HID_PRIMAX=m -CONFIG_HID_ROCCAT=m -CONFIG_HID_SAITEK=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_SONY_FF=y -CONFIG_HID_SPEEDLINK=m -CONFIG_HID_STEELSERIES=m -CONFIG_HID_SUNPLUS=m -CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y -CONFIG_HID_HYPERV_MOUSE=m -CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y -CONFIG_HID_TIVO=m -CONFIG_HID_TOPSEED=m -CONFIG_HID_THINGM=m -CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y -CONFIG_HID_WACOM=m -CONFIG_HID_WIIMOTE=m -CONFIG_HID_XINMO=m -CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -CONFIG_HID_ZYDACRON=m -CONFIG_HID_SENSOR_HUB=m - -# -# USB HID support -# -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# -# I2C HID support -# -CONFIG_I2C_HID=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OTG=y -CONFIG_USB_OTG_WHITELIST=y -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_XHCI_HCD=m -CONFIG_USB_XHCI_PLATFORM=m -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_EHCI_PCI=m -CONFIG_USB_EHCI_HCD_PLATFORM=m -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ISP1760_HCD=m -CONFIG_USB_ISP1362_HCD=m -CONFIG_USB_FUSBH200_HCD=m -CONFIG_USB_FOTG210_HCD=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_HCD_PCI=m -CONFIG_USB_OHCI_HCD_SSB=y -CONFIG_USB_OHCI_HCD_PLATFORM=m -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -# CONFIG_USB_SL811_HCD_ISO is not set -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_RENESAS_USBHS_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m -CONFIG_USB_HCD_BCMA=m -CONFIG_USB_HCD_SSB=m -# CONFIG_USB_HCD_TEST_MODE is not set -CONFIG_USB_RENESAS_USBHS=m - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=m -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_STORAGE_ENE_UB6250=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m -CONFIG_USB_MUSB_HDRC=m -# CONFIG_USB_MUSB_HOST is not set -# CONFIG_USB_MUSB_GADGET is not set -CONFIG_USB_MUSB_DUAL_ROLE=y -CONFIG_USB_MUSB_TUSB6010=m -CONFIG_USB_MUSB_UX500=m -# CONFIG_USB_UX500_DMA is not set -CONFIG_MUSB_PIO_ONLY=y -CONFIG_USB_DWC3=m -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_GADGET is not set -CONFIG_USB_DWC3_DUAL_ROLE=y - -# -# Platform Glue Driver Support -# -CONFIG_USB_DWC3_OMAP=m -CONFIG_USB_DWC3_EXYNOS=m -CONFIG_USB_DWC3_PCI=m -CONFIG_USB_DWC3_KEYSTONE=m - -# -# Debugging features -# -# CONFIG_USB_DWC3_DEBUG is not set -CONFIG_USB_DWC2=m -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_CHIPIDEA=m -# CONFIG_USB_CHIPIDEA_UDC is not set -CONFIG_USB_CHIPIDEA_HOST=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_SIMPLE=m -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_F81232=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_METRO=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7715_PARPORT=y -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MXUPORT=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QCAUX=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_WWAN=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_XSENS_MT=m -CONFIG_USB_SERIAL_WISHBONE=m -CONFIG_USB_SERIAL_ZTE=m -CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_QT2=m -# CONFIG_USB_SERIAL_DEBUG is not set - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_EHSET_TEST_FIXTURE=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_YUREX=m -CONFIG_USB_EZUSB_FX2=m -CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_USB_OTG_FSM=m -CONFIG_NOP_USB_XCEIV=m -CONFIG_SAMSUNG_USBPHY=m -CONFIG_SAMSUNG_USB2PHY=m -CONFIG_SAMSUNG_USB3PHY=m -CONFIG_USB_GPIO_VBUS=m -CONFIG_TAHVO_USB=m -# CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set -CONFIG_USB_ISP1301=m -CONFIG_USB_RCAR_PHY=m -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -# CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 - -# -# USB Peripheral Controller -# -CONFIG_USB_FOTG210_UDC=m -CONFIG_USB_GR_UDC=m -CONFIG_USB_R8A66597=m -CONFIG_USB_RENESAS_USBHS_UDC=m -CONFIG_USB_PXA27X=m -CONFIG_USB_MV_UDC=m -CONFIG_USB_MV_U3D=m -CONFIG_USB_M66592=m -CONFIG_USB_AMD5536UDC=m -CONFIG_USB_NET2272=m -# CONFIG_USB_NET2272_DMA is not set -CONFIG_USB_NET2280=m -CONFIG_USB_GOKU=m -CONFIG_USB_EG20T=m -CONFIG_USB_DUMMY_HCD=m -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_PHONET=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_CONFIGFS=m -# CONFIG_USB_CONFIGFS_SERIAL is not set -# CONFIG_USB_CONFIGFS_ACM is not set -# CONFIG_USB_CONFIGFS_OBEX is not set -# CONFIG_USB_CONFIGFS_NCM is not set -# CONFIG_USB_CONFIGFS_ECM is not set -# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set -# CONFIG_USB_CONFIGFS_RNDIS is not set -# CONFIG_USB_CONFIGFS_EEM is not set -# CONFIG_USB_CONFIGFS_PHONET is not set -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -# CONFIG_USB_CONFIGFS_F_LB_SS is not set -# CONFIG_USB_CONFIGFS_F_FS is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_AUDIO=m -CONFIG_GADGET_UAC1=y -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -# CONFIG_USB_FUNCTIONFS_ETH is not set -# CONFIG_USB_FUNCTIONFS_RNDIS is not set -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_GADGET_TARGET=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m -CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set -CONFIG_USB_G_NOKIA=m -CONFIG_USB_G_ACM_MS=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_MULTI_RNDIS=y -CONFIG_USB_G_MULTI_CDC=y -CONFIG_USB_G_HID=m -CONFIG_USB_G_DBGP=m -# CONFIG_USB_G_DBGP_PRINTK is not set -CONFIG_USB_G_DBGP_SERIAL=y -CONFIG_USB_G_WEBCAM=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_I1480U=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set -CONFIG_MMC_CLKGATE=y - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=m -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -# CONFIG_MMC_RICOH_MMC is not set -CONFIG_MMC_SDHCI_ACPI=m -CONFIG_MMC_SDHCI_PLTFM=m -CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_SDHCI_PXAV2=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SPI=m -CONFIG_MMC_CB710=m -CONFIG_MMC_VIA_SDMMC=m -CONFIG_MMC_VUB300=m -CONFIG_MMC_USHC=m -CONFIG_MMC_REALTEK_PCI=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m -CONFIG_MS_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_MEMSTICK_R592=m -CONFIG_MEMSTICK_REALTEK_PCI=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y - -# -# LED drivers -# -CONFIG_LEDS_ATMEL_PWM=m -CONFIG_LEDS_LM3530=m -CONFIG_LEDS_LM3533=m -CONFIG_LEDS_LM3642=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_PCA9532_GPIO=y -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_LP3944=m -CONFIG_LEDS_LP55XX_COMMON=m -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_LP5523=m -CONFIG_LEDS_LP5562=m -CONFIG_LEDS_LP8501=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_PCA963X=m -CONFIG_LEDS_PCA9685=m -# CONFIG_LEDS_WM831X_STATUS is not set -CONFIG_LEDS_DA9052=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_PWM=m -CONFIG_LEDS_REGULATOR=m -CONFIG_LEDS_BD2802=m -CONFIG_LEDS_INTEL_SS4200=m -CONFIG_LEDS_LT3593=m -CONFIG_LEDS_DELL_NETBOOKS=m -CONFIG_LEDS_MC13783=m -CONFIG_LEDS_TCA6507=m -CONFIG_LEDS_LM355x=m -CONFIG_LEDS_OT200=m -CONFIG_LEDS_BLINKM=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_LEDS_TRIGGER_CAMERA=m -# CONFIG_ACCESSIBILITY is not set -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_QIB=m -CONFIG_INFINIBAND_QIB_DCA=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_CXGB4=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_OCRDMA=m -CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_SRPT=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_ISERT=m -CONFIG_EDAC=y -CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_DEBUG is not set -CONFIG_EDAC_DECODE_MCE=m -CONFIG_EDAC_MCE_INJ=m -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_AMD64=m -CONFIG_EDAC_AMD64_ERROR_INJECTION=y -CONFIG_EDAC_E752X=m -CONFIG_EDAC_I82975X=m -CONFIG_EDAC_I3000=m -CONFIG_EDAC_I3200=m -CONFIG_EDAC_X38=m -CONFIG_EDAC_I5400=m -CONFIG_EDAC_I7CORE=m -CONFIG_EDAC_I5000=m -CONFIG_EDAC_I5100=m -CONFIG_EDAC_I7300=m -CONFIG_EDAC_SBRIDGE=m -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -CONFIG_RTC_DRV_TEST=m - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_DS3232=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_ISL12022=m -CONFIG_RTC_DRV_ISL12057=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF2127=m -CONFIG_RTC_DRV_PCF8523=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_BQ32K=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m -CONFIG_RTC_DRV_RX8025=m -CONFIG_RTC_DRV_EM3027=m -CONFIG_RTC_DRV_RV3029C2=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m -CONFIG_RTC_DRV_RX4581=m - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_DA9052=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_RP5C01=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_DS2404=m -CONFIG_RTC_DRV_WM831X=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_PCAP=m -CONFIG_RTC_DRV_MC13XXX=m -CONFIG_RTC_DRV_MOXART=m - -# -# HID Sensor RTC drivers -# -CONFIG_RTC_DRV_HID_SENSOR_TIME=m -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_INTEL_MID_DMAC=m -CONFIG_INTEL_IOATDMA=m -CONFIG_DW_DMAC_CORE=m -CONFIG_DW_DMAC=m -CONFIG_DW_DMAC_PCI=m -CONFIG_TIMB_DMA=m -CONFIG_PCH_DMA=m -CONFIG_DMA_ENGINE=y -CONFIG_DMA_ACPI=y - -# -# DMA Clients -# -CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y -CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_DMEM_GENIRQ=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -CONFIG_UIO_PCI_GENERIC=m -CONFIG_UIO_NETX=m -CONFIG_UIO_MF624=m -CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO=m -CONFIG_VFIO_PCI=m -CONFIG_VFIO_PCI_VGA=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO=m - -# -# Virtio drivers -# -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_MMIO=m -# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set - -# -# Microsoft Hyper-V guest support -# -CONFIG_HYPERV=m -CONFIG_HYPERV_UTILS=m -CONFIG_HYPERV_BALLOON=m - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -# CONFIG_XEN_SELFBALLOONING is not set -# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=m -CONFIG_XEN_PCIDEV_BACKEND=m -CONFIG_XEN_PRIVCMD=m -CONFIG_XEN_ACPI_PROCESSOR=m -# CONFIG_XEN_MCE_LOG is not set -CONFIG_XEN_HAVE_PVMMU=y -CONFIG_STAGING=y -CONFIG_ET131X=m -CONFIG_SLICOSS=m -CONFIG_USBIP_CORE=m -CONFIG_USBIP_VHCI_HCD=m -CONFIG_USBIP_HOST=m -# CONFIG_USBIP_DEBUG is not set -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m -CONFIG_ECHO=m -CONFIG_COMEDI=m -# CONFIG_COMEDI_DEBUG is not set -CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 -CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 -CONFIG_COMEDI_MISC_DRIVERS=y -CONFIG_COMEDI_KCOMEDILIB=m -CONFIG_COMEDI_BOND=m -CONFIG_COMEDI_TEST=m -CONFIG_COMEDI_PARPORT=m -CONFIG_COMEDI_SERIAL2002=m -CONFIG_COMEDI_SKEL=m -# CONFIG_COMEDI_ISA_DRIVERS is not set -CONFIG_COMEDI_PCI_DRIVERS=y -CONFIG_COMEDI_8255_PCI=m -CONFIG_COMEDI_ADDI_WATCHDOG=m -CONFIG_COMEDI_ADDI_APCI_035=m -CONFIG_COMEDI_ADDI_APCI_1032=m -CONFIG_COMEDI_ADDI_APCI_1500=m -CONFIG_COMEDI_ADDI_APCI_1516=m -CONFIG_COMEDI_ADDI_APCI_1564=m -CONFIG_COMEDI_ADDI_APCI_16XX=m -CONFIG_COMEDI_ADDI_APCI_2032=m -CONFIG_COMEDI_ADDI_APCI_2200=m -CONFIG_COMEDI_ADDI_APCI_3120=m -CONFIG_COMEDI_ADDI_APCI_3501=m -CONFIG_COMEDI_ADDI_APCI_3XXX=m -CONFIG_COMEDI_ADL_PCI6208=m -CONFIG_COMEDI_ADL_PCI7X3X=m -CONFIG_COMEDI_ADL_PCI8164=m -CONFIG_COMEDI_ADL_PCI9111=m -CONFIG_COMEDI_ADL_PCI9118=m -CONFIG_COMEDI_ADV_PCI1710=m -CONFIG_COMEDI_ADV_PCI1723=m -CONFIG_COMEDI_ADV_PCI1724=m -CONFIG_COMEDI_ADV_PCI_DIO=m -CONFIG_COMEDI_AMPLC_DIO200_PCI=m -CONFIG_COMEDI_AMPLC_PC236_PCI=m -CONFIG_COMEDI_AMPLC_PC263_PCI=m -CONFIG_COMEDI_AMPLC_PCI224=m -CONFIG_COMEDI_AMPLC_PCI230=m -CONFIG_COMEDI_CONTEC_PCI_DIO=m -CONFIG_COMEDI_DAS08_PCI=m -CONFIG_COMEDI_DT3000=m -CONFIG_COMEDI_DYNA_PCI10XX=m -CONFIG_COMEDI_GSC_HPDI=m -CONFIG_COMEDI_MF6X4=m -CONFIG_COMEDI_ICP_MULTI=m -CONFIG_COMEDI_DAQBOARD2000=m -CONFIG_COMEDI_JR3_PCI=m -CONFIG_COMEDI_KE_COUNTER=m -CONFIG_COMEDI_CB_PCIDAS64=m -CONFIG_COMEDI_CB_PCIDAS=m -CONFIG_COMEDI_CB_PCIDDA=m -CONFIG_COMEDI_CB_PCIMDAS=m -CONFIG_COMEDI_CB_PCIMDDA=m -CONFIG_COMEDI_ME4000=m -CONFIG_COMEDI_ME_DAQ=m -CONFIG_COMEDI_NI_6527=m -CONFIG_COMEDI_NI_65XX=m -CONFIG_COMEDI_NI_660X=m -CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC_PCI=m -CONFIG_COMEDI_NI_PCIDIO=m -CONFIG_COMEDI_NI_PCIMIO=m -CONFIG_COMEDI_RTD520=m -CONFIG_COMEDI_S626=m -CONFIG_COMEDI_MITE=m -CONFIG_COMEDI_NI_TIOCMD=m -CONFIG_COMEDI_USB_DRIVERS=y -CONFIG_COMEDI_DT9812=m -CONFIG_COMEDI_USBDUX=m -CONFIG_COMEDI_USBDUXFAST=m -CONFIG_COMEDI_USBDUXSIGMA=m -CONFIG_COMEDI_VMK80XX=m -CONFIG_COMEDI_8255=m -CONFIG_COMEDI_FC=m -CONFIG_COMEDI_AMPLC_DIO200=m -CONFIG_COMEDI_AMPLC_PC236=m -CONFIG_COMEDI_DAS08=m -CONFIG_COMEDI_NI_LABPC=m -CONFIG_COMEDI_NI_TIO=m -CONFIG_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -CONFIG_R8187SE=m -CONFIG_RTL8192U=m -CONFIG_RTLLIB=m -CONFIG_RTLLIB_CRYPTO_CCMP=m -CONFIG_RTLLIB_CRYPTO_TKIP=m -CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m -CONFIG_R8188EU=m -CONFIG_88EU_AP_MODE=y -CONFIG_88EU_P2P=y -CONFIG_R8821AE=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m -# CONFIG_RTS5208_DEBUG is not set -# CONFIG_TRANZPORT is not set -CONFIG_IDE_PHISON=m -CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set -CONFIG_USB_SERIAL_QUATECH2=m -CONFIG_VT6655=m -CONFIG_VT6656=m -# CONFIG_DX_SEP is not set - -# -# IIO staging drivers -# - -# -# Accelerometers -# -CONFIG_ADIS16201=m -CONFIG_ADIS16203=m -CONFIG_ADIS16204=m -CONFIG_ADIS16209=m -CONFIG_ADIS16220=m -CONFIG_ADIS16240=m -CONFIG_LIS3L02DQ=m -CONFIG_SCA3000=m - -# -# Analog to digital converters -# -CONFIG_AD7291=m -CONFIG_AD7606=m -CONFIG_AD7606_IFACE_PARALLEL=m -CONFIG_AD7606_IFACE_SPI=m -CONFIG_AD799X=m -CONFIG_AD799X_RING_BUFFER=y -CONFIG_AD7780=m -CONFIG_AD7816=m -CONFIG_AD7192=m -CONFIG_AD7280=m - -# -# Analog digital bi-direction converters -# -CONFIG_ADT7316=m -CONFIG_ADT7316_SPI=m -CONFIG_ADT7316_I2C=m - -# -# Capacitance to digital converters -# -CONFIG_AD7150=m -CONFIG_AD7152=m -CONFIG_AD7746=m - -# -# Direct Digital Synthesis -# -CONFIG_AD5930=m -CONFIG_AD9832=m -CONFIG_AD9834=m -CONFIG_AD9850=m -CONFIG_AD9852=m -CONFIG_AD9910=m -CONFIG_AD9951=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16060=m - -# -# Network Analyzer, Impedance Converters -# -CONFIG_AD5933=m - -# -# Light sensors -# -CONFIG_SENSORS_ISL29018=m -CONFIG_SENSORS_ISL29028=m -CONFIG_TSL2583=m -CONFIG_TSL2x7x=m - -# -# Magnetometer sensors -# -CONFIG_SENSORS_HMC5843=m - -# -# Active energy metering IC -# -CONFIG_ADE7753=m -CONFIG_ADE7754=m -CONFIG_ADE7758=m -CONFIG_ADE7759=m -CONFIG_ADE7854=m -CONFIG_ADE7854_I2C=m -CONFIG_ADE7854_SPI=m - -# -# Resolver to digital converters -# -CONFIG_AD2S90=m -CONFIG_AD2S1200=m -CONFIG_AD2S1210=m - -# -# Triggers - standalone -# -CONFIG_IIO_PERIODIC_RTC_TRIGGER=m -CONFIG_IIO_SIMPLE_DUMMY=m -# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set -# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set -CONFIG_FB_SM7XX=m -CONFIG_CRYSTALHD=m -CONFIG_FB_XGI=m -CONFIG_ACPI_QUICKSTART=m -CONFIG_USB_ENESTORAGE=m -CONFIG_BCM_WIMAX=m -CONFIG_FT1000=m -CONFIG_FT1000_USB=m - -# -# Speakup console speech -# -CONFIG_SPEAKUP=m -CONFIG_SPEAKUP_SYNTH_ACNTSA=m -CONFIG_SPEAKUP_SYNTH_APOLLO=m -CONFIG_SPEAKUP_SYNTH_AUDPTR=m -CONFIG_SPEAKUP_SYNTH_BNS=m -CONFIG_SPEAKUP_SYNTH_DECTLK=m -CONFIG_SPEAKUP_SYNTH_DECEXT=m -CONFIG_SPEAKUP_SYNTH_LTLK=m -CONFIG_SPEAKUP_SYNTH_SOFT=m -CONFIG_SPEAKUP_SYNTH_SPKOUT=m -CONFIG_SPEAKUP_SYNTH_TXPRT=m -CONFIG_SPEAKUP_SYNTH_DUMMY=m -CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m -CONFIG_I2C_BCM2048=m -CONFIG_DVB_CXD2099=m -CONFIG_VIDEO_DT3155=m -CONFIG_DT3155_CCIR=y -CONFIG_DT3155_STREAMING=y -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_USB_MSI3101=m -CONFIG_VIDEO_V4L2_INT_DEVICE=m -CONFIG_VIDEO_TCM825X=m -CONFIG_USB_SN9C102=m -# CONFIG_SOLO6X10 is not set -# CONFIG_LIRC_STAGING is not set - -# -# Android -# -# CONFIG_ANDROID is not set -CONFIG_USB_WPAN_HCD=m -CONFIG_WIMAX_GDM72XX=m -# CONFIG_WIMAX_GDM72XX_QOS is not set -# CONFIG_WIMAX_GDM72XX_K_MODE is not set -# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set -CONFIG_WIMAX_GDM72XX_USB=y -# CONFIG_WIMAX_GDM72XX_SDIO is not set -# CONFIG_WIMAX_GDM72XX_USB_PM is not set -CONFIG_LTE_GDM724X=m -CONFIG_NET_VENDOR_SILICOM=y -CONFIG_SBYPASS=m -CONFIG_BPCTL=m -CONFIG_CED1401=m -CONFIG_DGRP=m -CONFIG_FIREWIRE_SERIAL=m -CONFIG_FWTTY_MAX_TOTAL_PORTS=64 -CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_LUSTRE_FS=m -CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 -# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set -CONFIG_LUSTRE_LLITE_LLOOP=m -CONFIG_LNET=m -CONFIG_LNET_MAX_PAYLOAD=1048576 -CONFIG_LNET_SELFTEST=m -CONFIG_LNET_XPRT_IB=m -CONFIG_XILLYBUS=m -CONFIG_XILLYBUS_PCIE=m -CONFIG_DGNC=m -CONFIG_DGAP=m -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ACERHDF=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_DELL_WMI_AIO=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_FUJITSU_TABLET=m -CONFIG_AMILO_RFKILL=m -CONFIG_HP_ACCEL=m -CONFIG_HP_WIRELESS=m -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -CONFIG_SONYPI_COMPAT=y -CONFIG_IDEAPAD_LAPTOP=m -CONFIG_THINKPAD_ACPI=m -CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_SENSORS_HDAPS=m -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ASUS_WMI=m -CONFIG_ASUS_NB_WMI=m -CONFIG_EEEPC_WMI=m -CONFIG_ACPI_WMI=m -CONFIG_MSI_WMI=m -CONFIG_TOPSTAR_LAPTOP=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_TOSHIBA_BT_RFKILL=m -CONFIG_ACPI_CMPC=m -CONFIG_INTEL_IPS=m -CONFIG_IBM_RTL=m -CONFIG_XO15_EBOOK=m -CONFIG_SAMSUNG_LAPTOP=m -CONFIG_MXM_WMI=m -CONFIG_INTEL_OAKTRAIL=m -CONFIG_SAMSUNG_Q10=m -CONFIG_APPLE_GMUX=m -CONFIG_INTEL_RST=m -CONFIG_INTEL_SMARTCONNECT=m -CONFIG_PVPANIC=m -CONFIG_CHROME_PLATFORMS=y -CONFIG_CHROMEOS_LAPTOP=m -CONFIG_CHROMEOS_PSTORE=m -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -CONFIG_COMMON_CLK_WM831X=m -CONFIG_COMMON_CLK_SI5351=m - -# -# Hardware Spinlock drivers -# -CONFIG_CLKEVT_I8253=y -CONFIG_I8253_LOCK=y -CONFIG_CLKBLD_I8253=y -CONFIG_MAILBOX=y -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_AMD_IOMMU=y -CONFIG_AMD_IOMMU_STATS=y -CONFIG_AMD_IOMMU_V2=m -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y -CONFIG_INTEL_IOMMU_FLOPPY_WA=y -CONFIG_IRQ_REMAP=y - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=m -CONFIG_STE_MODEM_RPROC=m - -# -# Rpmsg drivers -# -CONFIG_PM_DEVFREQ=y - -# -# DEVFREQ Governors -# -CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y -CONFIG_DEVFREQ_GOV_PERFORMANCE=y -CONFIG_DEVFREQ_GOV_POWERSAVE=y -CONFIG_DEVFREQ_GOV_USERSPACE=y - -# -# DEVFREQ Drivers -# -CONFIG_EXTCON=y - -# -# Extcon Device Drivers -# -CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ADC_JACK=m -CONFIG_EXTCON_ARIZONA=m -CONFIG_MEMORY=y -CONFIG_IIO=m -CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set -CONFIG_IIO_KFIFO_BUF=m -CONFIG_IIO_TRIGGERED_BUFFER=m -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 - -# -# Accelerometers -# -CONFIG_BMA180=m -CONFIG_HID_SENSOR_ACCEL_3D=m -CONFIG_IIO_ST_ACCEL_3AXIS=m -CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m -CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m -CONFIG_KXSD9=m - -# -# Analog to digital converters -# -CONFIG_AD_SIGMA_DELTA=m -CONFIG_AD7266=m -CONFIG_AD7298=m -CONFIG_AD7476=m -CONFIG_AD7791=m -CONFIG_AD7793=m -CONFIG_AD7887=m -CONFIG_AD7923=m -CONFIG_MAX1363=m -CONFIG_MCP320X=m -CONFIG_MCP3422=m -CONFIG_NAU7802=m -CONFIG_TI_ADC081C=m -CONFIG_TI_AM335X_ADC=m -CONFIG_VIPERBOARD_ADC=m - -# -# Amplifiers -# -CONFIG_AD8366=m - -# -# Hid Sensor IIO Common -# -CONFIG_HID_SENSOR_IIO_COMMON=m -CONFIG_HID_SENSOR_IIO_TRIGGER=m -CONFIG_IIO_ST_SENSORS_I2C=m -CONFIG_IIO_ST_SENSORS_SPI=m -CONFIG_IIO_ST_SENSORS_CORE=m - -# -# Digital to analog converters -# -CONFIG_AD5064=m -CONFIG_AD5360=m -CONFIG_AD5380=m -CONFIG_AD5421=m -CONFIG_AD5446=m -CONFIG_AD5449=m -CONFIG_AD5504=m -CONFIG_AD5624R_SPI=m -CONFIG_AD5686=m -CONFIG_AD5755=m -CONFIG_AD5764=m -CONFIG_AD5791=m -CONFIG_AD7303=m -CONFIG_MAX517=m -CONFIG_MCP4725=m - -# -# Frequency Synthesizers DDS/PLL -# - -# -# Clock Generator/Distribution -# -CONFIG_AD9523=m - -# -# Phase-Locked Loop (PLL) frequency synthesizers -# -CONFIG_ADF4350=m - -# -# Digital gyroscope sensors -# -CONFIG_ADIS16080=m -CONFIG_ADIS16130=m -CONFIG_ADIS16136=m -CONFIG_ADIS16260=m -CONFIG_ADXRS450=m -CONFIG_HID_SENSOR_GYRO_3D=m -CONFIG_IIO_ST_GYRO_3AXIS=m -CONFIG_IIO_ST_GYRO_I2C_3AXIS=m -CONFIG_IIO_ST_GYRO_SPI_3AXIS=m -CONFIG_ITG3200=m - -# -# Humidity sensors -# -CONFIG_DHT11=m - -# -# Inertial measurement units -# -CONFIG_ADIS16400=m -CONFIG_ADIS16480=m -CONFIG_IIO_ADIS_LIB=m -CONFIG_IIO_ADIS_LIB_BUFFER=y -CONFIG_INV_MPU6050_IIO=m - -# -# Light sensors -# -CONFIG_ADJD_S311=m -CONFIG_APDS9300=m -CONFIG_CM32181=m -CONFIG_CM36651=m -CONFIG_GP2AP020A00F=m -CONFIG_HID_SENSOR_ALS=m -CONFIG_SENSORS_LM3533=m -CONFIG_TCS3472=m -CONFIG_SENSORS_TSL2563=m -CONFIG_TSL4531=m -CONFIG_VCNL4000=m - -# -# Magnetometer sensors -# -CONFIG_AK8975=m -CONFIG_MAG3110=m -CONFIG_HID_SENSOR_MAGNETOMETER_3D=m -CONFIG_IIO_ST_MAGN_3AXIS=m -CONFIG_IIO_ST_MAGN_I2C_3AXIS=m -CONFIG_IIO_ST_MAGN_SPI_3AXIS=m - -# -# Inclinometer sensors -# -CONFIG_HID_SENSOR_INCLINOMETER_3D=m - -# -# Triggers - standalone -# -CONFIG_IIO_INTERRUPT_TRIGGER=m -CONFIG_IIO_SYSFS_TRIGGER=m - -# -# Pressure sensors -# -CONFIG_MPL3115=m -CONFIG_IIO_ST_PRESS=m -CONFIG_IIO_ST_PRESS_I2C=m -CONFIG_IIO_ST_PRESS_SPI=m - -# -# Temperature sensors -# -CONFIG_TMP006=m -CONFIG_NTB=m -# CONFIG_VME_BUS is not set -CONFIG_PWM=y -CONFIG_PWM_SYSFS=y -CONFIG_PWM_LP3943=m -CONFIG_IPACK_BUS=m -CONFIG_BOARD_TPCI200=m -CONFIG_SERIAL_IPOCTAL=m -CONFIG_RESET_CONTROLLER=y -CONFIG_FMC=m -CONFIG_FMC_FAKEDEV=m -CONFIG_FMC_TRIVIAL=m -CONFIG_FMC_WRITE_EEPROM=m -CONFIG_FMC_CHARDEV=m - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set -# CONFIG_BCM_KONA_USB2_PHY is not set -CONFIG_POWERCAP=y -CONFIG_INTEL_RAPL=m - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -CONFIG_DMI_SYSFS=m -CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -CONFIG_ISCSI_IBFT_FIND=y -CONFIG_ISCSI_IBFT=m -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -CONFIG_EFI_VARS=y -CONFIG_EFI_VARS_PSTORE=y -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y -CONFIG_EFI_RUNTIME_MAP=y -CONFIG_UEFI_CPER=y - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -# CONFIG_OCFS2_DEBUG_MASKLOG is not set -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set -# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -# CONFIG_BTRFS_DEBUG is not set -# CONFIG_BTRFS_ASSERT is not set -CONFIG_NILFS2_FS=m -CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -# CONFIG_QUOTA_DEBUG is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_QUOTACTL_COMPAT=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=m -CONFIG_CUSE=m - -# -# Caches -# -CONFIG_FSCACHE=m -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=m -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -# CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m -# CONFIG_ECRYPT_FS_MESSAGING is not set -# CONFIG_HFS_FS is not set -CONFIG_HFSPLUS_FS=m -CONFIG_HFSPLUS_FS_POSIX_ACL=y -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_JFFS2_FS is not set -CONFIG_LOGFS=m -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -# CONFIG_SQUASHFS_DECOMP_SINGLE is not set -CONFIG_SQUASHFS_DECOMP_MULTI=y -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -CONFIG_HPFS_FS=m -# CONFIG_QNX4FS_FS is not set -CONFIG_QNX6FS_FS=m -# CONFIG_QNX6FS_DEBUG is not set -# CONFIG_ROMFS_FS is not set -CONFIG_PSTORE=y -# CONFIG_PSTORE_CONSOLE is not set -# CONFIG_PSTORE_FTRACE is not set -CONFIG_PSTORE_RAM=m -# CONFIG_SYSV_FS is not set -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -# CONFIG_EXOFS_FS is not set -CONFIG_F2FS_FS=m -CONFIG_F2FS_STAT_FS=y -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_F2FS_FS_SECURITY=y -CONFIG_F2FS_CHECK_FS=y -CONFIG_EFIVAR_FS=y -CONFIG_ORE=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=m -CONFIG_NFS_SWAP=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_2=y -CONFIG_PNFS_FILE_LAYOUT=m -CONFIG_PNFS_BLOCK=m -CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" -CONFIG_NFS_V4_1_MIGRATION=y -CONFIG_NFS_V4_SECURITY_LABEL=y -CONFIG_NFS_FSCACHE=y -# CONFIG_NFS_USE_LEGACY_DNS is not set -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -# CONFIG_NFSD_V4_SECURITY_LABEL is not set -# CONFIG_NFSD_FAULT_INJECTION is not set -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_BACKCHANNEL=y -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_SUNRPC_SWAP=y -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set -CONFIG_CEPH_FS=m -CONFIG_CEPH_FSCACHE=y -CONFIG_CEPH_FS_POSIX_ACL=y -CONFIG_CIFS=m -CONFIG_CIFS_STATS=y -# CONFIG_CIFS_STATS2 is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -CONFIG_CIFS_UPCALL=y -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -CONFIG_CIFS_ACL=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y -CONFIG_NCP_FS=m -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -# CONFIG_NCPFS_EXTRAS is not set -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -CONFIG_AFS_FSCACHE=y -CONFIG_9P_FS=m -CONFIG_9P_FSCACHE=y -CONFIG_9P_FS_POSIX_ACL=y -CONFIG_9P_FS_SECURITY=y -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_MAC_ROMAN=m -CONFIG_NLS_MAC_CELTIC=m -CONFIG_NLS_MAC_CENTEURO=m -CONFIG_NLS_MAC_CROATIAN=m -CONFIG_NLS_MAC_CYRILLIC=m -CONFIG_NLS_MAC_GAELIC=m -CONFIG_NLS_MAC_GREEK=m -CONFIG_NLS_MAC_ICELAND=m -CONFIG_NLS_MAC_INUIT=m -CONFIG_NLS_MAC_ROMANIAN=m -CONFIG_NLS_MAC_TURKISH=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 -# CONFIG_BOOT_PRINTK_DELAY is not set -CONFIG_DYNAMIC_DEBUG=y - -# -# Compile-time checks and compiler options -# -# CONFIG_DEBUG_INFO is not set -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -CONFIG_STRIP_ASM_SYMS=y -# CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_VIRTUAL is not set -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_PER_CPU_MAPS is not set -CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -# CONFIG_DEBUG_STACKOVERFLOW is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -# CONFIG_LOCKUP_DETECTOR is not set -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -# CONFIG_SCHED_DEBUG is not set -# CONFIG_SCHEDSTATS is not set -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_RT_MUTEX_TESTER is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_WRITECOUNT is not set -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_VERBOSE is not set -# CONFIG_RCU_CPU_STALL_INFO is not set -# CONFIG_RCU_TRACE is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_FENTRY=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -# CONFIG_FUNCTION_GRAPH_TRACER is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -# CONFIG_TRACER_SNAPSHOT is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_KPROBE_EVENT=y -CONFIG_UPROBE_EVENT=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=y -# CONFIG_FUNCTION_PROFILER is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_MMIOTRACE is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set - -# -# Runtime Testing -# -CONFIG_LKDTM=m -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_KPROBES_SANITY_TEST is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -CONFIG_ASYNC_RAID6_TEST=m -CONFIG_TEST_STRING_HELPERS=m -CONFIG_TEST_KSTRTOX=m -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_TEST_MODULE is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -CONFIG_STRICT_DEVMEM=y -CONFIG_X86_VERBOSE_BOOTUP=y -CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set -CONFIG_EARLY_PRINTK_EFI=y -# CONFIG_X86_PTDUMP is not set -# CONFIG_DEBUG_RODATA is not set -CONFIG_DEBUG_SET_MODULE_RONX=y -# CONFIG_DEBUG_NX_TEST is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_DEBUG_TLBFLUSH is not set -# CONFIG_IOMMU_DEBUG is not set -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -# CONFIG_DEBUG_BOOT_PARAMS is not set -# CONFIG_CPA_DEBUG is not set -# CONFIG_OPTIMIZE_INLINING is not set -# CONFIG_DEBUG_NMI_SELFTEST is not set -# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set - -# -# Security options -# -CONFIG_KEYS=y -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set -CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -# CONFIG_SECURITY_NETWORK is not set -CONFIG_SECURITY_PATH=y -CONFIG_INTEL_TXT=y -# CONFIG_SECURITY_SMACK is not set -# CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set -CONFIG_SECURITY_YAMA=y -# CONFIG_SECURITY_YAMA_STACKED is not set -# CONFIG_IMA is not set -CONFIG_DEFAULT_SECURITY_YAMA=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY="yama" -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_ASYNC_PQ=m -CONFIG_ASYNC_RAID6_RECOV=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=m -CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_MANAGER=m -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_ABLK_HELPER=m -CONFIG_CRYPTO_GLUE_HELPER_X86=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_SEQIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_CRC32=m -CONFIG_CRYPTO_CRC32_PCLMUL=m -CONFIG_CRYPTO_CRCT10DIF=m -CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA1_SSSE3=m -CONFIG_CRYPTO_SHA256_SSSE3=m -CONFIG_CRYPTO_SHA512_SSSE3=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_AES_X86_64=m -CONFIG_CRYPTO_AES_NI_INTEL=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_BLOWFISH_COMMON=m -CONFIG_CRYPTO_BLOWFISH_X86_64=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAMELLIA_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m -CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m -CONFIG_CRYPTO_CAST_COMMON=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST5_AVX_X86_64=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_CAST6_AVX_X86_64=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_X86_64=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX_X86_64=m -CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_X86_64=m -CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m -CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_LZ4=m -CONFIG_CRYPTO_LZ4HC=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_CCP=y -CONFIG_CRYPTO_DEV_CCP_DD=m -CONFIG_CRYPTO_DEV_CCP_CRYPTO=m -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_PUBLIC_KEY_ALGO_RSA=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQ_ROUTING=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_APIC_ARCHITECTURE=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -# CONFIG_KVM_MMU_AUDIT is not set -CONFIG_KVM_DEVICE_ASSIGNMENT=y -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_RAID6_PQ=m -CONFIG_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_IO=y -CONFIG_PERCPU_RWSEM=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_CRC8=m -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_COMPRESS=m -CONFIG_LZ4HC_COMPRESS=m -CONFIG_LZ4_DECOMPRESS=y -CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y -CONFIG_XZ_DEC_IA64=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_XZ_DEC_TEST=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_ENC8=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_BCH=m -CONFIG_BCH_CONST_PARAMS=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_BTREE=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_LRU_CACHE=m -CONFIG_AVERAGE=y -CONFIG_CLZ_TAB=y -CONFIG_CORDIC=m -CONFIG_DDR=y -CONFIG_MPILIB=y -CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y -CONFIG_FONT_SUPPORT=y -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set -CONFIG_FONT_AUTOSELECT=y diff --git a/srcpkgs/linux3.14/template b/srcpkgs/linux3.14/template deleted file mode 100644 index abaa570932..0000000000 --- a/srcpkgs/linux3.14/template +++ /dev/null @@ -1,217 +0,0 @@ -# Template file for 'linux3.14' -# -pkgname=linux3.14 -version=3.14.79 -revision=1 -wrksrc="linux-${version}" -maintainer="Juan RP " -homepage="http://www.kernel.org" -license="GPL-2" -short_desc="The Linux kernel and modules (3.14 series)" -distfiles="${KERNEL_SITE}/kernel/v3.x/linux-${version}.tar.xz" -checksum=931fae75c70c4a805629f91ba171769b7e0606fd3e89d00be60ed806aa7045c9 - -_kernver="${version}_${revision}" - -nostrip=yes -noverifyrdeps=yes -preserve=yes -only_for_archs="i686 i686-musl x86_64 x86_64-musl" -makedepends="bc perl kmod" -triggers="kernel-hooks" -# These files could be modified when an external module is built. -mutable_files=" - /usr/lib/modules/${_kernver}/modules.builtin.bin - /usr/lib/modules/${_kernver}/modules.softdep - /usr/lib/modules/${_kernver}/modules.dep - /usr/lib/modules/${_kernver}/modules.dep.bin - /usr/lib/modules/${_kernver}/modules.symbols - /usr/lib/modules/${_kernver}/modules.symbols.bin - /usr/lib/modules/${_kernver}/modules.alias - /usr/lib/modules/${_kernver}/modules.alias.bin - /usr/lib/modules/${_kernver}/modules.devname" - -export CCACHE_DISABLE=1 - -do_configure() { - # If there's a file called -dotconfig, use it to - # configure the kernel; otherwise use arch defaults and all stuff - # as modules (defconfig+allmodconfig). - local arch - - case "$XBPS_TARGET_MACHINE" in - i686*) arch=i386;; - x86_64*) arch=x86_64;; - esac - - if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then - msg_normal "Detected a custom .config file for your arch, using it.\n" - cp -f ${FILESDIR}/${arch}-dotconfig-custom .config - make ${makejobs} oldconfig - elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then - msg_normal "Detected a .config file for your arch, using it.\n" - cp -f ${FILESDIR}/${arch}-dotconfig .config - make ${makejobs} oldconfig - else - msg_normal "Defaulting to 'defconfig and allmodconfig'.\n" - make ${makejobs} defconfig - make ${makejobs} allmodconfig - fi - # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. - sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config -} -do_build() { - make ${makejobs} prepare - make ${makejobs} bzImage modules -} -do_install() { - local arch hdrdest - - case "$XBPS_TARGET_MACHINE" in - i686*) arch=i386;; - x86_64*) arch=x86_64;; - esac - - # Run depmod after compressing modules. - sed -i '2iexit 0' scripts/depmod.sh - - # Install kernel, firmware and modules - make ${makejobs} INSTALL_MOD_PATH=${DESTDIR} modules_install - - hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver} - - install -Dm644 .config ${DESTDIR}/boot/config-${_kernver} - install -Dm644 arch/x86/boot/bzImage \ - ${DESTDIR}/boot/vmlinuz-${_kernver} - install -Dm644 System.map \ - ${DESTDIR}/boot/System.map-${_kernver} - - # Switch to /usr. - vmkdir usr - mv ${DESTDIR}/lib ${DESTDIR}/usr - - cd ${DESTDIR}/usr/lib/modules/${_kernver} - rm -f source build - ln -sf ../../../src/kernel-headers-${_kernver} build - - cd ${wrksrc} - # Install required headers to build external modules - install -Dm644 Makefile ${hdrdest}/Makefile - install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile - install -Dm644 .config ${hdrdest}/.config - mkdir -p ${hdrdest}/include - # Remove firmware stuff provided by the "linux-firmware" pkg. - rm -rf ${DESTDIR}/usr/lib/firmware - - for i in acpi asm-generic config crypto drm generated linux math-emu \ - media net pcmcia scsi sound trace uapi video xen; do - if [ -d include/$i ]; then - cp -a include/$i ${hdrdest}/include - fi - done - - cd ${wrksrc} - mkdir -p ${hdrdest}/arch/x86 - cp -a arch/x86/include ${hdrdest}/arch/x86 - - # Copy files necessary for later builds, like nvidia and vmware - cp Module.symvers ${hdrdest} - cp -a scripts ${hdrdest} - - mkdir -p ${hdrdest}/arch/x86/kernel - cp arch/x86/Makefile ${hdrdest}/arch/x86 - if [ "$arch" = "i386" ]; then - cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86 - fi - cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel - - # add headers for lirc package - # pci - for i in bt8xx cx88 saa7134; do - mkdir -p ${hdrdest}/drivers/media/pci/${i} - cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i} - done - # usb - for i in cpia2 em28xx pwc; do - mkdir -p ${hdrdest}/drivers/media/usb/${i} - cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i} - done - # i2c - mkdir -p ${hdrdest}/drivers/media/i2c - cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c - for i in cx25840; do - mkdir -p ${hdrdest}/drivers/media/i2c/${i} - cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i} - done - - # Add docbook makefile - install -Dm644 Documentation/DocBook/Makefile \ - ${hdrdest}/Documentation/DocBook/Makefile - - # Add md headers - mkdir -p ${hdrdest}/drivers/md - cp drivers/md/*.h ${hdrdest}/drivers/md - - # Add inotify.h - mkdir -p ${hdrdest}/include/linux - cp include/linux/inotify.h ${hdrdest}/include/linux - - # Add wireless headers - mkdir -p ${hdrdest}/net/mac80211/ - cp net/mac80211/*.h ${hdrdest}/net/mac80211 - - # add dvb headers for external modules - mkdir -p ${hdrdest}/drivers/media/dvb-core - cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/ - mkdir -p ${hdrdest}/include/config/dvb/ - cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/ - - # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new - mkdir -p ${hdrdest}/drivers/media/dvb-frontends - cp drivers/media/dvb-frontends/lgdt330x.h \ - ${hdrdest}/drivers/media/dvb-frontends/ - cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/ - - # add dvb headers - mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb - cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/ - mkdir -p ${hdrdest}/drivers/media/dvb-frontends - cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/ - mkdir -p ${hdrdest}/drivers/media/tuners - cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/ - - # Add xfs and shmem for aufs building - mkdir -p ${hdrdest}/fs/xfs - mkdir -p ${hdrdest}/mm - cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h - - # Copy in Kconfig files - for i in $(find . -name "Kconfig*"); do - mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||') - cp $i ${hdrdest}/$i - done - - # Remove unneeded architectures - for arch in alpha arm* avr32 blackfin cris frv h8300 \ - ia64 m* p* s* um v850 xtensa; do - rm -rf ${hdrdest}/arch/${arch} - done - - # Compress all modules with gzip to save a few MBs. - msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n" - find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9 - - # ... and run depmod again. - depmod -b ${DESTDIR}/usr -F System.map ${_kernver} -} - -linux3.14-headers_package() { - preserve=yes - nostrip=yes - noverifyrdeps=yes - short_desc+=" - source headers for 3rd party modules" - pkg_install() { - vmove usr/src - vmove usr/lib/modules/${_kernver}/build - } -} From dc68a2689014c960aaacdacaa3cd1cc0d7c3f338 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 16:42:34 +0200 Subject: [PATCH 0803/1145] Revert "grub: remove grub-utils subpackage" This reverts commit 51f7ae0bce775a6fb7b763320c0cd8fe8a6060fd. --- srcpkgs/grub-utils | 1 + srcpkgs/grub/template | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/grub-utils diff --git a/srcpkgs/grub-utils b/srcpkgs/grub-utils new file mode 120000 index 0000000000..2c8276e741 --- /dev/null +++ b/srcpkgs/grub-utils @@ -0,0 +1 @@ +grub \ No newline at end of file diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 837d936db5..eb69690769 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.02~rc2 -revision=4 +revision=3 hostmakedepends="flex" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" @@ -14,12 +14,10 @@ homepage="http://www.gnu.org/software/grub/" distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz" checksum=053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 -replaces="grub-utils>=0" - only_for_archs="i686 i686-musl x86_64 x86_64-musl" nopie=yes -subpackages="grub-i386-efi" +subpackages="grub-utils grub-i386-efi" case "$XBPS_TARGET_MACHINE" in x86_64*) subpackages+=" grub-x86_64-efi"; _GRUBX64=1;; esac @@ -129,6 +127,16 @@ do_install() { rm ${DESTDIR}/usr/bin/grub-sparc64-setup } +grub-utils_package() { + short_desc+=" - additional utilities" + depends="grub>=${version}" + pkg_install() { + vmove usr/bin/grub-menulst2cfg + vmove usr/bin/grub-fstest + vmove usr/bin/grub-mkfont + vmove usr/bin/grub-mount + } +} grub-x86_64-efi_package() { noarch=yes depends="grub>=$version dosfstools efibootmgr" From 010fd3fc2fb9a14db4b58cba6f801e7a92584d54 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 24 May 2017 16:51:56 +0200 Subject: [PATCH 0804/1145] grub: move grub-mount to main grub package. --- srcpkgs/grub/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index eb69690769..c66cf5e50e 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.02~rc2 -revision=3 +revision=5 hostmakedepends="flex" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" @@ -134,7 +134,6 @@ grub-utils_package() { vmove usr/bin/grub-menulst2cfg vmove usr/bin/grub-fstest vmove usr/bin/grub-mkfont - vmove usr/bin/grub-mount } } grub-x86_64-efi_package() { From f26617a45c6035d5304f2a8a34b60b9b3dfa3c7c Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Wed, 24 May 2017 13:29:13 -0400 Subject: [PATCH 0805/1145] gsoap: update patch commentary --- srcpkgs/gsoap/patches/fix-musl.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/gsoap/patches/fix-musl.patch b/srcpkgs/gsoap/patches/fix-musl.patch index 8a955ac13c..bb9f2c0f4d 100644 --- a/srcpkgs/gsoap/patches/fix-musl.patch +++ b/srcpkgs/gsoap/patches/fix-musl.patch @@ -5,6 +5,8 @@ The first patch I think should not be necessary, but is because the same source file defines _GNU_SOURCE if gnu-linux and !defined(_GNU_SOURCE) (go read the code, it's the first two places _GNU_SOURCE is used in gsoap/stdsoap2.cpp). I don't know why, but it seems wrong to me. +EDIT: Turns out (I was told this) that gcc will define _GNU_SOURCE +automatically for C++ files. The first patch is definitely necessary. --- ./gsoap/stdsoap2.cpp.orig +++ ./gsoap/stdsoap2.cpp From d22459c4bfdbf3a4216bba7b5b6d431e2e5b3b49 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 24 May 2017 19:51:31 +0200 Subject: [PATCH 0806/1145] flatpak: update to 0.9.4. --- srcpkgs/flatpak/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 5be4138f9b..76fedd4429 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,7 +1,7 @@ # Template file for 'flatpak' pkgname=flatpak -version=0.9.3 -revision=2 +version=0.9.4 +revision=1 build_style=gnu-configure configure_args="--disable-documentation --with-system-bubblewrap" hostmakedepends="bubblewrap libxslt pkg-config glib-devel" @@ -14,7 +14,7 @@ maintainer="Duncaen " license="LGPL-2.1" homepage="http://flatpak.org/" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" -checksum=a842e1ee03178a5f4236c39786433f6f822d22595a9ef4525004a6c72b4b3846 +checksum=e080d0cf59cbf9ada24091c22a4a8439fac8f01c4fa9c286ec34bb1446c81223 post_install() { rm -rf $DESTDIR/usr/lib/systemd From 102fc6f99f6393cc3f58631fb0f7c840eb5c88a7 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 24 May 2017 20:02:46 +0200 Subject: [PATCH 0807/1145] xbps-src: portability fixes --- common/xbps-src/shutils/chroot.sh | 2 +- xbps-src | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 2f578143bb..5f06138a8d 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -148,7 +148,7 @@ chroot_sync_repos() { if [ -n "$XBPS_CROSS_BUILD" ]; then # Copy host keys to the target rootdir. mkdir -p $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys - cp -a $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \ + cp $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \ $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys # Make sure to sync index for remote repositories. if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then diff --git a/xbps-src b/xbps-src index bc200b9fc3..5532ecc4e6 100755 --- a/xbps-src +++ b/xbps-src @@ -415,7 +415,7 @@ XBPS_OPTIONS= XBPS_OPTSTRING="a:CEfgGhH:Ij:Lm:No:r:tV" # Preprocess arguments in order to allow options before and after XBPS_TARGET. -eval set -- $(getopt -- "$XBPS_OPTSTRING" "$@"); +eval set -- $(getopt "$XBPS_OPTSTRING" "$@"); while getopts "$XBPS_OPTSTRING" opt; do case $opt in @@ -425,12 +425,12 @@ while getopts "$XBPS_OPTSTRING" opt; do f) readonly XBPS_BUILD_FORCEMODE=1; XBPS_OPTIONS+=" -f";; G) readonly XBPS_USE_GIT_REVS=1; XBPS_OPTIONS+=" -G";; g) readonly XBPS_DEBUG_PKGS=1; XBPS_OPTIONS+=" -g";; - H) readonly XBPS_HOSTDIR="$(readlink -m $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";; + H) readonly XBPS_HOSTDIR="$(readlink -f $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";; h) usage && exit 0;; I) readonly XBPS_SKIP_DEPS=1; XBPS_OPTIONS+=" -I";; j) export XBPS_MAKEJOBS="$OPTARG"; XBPS_OPTIONS+=" -j $OPTARG";; L) export NOCOLORS=1; XBPS_OPTIONS+=" -L";; - m) readonly XBPS_MASTERDIR=$(readlink -m $OPTARG 2>/dev/null); XBPS_OPTIONS+=" -m $XBPS_MASTERDIR";; + m) readonly XBPS_MASTERDIR=$(readlink -f $OPTARG 2>/dev/null); XBPS_OPTIONS+=" -m $XBPS_MASTERDIR";; N) readonly XBPS_SKIP_REMOTEREPOS=1; XBPS_OPTIONS+=" -N";; o) readonly XBPS_PKG_OPTIONS="$OPTARG"; XBPS_OPTIONS+=" -o $OPTARG";; r) readonly XBPS_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";; From 1351b915f2f4eed693e8cdca116bd480a6626a93 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:02:10 +0200 Subject: [PATCH 0808/1145] sqlite: update to 3.19.1. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 0e9e34fa3a..3c312dbfe6 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template build file for 'sqlite'. pkgname=sqlite -version=3.19.0 +version=3.19.1 revision=1 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ }) wrksrc="sqlite-autoconf-${_amalgamationver}" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://www.sqlite.org" license="Public Domain" distfiles="http://sqlite.org/2017/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=b516e665952c6659638eab3283f09f317afb212fd8e39d6415b4b6259c37b0f5 +checksum=7bc43a18d90d43376cd91e1b338c64548e6a9e3764bca4ef59dfe152d27a3a38 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \ From 8783d9ff327909b6e78a54d422661a88e274e3ee Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:07:54 +0200 Subject: [PATCH 0809/1145] toxic: update to 0.8.0. --- srcpkgs/toxic/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/toxic/template b/srcpkgs/toxic/template index eb8ef4223a..d35b2e163a 100644 --- a/srcpkgs/toxic/template +++ b/srcpkgs/toxic/template @@ -1,13 +1,13 @@ # Template file for 'toxic' pkgname=toxic -version=0.7.2 -revision=2 +version=0.8.0 +revision=1 short_desc="Ncurses-based TOX instant messanger client" maintainer="Juan RP " license="GPL-3" homepage="https://github.com/JFreegman/toxic/" distfiles="https://github.com/JFreegman/toxic/archive/v${version}.tar.gz" -checksum=a2962aca766caf84b52a52e9a5ce2276a9d3906685f565d2a00551e7c2916c59 +checksum=4078167ff09a94a78cd46d55163524b0a6692b56a74458c99093b84316a6c604 build_style=gnu-makefile hostmakedepends="pkg-config" From 06a48599322a27d4c1b033462dd35a531b6cb149 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:08:53 +0200 Subject: [PATCH 0810/1145] tint2: update to 0.14.5. --- srcpkgs/tint2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template index 5db1ab1d52..2bcd096e0e 100644 --- a/srcpkgs/tint2/template +++ b/srcpkgs/tint2/template @@ -1,8 +1,8 @@ # Template file for 'tint2' pkgname=tint2 -version=0.14.4 +version=0.14.5 revision=1 -wrksrc="${pkgname}-${version}-6df4eb4bee6a4872cfa66fbcb3bafe5b0548f173" +wrksrc="${pkgname}-${version}-d10a505aa951c8c3589f5c5f3a2fb0c2f0dd93b4" build_style=cmake hostmakedepends="pkg-config" makedepends="libXdamage-devel libXcomposite-devel libXinerama-devel libXrandr-devel @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-2" homepage="https://gitlab.com/o9000/tint2" distfiles="https://gitlab.com/o9000/${pkgname}/repository/archive.tar.gz?ref=${version}>${pkgname}-${version}.tar.gz" -checksum=cdda888ac111017695e2a16d995e92a7d704568bd00af9cf4686225145742a3f +checksum=50a19c4af9f13931134479cda2921c45c4aae7c86f52e923b7fed72cfd0695c9 From 5711c9a996b5356aecd80507ee215c760ae652fd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:09:36 +0200 Subject: [PATCH 0811/1145] opus: update to 1.1.5. --- srcpkgs/opus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template index 650d2cce27..02bd17ba4a 100644 --- a/srcpkgs/opus/template +++ b/srcpkgs/opus/template @@ -1,6 +1,6 @@ # Template file for 'opus' pkgname=opus -version=1.1.4 +version=1.1.5 revision=1 build_style=gnu-configure configure_args="--enable-float-approx" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://www.opus-codec.org/" license="BSD" distfiles="http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz" -checksum=9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692 +checksum=eb84981ca0f40a3e5d5e58d2e8582cb2fee05a022825a6dfe14d14b04eb563e4 post_install() { vlicense COPYING From 35a9f1b1120488614136a9baa06cb543edced7d2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:10:59 +0200 Subject: [PATCH 0812/1145] confuse: update to 3.1. --- srcpkgs/confuse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/confuse/template b/srcpkgs/confuse/template index 674f494af3..c5f50a8ee8 100644 --- a/srcpkgs/confuse/template +++ b/srcpkgs/confuse/template @@ -1,6 +1,6 @@ # Template file for 'confuse' pkgname=confuse -version=3.0 +version=3.1 revision=1 build_style=gnu-configure configure_args="--enable-shared --enable-static" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://github.org/martinh/libconfuse/" license="ISC" distfiles="https://github.com/martinh/libconfuse/releases/download/v${version}/confuse-${version}.tar.xz" -checksum=bb75174e02aa8b44fa1a872a47beeea1f5fe715ab669694c97803eb6127cc861 +checksum=8171f31e0071d5e4460269fdcc8b4e748cf23b4bf6bbe672f718a136dd63ca66 confuse-devel_package() { depends="confuse>=${version}_${revision}" From d4d627ec9862fdd4526c1be0983c446186962814 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:31:44 +0200 Subject: [PATCH 0813/1145] efl: update to 1.19.1. --- srcpkgs/efl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 8abf5e9136..452b8c1c0c 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -1,6 +1,6 @@ # Template file for 'efl' pkgname=efl -version=1.18.5 +version=1.19.1 revision=1 build_style=gnu-configure configure_args="CXX= --enable-multisense --enable-image-loader-webp --enable-liblz4 @@ -18,7 +18,7 @@ short_desc="Enlightenment Foundation Libraries" maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz" -checksum=56f02aa6b2c4ca0252fb6547fa8d2fdfff842e245a93ae41adca7a191900bf73 +checksum=8c69eaf5f3489245dff6112394bf3685fb9d6fd3915035fe022f27c554e6cd3a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake gettext-devel libtool efl-devel" From 5bfd597ae263af38b5dfbba65e3c16125a5d6a54 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 07:31:49 +0200 Subject: [PATCH 0814/1145] enlightenment: update to 0.21.8. --- srcpkgs/enlightenment/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 4fc9f7891c..30f79f7dbf 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,6 +1,6 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.21.7 +version=0.21.8 revision=1 nopie=yes lib32disabled=yes @@ -18,7 +18,7 @@ short_desc="Enlightenment desktop" maintainer="Juan RP " license="2-clause-BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=7643f7fd4aadaca44c886f21063987624c50d4c50266e87600e902a59b7c76f7 +checksum=fac21c5fb9cab89fb717b3577f7980fd0644ff1e94b144a55ba841116e8c5232 post_install() { # Use our native tools to shutdown/suspend. From b60f83311bfd73c55453c43ed5e26f417bf3c63c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 09:12:09 +0200 Subject: [PATCH 0815/1145] strace: update to 4.17. --- srcpkgs/strace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template index 822a4549ee..b8c55b9fcf 100644 --- a/srcpkgs/strace/template +++ b/srcpkgs/strace/template @@ -1,6 +1,6 @@ # Template file for 'strace' pkgname=strace -version=4.16 +version=4.17 revision=1 build_style=gnu-configure configure_args="--with-libunwind" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://sourceforge.net/projects/strace" license="BSD" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef +checksum=81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419 case "$XBPS_TARGET_MACHINE" in aarch64-musl) configure_args=; makedepends= ;; From 99afea8edbf36bf8d0f9876f958e464416e91296 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 09:14:03 +0200 Subject: [PATCH 0816/1145] python-efl: update to 1.19.0. --- srcpkgs/python-efl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-efl/template b/srcpkgs/python-efl/template index 217d55cc5c..a317cf15ba 100644 --- a/srcpkgs/python-efl/template +++ b/srcpkgs/python-efl/template @@ -1,7 +1,7 @@ # Template file for 'python-efl' pkgname=python-efl -version=1.18.0 -revision=2 +version=1.19.0 +revision=1 build_style=python-module hostmakedepends="pkg-config python-devel python3-devel" makedepends="efl-devel python-dbus-devel" @@ -12,7 +12,7 @@ short_desc="Python2 bindings for Enlightenment Foundation Libraries" maintainer="Juan RP " license="LGPL-3" distfiles="http://download.enlightenment.org/rel/bindings/python/${pkgname}-${version}.tar.gz" -checksum=39d873343bf524237ad289c2c95427d462d4b3c829a43ac495da9f5ecfca8974 +checksum=c7e09f70302ae4e551e3d8ac06d185b9456699d7aa5c734681988c10f64a0e50 python3-efl_package() { depends="python3-dbus" From 0dc155fc76700115521a73033de7a22bf6f10388 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 09:38:57 +0200 Subject: [PATCH 0817/1145] linux4.11: patch from suse for issue 726016. From: "Eric W. Biederman" Date: Mon, 22 May 2017 16:04:48 -0500 Subject: [PATCH] ptrace: Properly initialize ptracer_cred on fork Message-ID: <877f18txfz.fsf_-_@xmission.com> Patch-mainline: Submitted, LKML References: bsc#1040041 --- .../patches/opensuse-bug-726016.patch | 113 ++++++++++++++++++ srcpkgs/linux4.11/template | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/linux4.11/patches/opensuse-bug-726016.patch diff --git a/srcpkgs/linux4.11/patches/opensuse-bug-726016.patch b/srcpkgs/linux4.11/patches/opensuse-bug-726016.patch new file mode 100644 index 0000000000..7d9995ffef --- /dev/null +++ b/srcpkgs/linux4.11/patches/opensuse-bug-726016.patch @@ -0,0 +1,113 @@ +From: "Eric W. Biederman" +Date: Mon, 22 May 2017 16:04:48 -0500 +Subject: [PATCH] ptrace: Properly initialize ptracer_cred on fork +Message-ID: <877f18txfz.fsf_-_@xmission.com> +Patch-mainline: Submitted, LKML +References: bsc#1040041 + +When I introduced ptracer_cred I failed to consider the weirdness of +fork where the task_struct copies the old value by default. This +winds up leaving ptracer_cred set even when a process forks and +the child process does not wind up being ptraced. + +Because ptracer_cred is not set on non-ptraced processes whose +parents were ptraced this has broken the ability of the enlightenment +window manager to start setuid children. + +Fix this by properly initializing ptracer_cred in ptrace_init_task + +This must be done with a little bit of care to preserve the current value +of ptracer_cred when ptrace carries through fork. Re-reading the +ptracer_cred from the ptracing process at this point is inconsistent +with how PT_PTRACE_CAP has been maintained all of these years. + +Fixes: 64b875f7ac8a ("ptrace: Capture the ptracer's creds not PT_PTRACE_CAP") +Signed-off-by: "Eric W. Biederman" +Signed-off-by: Takashi Iwai + +--- + include/linux/ptrace.h | 7 +++++-- + kernel/ptrace.c | 20 +++++++++++++------- + 2 files changed, 18 insertions(+), 9 deletions(-) + +--- a/include/linux/ptrace.h ++++ b/include/linux/ptrace.h +@@ -54,7 +54,8 @@ extern int ptrace_request(struct task_st + unsigned long addr, unsigned long data); + extern void ptrace_notify(int exit_code); + extern void __ptrace_link(struct task_struct *child, +- struct task_struct *new_parent); ++ struct task_struct *new_parent, ++ const struct cred *ptracer_cred); + extern void __ptrace_unlink(struct task_struct *child); + extern void exit_ptrace(struct task_struct *tracer, struct list_head *dead); + #define PTRACE_MODE_READ 0x01 +@@ -206,7 +207,7 @@ static inline void ptrace_init_task(stru + + if (unlikely(ptrace) && current->ptrace) { + child->ptrace = current->ptrace; +- __ptrace_link(child, current->parent); ++ __ptrace_link(child, current->parent, current->ptracer_cred); + + if (child->ptrace & PT_SEIZED) + task_set_jobctl_pending(child, JOBCTL_TRAP_STOP); +@@ -215,6 +216,8 @@ static inline void ptrace_init_task(stru + + set_tsk_thread_flag(child, TIF_SIGPENDING); + } ++ else ++ child->ptracer_cred = NULL; + } + + /** +--- a/kernel/ptrace.c ++++ b/kernel/ptrace.c +@@ -60,19 +60,25 @@ int ptrace_access_vm(struct task_struct + } + + ++void __ptrace_link(struct task_struct *child, struct task_struct *new_parent, ++ const struct cred *ptracer_cred) ++{ ++ BUG_ON(!list_empty(&child->ptrace_entry)); ++ list_add(&child->ptrace_entry, &new_parent->ptraced); ++ child->parent = new_parent; ++ child->ptracer_cred = get_cred(ptracer_cred); ++} ++ + /* + * ptrace a task: make the debugger its new parent and + * move it to the ptrace list. + * + * Must be called with the tasklist lock write-held. + */ +-void __ptrace_link(struct task_struct *child, struct task_struct *new_parent) ++static void ptrace_link(struct task_struct *child, struct task_struct *new_parent) + { +- BUG_ON(!list_empty(&child->ptrace_entry)); +- list_add(&child->ptrace_entry, &new_parent->ptraced); +- child->parent = new_parent; + rcu_read_lock(); +- child->ptracer_cred = get_cred(__task_cred(new_parent)); ++ __ptrace_link(child, new_parent, __task_cred(new_parent)); + rcu_read_unlock(); + } + +@@ -386,7 +392,7 @@ static int ptrace_attach(struct task_str + flags |= PT_SEIZED; + task->ptrace = flags; + +- __ptrace_link(task, current); ++ ptrace_link(task, current); + + /* SEIZE doesn't trap tracee on attach */ + if (!seize) +@@ -459,7 +465,7 @@ static int ptrace_traceme(void) + */ + if (!ret && !(current->real_parent->flags & PF_EXITING)) { + current->ptrace = PT_PTRACED; +- __ptrace_link(current, current->real_parent); ++ ptrace_link(current, current->real_parent); + } + } + write_unlock_irq(&tasklist_lock); diff --git a/srcpkgs/linux4.11/template b/srcpkgs/linux4.11/template index 1972d60b3b..36c2624947 100644 --- a/srcpkgs/linux4.11/template +++ b/srcpkgs/linux4.11/template @@ -1,7 +1,7 @@ # Template file for 'linux4.11' pkgname=linux4.11 version=4.11.2 -revision=1 +revision=2 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " From 57c82f8fb95d3e9ed0c03ad6f9c33de78b9f4c59 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 25 May 2017 10:59:28 +0200 Subject: [PATCH 0818/1145] atom: update to 1.17.1. --- srcpkgs/atom/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template index bcc13f62bd..d44a736c61 100644 --- a/srcpkgs/atom/template +++ b/srcpkgs/atom/template @@ -1,6 +1,6 @@ # Template file for 'atom' pkgname=atom -version=1.17.0 +version=1.17.1 revision=1 nocross=yes nostrip=yes @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="MIT" homepage="https://atom.io" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=f9ccf2aa45b82bbf42a6a7fbbe5a3b7fdda99d76e77af8dee949fbcc419e94c6 +checksum=b34daebc5f9072923b76ebc69ba6eff7ea815f7c38bc724107877abd9b932262 only_for_archs="i686 x86_64" From e223fdea585b3d30ee71c33d7d3e37a1fd3eb267 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 25 May 2017 12:20:23 +0200 Subject: [PATCH 0819/1145] csound: update to 6.09.0. --- srcpkgs/csound/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template index 7fef7265b8..6a5c430b7d 100644 --- a/srcpkgs/csound/template +++ b/srcpkgs/csound/template @@ -1,6 +1,6 @@ # Template file for 'csound' pkgname=csound -version=6.08.1 +version=6.09.0 revision=1 build_style=cmake configure_args=" @@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni " license="LGPL-3" homepage="http://csound.github.io" distfiles="https://github.com/$pkgname/$pkgname/archive/$version.tar.gz" -checksum=153c6c06573dd0c6989f45df1cb32ae48fb2ea942428900c0097ecc1476b82b7 +checksum=fa57dcf31c33ff1f95910ebf794b2f7f6270a311224c812d54eaf660d4b92392 nocross=yes post_install() { From 1d6812363762056389536c36d1110438c6216ecb Mon Sep 17 00:00:00 2001 From: Alexander Mamay Date: Thu, 25 May 2017 17:27:09 +0600 Subject: [PATCH 0820/1145] xdebug: update to 2.5.4. --- srcpkgs/xdebug/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdebug/template b/srcpkgs/xdebug/template index 719c11c3b4..d676ba46b0 100644 --- a/srcpkgs/xdebug/template +++ b/srcpkgs/xdebug/template @@ -1,6 +1,6 @@ # Template file for 'xdebug' pkgname=xdebug -version=2.5.0 +version=2.5.4 revision=1 build_style=gnu-configure hostmakedepends="autoconf" @@ -10,7 +10,7 @@ maintainer="Alexander Mamay " license="custom" homepage="http://xdebug.org" distfiles="http://xdebug.org/files/${pkgname}-${version,,}.tgz" -checksum=8bd6ad1e64948308e3e3a7437292f154b11e25acaf31b0d59d83bda18af0890d +checksum=300ca6fc3d95025148b0b5d0c96e14e54299e536a93a5d68c67b2cf32c9432b8 pre_configure() { phpize From 1d6f97868ac40bc6d79ced172d334ea1796efd1b Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Thu, 25 May 2017 14:25:36 +0200 Subject: [PATCH 0821/1145] libsass: update to 3.4.5 Signed-off-by: Gerardo Di Iorio --- srcpkgs/libsass/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libsass/template b/srcpkgs/libsass/template index 95ca08d78c..46896e4533 100644 --- a/srcpkgs/libsass/template +++ b/srcpkgs/libsass/template @@ -1,6 +1,6 @@ # Template file for 'libsass' pkgname=libsass -version=3.4.4 +version=3.4.5 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio " homepage="http://libsass.org/" license="MIT" distfiles="https://github.com/sass/${pkgname}/archive/${version}.tar.gz" -checksum=1dc4d49a9a53b891b7e98935709e625f1d68782d87aef4304a41e6d590abb480 +checksum=fd0cb47479b4eae03154f23e17ab846aa81ba168c9aa5fa493b8fa42d10842c8 pre_configure() { autoreconf -i From 3b4ccfb722bcbcd13a035fa39b8c82ac6524c614 Mon Sep 17 00:00:00 2001 From: Diogo Leal Date: Thu, 25 May 2017 09:25:44 -0300 Subject: [PATCH 0822/1145] gotty: update to 1.0.0 --- srcpkgs/gotty/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template index 02b94e5319..aa6ae0a8cc 100644 --- a/srcpkgs/gotty/template +++ b/srcpkgs/gotty/template @@ -1,7 +1,7 @@ # Template file for 'gotty' pkgname=gotty -version=0.0.13 -revision=4 +version=1.0.0 +revision=1 build_style=go go_import_path="github.com/yudai/gotty" hostmakedepends="git-perl" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://github.com/yudai/gotty/" distfiles="https://github.com/yudai/gotty/archive/v${version}.tar.gz" -checksum=4082f0805e925073fb15a997012d1b9d3512fc9077de323225153c9ae5b96318 +checksum=ca61d6a164fb1a2ba7491ce0e764f987ecb009f9caf8a602690253665c27a498 post_install() { vlicense LICENSE From ce191d59942ef78fe399ce30923a646743fd80d7 Mon Sep 17 00:00:00 2001 From: Alexander Mamay Date: Thu, 25 May 2017 18:27:55 +0600 Subject: [PATCH 0823/1145] azpainter: update to 2.0.5. --- srcpkgs/azpainter/template | 8 ++++---- srcpkgs/azpainter/update | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/azpainter/template b/srcpkgs/azpainter/template index 068ff01b43..ba15289d20 100644 --- a/srcpkgs/azpainter/template +++ b/srcpkgs/azpainter/template @@ -1,6 +1,6 @@ # Template file for 'azpainter' pkgname=azpainter -version=2.0.1 +version=2.0.5 revision=1 build_style=gnu-configure hostmakedepends="automake" @@ -8,9 +8,9 @@ makedepends="fontconfig-devel libjpeg-turbo-devel libXi-devel" short_desc="A full-color painting software for illustration drawing" maintainer="Alexander Mamay " license="GPL-3" -homepage="http://azsky2.html.xdomain.jp/linux/azpainter/" -distfiles="http://osdn.dl.osdn.net/azpainter/67071/azpainter-${version}.tar.bz2" -checksum=8b773f0cf6ca6d39edddc928b09026bc5b1ec6ec4ffcb39edb2e19f2e9629e85 +homepage="http://azsky2.html.xdomain.jp/linux/azpainter.html" +distfiles="http://osdn.dl.osdn.net/azpainter/67713/azpainter-${version}.tar.bz2" +checksum=7c3bc35fff51b3529911e5d6ce6ee2ce565694c17755fe1e6f52e6d9ad0ce839 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" diff --git a/srcpkgs/azpainter/update b/srcpkgs/azpainter/update index 3ef55f6de1..fa51403419 100644 --- a/srcpkgs/azpainter/update +++ b/srcpkgs/azpainter/update @@ -1 +1 @@ -pattern='\-\ ver\ \K[\d.]+' +pattern='>ver\ \K[\d.]+' From 3abab95d583cea8f16274d4a490ec8195dcdf49b Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:23:42 +0200 Subject: [PATCH 0824/1145] bmon: rebuild against confuse-3.1 --- srcpkgs/bmon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bmon/template b/srcpkgs/bmon/template index 3dab2c95eb..2326c464c2 100644 --- a/srcpkgs/bmon/template +++ b/srcpkgs/bmon/template @@ -1,7 +1,7 @@ # Template file for 'bmon' pkgname=bmon version=4.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="ncurses-devel libnl3-devel confuse-devel" From c6244dcb6e92f6b4a2e97ca1c9a2d0fb296f39a6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:24:13 +0200 Subject: [PATCH 0825/1145] fwup: rebuild against confuse-3.1 --- srcpkgs/fwup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index ecf3d21143..503dd0ba7e 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,7 +1,7 @@ # Template file for 'fwup' pkgname=fwup version=0.14.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="ac_vc_func_open_memstream=yes" hostmakedepends="automake libtool pkg-config" From 1255094a33a8634b26f7723df2b1b3ab98e0d0bc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:24:49 +0200 Subject: [PATCH 0826/1145] i3status: rebuild against confuse-3.1 --- srcpkgs/i3status/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template index c89f85f6d8..67a9e0fdfc 100644 --- a/srcpkgs/i3status/template +++ b/srcpkgs/i3status/template @@ -1,7 +1,7 @@ # Template file for 'i3status' pkgname=i3status version=2.11 -revision=1 +revision=2 hostmakedepends="asciidoc pkg-config" makedepends="yajl-devel confuse-devel libnl3-devel alsa-lib-devel libcap-devel pulseaudio-devel" depends="libcap-progs" From ff717ff5a83c6463eea8b669d21e0bbd59283455 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:24:59 +0200 Subject: [PATCH 0827/1145] inadyn: rebuild against confuse-3.1 --- srcpkgs/inadyn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template index b6f136e316..abc10ac5fe 100644 --- a/srcpkgs/inadyn/template +++ b/srcpkgs/inadyn/template @@ -1,7 +1,7 @@ # Template file for 'inadyn' pkgname=inadyn version=2.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-openssl" hostmakedepends="automake libtool pkg-config" From 37e36b7eb105bcaf6731686367e091a5672d9165 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:25:13 +0200 Subject: [PATCH 0828/1145] libftdi1: rebuild against confuse-3.1 --- srcpkgs/libftdi1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libftdi1/template b/srcpkgs/libftdi1/template index f6b4526d86..b097d36157 100644 --- a/srcpkgs/libftdi1/template +++ b/srcpkgs/libftdi1/template @@ -1,7 +1,7 @@ # Template file for 'libftdi' pkgname=libftdi1 version=1.3 -revision=1 +revision=2 build_style=cmake makedepends="libusb-devel confuse-devel" short_desc="Library to talk to FTDI chips" From dfbffa342a4dd367576f594330a347d747f023bb Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:25:24 +0200 Subject: [PATCH 0829/1145] tilda: rebuild against confuse-3.1 --- srcpkgs/tilda/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tilda/template b/srcpkgs/tilda/template index e334afbe18..b9fb454698 100644 --- a/srcpkgs/tilda/template +++ b/srcpkgs/tilda/template @@ -1,7 +1,7 @@ # Template file for 'tilda' pkgname=tilda version=1.3.3 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="pkg-config automake gettext-devel glib-devel" From 3ffe084f7a78d7905285877447ed761bba67d2f1 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 18:38:56 +0200 Subject: [PATCH 0830/1145] csound: fix musl --- srcpkgs/csound/patches/musl.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 srcpkgs/csound/patches/musl.patch diff --git a/srcpkgs/csound/patches/musl.patch b/srcpkgs/csound/patches/musl.patch new file mode 100644 index 0000000000..833b04a821 --- /dev/null +++ b/srcpkgs/csound/patches/musl.patch @@ -0,0 +1,11 @@ +--- Top/csound.c.orig 2017-05-24 22:41:46.000000000 +0200 ++++ Top/csound.c 2017-05-25 18:35:23.438983804 +0200 +@@ -1093,7 +1093,7 @@ + + static void signal_handler(int sig) + { +-#if defined(LINUX) && !defined(ANDROID) ++#if defined(__GLIBC__) + #include + + { From b228f988839619a9500b36571878da2ee4d4a497 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 19:59:59 +0200 Subject: [PATCH 0831/1145] flightgear: use system sqlite Also unbreak aarch64. --- srcpkgs/flightgear/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 8d4095c5f8..f81a89b27e 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,9 +1,9 @@ # Template file for 'flightgear' pkgname=flightgear version=2017.2.1 -revision=2 +revision=3 build_style=cmake -configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata" +configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata -DSYSTEM_SQLITE=1" hostmakedepends="fltk pkg-config" makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-devel libgsm-devel glew-devel speex-devel sqlite-devel osg-devel plib-devel libcurl-devel @@ -13,10 +13,10 @@ short_desc="Sophisticated flight simulator" maintainer="Jürgen Buchmüller " license="GPL-3" homepage="http://www.flightgear.org/" +#_mirror=http://mirror.netcologne.de/gentoo/distfiles distfiles=" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" -_mirror=http://mirror.netcologne.de/gentoo/distfiles checksum=" c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4" @@ -30,7 +30,6 @@ esac build_options="qt" build_options_default="qt" if [ "$CROSS_BUILD" ]; then - configure_args+=" -DSIMGEAR_COMPILE_TEST_EXITCODE=0" hostmakedepends+=" qt5-host-tools $(vopt_if qt 'qt5-devel qt5-declarative-devel')" fi # Suppress warnings regarding auto_ptr From bf5729fc43c0f708c802d54b6ba9f4dd0d5327f7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 25 May 2017 20:05:25 +0200 Subject: [PATCH 0832/1145] flightgear: unbreak aarch64-musl too --- srcpkgs/flightgear/template | 6 ------ 1 file changed, 6 deletions(-) diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index f81a89b27e..00cfb3ac97 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -21,12 +21,6 @@ checksum=" c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4" -case "$XBPS_TARGET_MACHINE" in - aarch64-musl) - broken="ICE: dependency simgear does not build" - ;; -esac - build_options="qt" build_options_default="qt" if [ "$CROSS_BUILD" ]; then From d9998dc98853aea2fecb4b012622d804e404ca29 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 25 May 2017 20:56:13 +0200 Subject: [PATCH 0833/1145] linux4.11: update to 4.11.3. --- srcpkgs/linux4.11/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux4.11/template b/srcpkgs/linux4.11/template index 36c2624947..9f307ef0d8 100644 --- a/srcpkgs/linux4.11/template +++ b/srcpkgs/linux4.11/template @@ -1,7 +1,7 @@ # Template file for 'linux4.11' pkgname=linux4.11 -version=4.11.2 -revision=2 +version=4.11.3 +revision=1 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=bb149395a9e7e49728c824914c30943698e952693fbd1dd0106bad91a59f622c +checksum=5bfd9ed52c1ccd8dcd6418646d5a78b0af501cfdcd3e0900f1918ecba1a8af97 nodebug=yes # -dbg package is generated below manually nostrip=yes From 0068939726ffea24f2e461ef94adb0f015c09026 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Thu, 25 May 2017 12:06:27 -0700 Subject: [PATCH 0834/1145] orca: fix build-time detection of liblouis. Contracted braille breaks if we can't find the .pc file for liblouis at build time, so liblouis-devel belongs in makedepends. --- srcpkgs/orca/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 28694eda7a..9b78504c80 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,11 +1,11 @@ # Template file for 'orca' pkgname=orca version=3.24.0 -revision=1 +revision=2 noarch=yes build_style=gnu-configure hostmakedepends="pkg-config intltool itstool" -makedepends="python-gobject-devel at-spi2-atk-devel" +makedepends="python-gobject-devel at-spi2-atk-devel liblouis-devel" depends="brltty liblouis gtk+3 at-spi2-atk speech-dispatcher python3-atspi python3-dbus python3-xdg python3-gobject hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas" From e8889b33980b4cc89c5f1c3a275cd0bf88b0381f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 26 May 2017 04:19:53 +0200 Subject: [PATCH 0835/1145] libGL: update to 17.1.1. --- srcpkgs/libGL/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 56243d55ea..8c7a26f076 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ # Template build file for 'libGL'. pkgname=libGL -version=17.1.0 +version=17.1.1 revision=1 wrksrc="mesa-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 +checksum=aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" From 63e53a2069e1786bd92ec5e6058a2ab208c935e9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 26 May 2017 10:25:41 +0200 Subject: [PATCH 0836/1145] kodi: update to 17.3. --- .../AddonModuleXbmc.i.cpp | 2 +- .../AddonModuleXbmc.i.xml | 11012 ++--- .../AddonModuleXbmcaddon.i.cpp | 2 +- .../AddonModuleXbmcaddon.i.xml | 1220 +- .../AddonModuleXbmcgui.i.cpp | 2 +- .../AddonModuleXbmcgui.i.xml | 39102 ++++++++-------- .../AddonModuleXbmcplugin.i.cpp | 2 +- .../AddonModuleXbmcplugin.i.xml | 2720 +- .../AddonModuleXbmcvfs.i.cpp | 2 +- .../AddonModuleXbmcvfs.i.xml | 2312 +- .../AddonModuleXbmcwsgi.i.cpp | 2 +- .../AddonModuleXbmcwsgi.i.xml | 2892 +- srcpkgs/kodi/template | 6 +- 13 files changed, 29638 insertions(+), 29638 deletions(-) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmc.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmc.i.xml (60%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcaddon.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcaddon.i.xml (58%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcgui.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcgui.i.xml (67%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcplugin.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcplugin.i.xml (59%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcvfs.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcvfs.i.xml (59%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcwsgi.i.cpp (99%) rename srcpkgs/kodi/files/{swig.nojava-17.1 => swig.nojava-17.3}/AddonModuleXbmcwsgi.i.xml (61%) diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.cpp similarity index 99% rename from srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp rename to srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.cpp index f0063ae909..0823b934d0 100644 --- a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.cpp +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.cpp @@ -9218,7 +9218,7 @@ namespace PythonBindings // constants PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi "); - PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Sun May 21 20:33:28 GMT 2017"); + PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:01:11 GMT 2017"); PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0"); PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi"); PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL"); diff --git a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.xml similarity index 60% rename from srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml rename to srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.xml index c98cbe2453..e383a53a2b 100644 --- a/srcpkgs/kodi/files/swig.nojava-17.1/AddonModuleXbmc.i.xml +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.xml @@ -1,146 +1,146 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - + + - - + + - - - - - + + + + + - - - + + + -