diff --git a/common/shlibs b/common/shlibs index 626c305040..4e476beff3 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 @@ -142,7 +139,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore -libnvidia-fatbinaryloader.so.378.13 nvidia-libs-378.13_1 ignore +libnvidia-fatbinaryloader.so.381.22 nvidia-libs-381.22_1 ignore libglapi.so.0 libglapi-7.11_1 libgbm.so.1 libgbm-9.0_1 librsvg-2.so.2 librsvg-2.26.0_1 @@ -151,6 +148,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 @@ -176,29 +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 -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 -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 @@ -243,9 +218,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 @@ -426,7 +398,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 @@ -482,20 +453,17 @@ 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.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 +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 @@ -534,9 +502,9 @@ libmysqlclient.so.18 libmysqlclient-5.5.27_1 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1 libgssrpc.so.4 mit-krb5-libs-1.8_1 libk5crypto.so.3 mit-krb5-libs-1.8_1 -libkadm5clnt_mit.so.10 mit-krb5-libs-1.14_1 +libkadm5clnt_mit.so.11 mit-krb5-libs-1.15.1_1 libkadm5clnt.so mit-krb5-libs-1.8_1 -libkadm5srv_mit.so.10 mit-krb5-libs-1.14_1 +libkadm5srv_mit.so.11 mit-krb5-libs-1.15.1_1 libkadm5srv.so mit-krb5-libs-1.8_1 libkdb5.so.8 mit-krb5-libs-1.13.1_1 libkrb5.so.3 mit-krb5-libs-1.8_1 @@ -554,7 +522,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 @@ -672,7 +639,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 @@ -702,8 +668,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 @@ -718,11 +682,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 @@ -757,7 +716,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 @@ -775,13 +733,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 @@ -818,7 +774,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 @@ -836,10 +791,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 @@ -881,7 +834,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 @@ -925,9 +877,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 @@ -955,23 +907,14 @@ 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 -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 +libclang.so.4 clang-4.0.0_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 @@ -992,10 +935,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 @@ -1016,7 +959,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 +971,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 +1032,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 +1067,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 @@ -1167,6 +1106,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 @@ -1205,8 +1145,12 @@ 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.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 @@ -1358,7 +1302,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 @@ -1374,9 +1317,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 @@ -1392,7 +1332,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 @@ -1448,7 +1387,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 @@ -1466,14 +1404,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 @@ -1551,8 +1487,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 @@ -1673,8 +1607,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 @@ -1724,18 +1656,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 @@ -1767,8 +1693,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 @@ -1942,7 +1866,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 @@ -1990,19 +1913,15 @@ 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 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 @@ -2168,7 +2087,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 @@ -2186,7 +2105,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 @@ -2381,7 +2299,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 @@ -2440,6 +2357,7 @@ libOpenCOLLADAStreamWriter.so opencollada-0.0.20160223_1 libUTF.so opencollada-0.0.20160223_1 libbuffer.so opencollada-0.0.20160223_1 libftoa.so opencollada-0.0.20160223_1 +libzlib.so opencollada-1.6.51_1 libfbclient.so.2 libfbclient-2.5.5.26952_1 libfbembed.so.2 libfbclient-2.5.5.26952_1 libfbembed.so.2.5 libfbclient-2.5.5.26952_1 @@ -2453,11 +2371,10 @@ 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 -libwiredtiger-2.9.1.so wiredtiger-2.9.1_1 +libwiredtiger-2.9.2.so wiredtiger-2.9.2_1 libvidstab.so.0.9 libvidstab-0.98b_1 libxdo.so.3 xdotool-3.20150503.1_1 libabigail.so.0 libabigail-1.0.rc3_1 @@ -2736,11 +2653,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 @@ -2795,11 +2715,14 @@ 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 -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 -libomxclocksrc.so.0 libomxil-bellagio-0.9.3_1 -libomxvideosched.so.0 libomxil-bellagio-0.9.3_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 +libomxclocksrc.so.0 libomxil-bellagio-0.9.3_1 +libomxvideosched.so.0 libomxil-bellagio-0.9.3_1 libnss_libvirt_guest.so.2 libvirt-3.1.0_1 libvirt-admin.so.0 libvirt-3.1.0_1 libnss_libvirt.so.2 libvirt-3.1.0_1 @@ -2823,3 +2746,26 @@ 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 +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 +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/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 551674237c..a59646f221 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -35,7 +35,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION" PATH=/void-packages:/usr/bin:/usr/sbin -exec env -i SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \ +exec env -i -- SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \ @@CHECK@@ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \ PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h _EOF @@ -153,11 +153,11 @@ 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 - env XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE \ + env -- XBPS_TARGET_ARCH=$XBPS_TARGET_MACHINE \ xbps-install -r $XBPS_MASTERDIR/$XBPS_CROSS_BASE -S fi fi @@ -205,7 +205,7 @@ chroot_handler() { [ -n "$XBPS_BINPKG_EXISTS" ] && arg="$arg -E" action="$arg $action" - env -i PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \ + env -i -- PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \ HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \ SOURCE_DATE_EPOCH="$SOURCE_DATE_EPOCH" \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ diff --git a/srcpkgs/Adapta/template b/srcpkgs/Adapta/template index 0943ecdcf0..a74cfc7080 100644 --- a/srcpkgs/Adapta/template +++ b/srcpkgs/Adapta/template @@ -1,17 +1,17 @@ # Template file for 'Adapta' pkgname=Adapta -version=3.90.0.108 +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=d79d1790f6c2826920fdaebeb2d153a8b8eb246439a2678dfb51e949822b6a47 +checksum=01fb1a0c4255a0b4bd1a2c09f50b302a8f7bb78b4452bdf8027ab3d6827725e4 noarch=y 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 diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template index f26d7fe06d..e90dd2b9d0 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.2 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=fb0c1dfd4389e8184c589e916883b7b66dd16a01279c119064745486d2b58b1c configure_args="-DWITH_QT5=TRUE" 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..8004c3c2df 100644 --- a/srcpkgs/FeedReader/template +++ b/srcpkgs/FeedReader/template @@ -1,14 +1,14 @@ # 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)" 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" @@ -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) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 541da48ede..d43e48c074 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=9 version=${_majorver}.${_patchver} revision=1 wrksrc=${pkgname}-${_majorver}-${_patchver} @@ -13,10 +13,10 @@ configure_args="--without-autotrace --with-wmf=yes --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static" short_desc="Package for display and interactive manipulation of images" maintainer="Juan RP " -homepage="http://www.imagemagick.org/" +homepage="https://www.imagemagick.org/" license="ImageMagick" -distfiles="http://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" -checksum=a6c24f6badc30ba624f1dda14e7927fa3109dea7dd6a7e4408e127f65107cb11 +distfiles="https://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" +checksum=f64f1a66d2a3ec4ff2c79527dd2a773c8c71abb4f8da37af71c270b52be32673 subpackages="libmagick libmagick-devel" diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index 97eb702948..ccf75b0969 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -1,6 +1,6 @@ # Template file for 'LuaJIT' pkgname=LuaJIT -version=2.0.4 +version=2.0.5 revision=2 hostmakedepends="lua52-BitOp" short_desc="A Just-In-Time Compiler for Lua" @@ -8,7 +8,7 @@ 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";; @@ -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() { 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 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/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 1298e5393b..b85dbcbab9 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.6.2 +version=1.8.0 revision=1 build_style=gnu-configure configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient @@ -10,11 +10,12 @@ 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 - --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 +24,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,9 +32,9 @@ 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)" + $(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() { diff --git a/srcpkgs/R/template b/srcpkgs/R/template index a78be87624..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=1 +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 " diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index 653a09a268..75e33aa27f 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.10 +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=96a8133b587b8b8b92d485f52848134eb587379ff308b708a8e0bb64224bd90a pre_configure() { echo CC=${CC} >> custom diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template index cbeca56af9..24d529b100 100644 --- a/srcpkgs/acbuild/template +++ b/srcpkgs/acbuild/template @@ -1,7 +1,7 @@ # Template file for 'acbuild' pkgname=acbuild version=0.4.0 -revision=4 +revision=5 wrksrc="build-${version}" build_style=go go_import_path=github.com/appc/acbuild diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template index 97e864da2f..b363304d1a 100644 --- a/srcpkgs/acmetool/template +++ b/srcpkgs/acmetool/template @@ -1,7 +1,7 @@ # Template file for 'acmetool' pkgname=acmetool version=0.0.59 -revision=2 +revision=3 wrksrc="acme-${version}" build_style=go go_import_path=github.com/hlandau/acme diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index 5f5b433fda..78d418b4d1 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -1,6 +1,6 @@ # Template file for 'acpica-utils' pkgname=acpica-utils -version=20170303 +version=20170531 revision=1 wrksrc="acpica-unix-${version}" only_for_archs="i686 i686-musl x86_64 x86_64-musl" @@ -10,7 +10,7 @@ homepage="https://www.acpica.org/" license="GPL-2, 3-clause-BSD" maintainer="Juan RP " distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz" -checksum=c093c9eabd1f8c51d79364d829975c5335c8028c4816a7a80dfb8590f31889b5 +checksum=50155778cd1633dfca3443b8f8fd1ccc30e70e55ddece4d3c4fceafbbf1ab0e8 do_build() { sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config generate/unix/iasl/Makefile 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}" 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" 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" 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" diff --git a/srcpkgs/alfred/template b/srcpkgs/alfred/template index 02d5ed5ae2..4e89740f5b 100644 --- a/srcpkgs/alfred/template +++ b/srcpkgs/alfred/template @@ -1,6 +1,6 @@ # Template file for 'alfred' pkgname=alfred -version=2017.0 +version=2017.1 revision=1 build_style=gnu-makefile short_desc="Daemon for distributing arbitrary information over a batman mesh" @@ -8,7 +8,7 @@ maintainer="Enno Boland " license="GPL-2, ISC" homepage="http://www.open-mesh.org/projects/open-mesh/wiki/Alfred" distfiles="http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${version}.tar.gz" -checksum=f8d6d83d2ce30b2238354ce12073285387c0f4ca1a28060390ff50b411b50fa8 +checksum=f8d3a8058d076f6b7686696f6117de1780a2905d827dfa7faa3c2c0b24c2dfb0 hostmakedepends="pkg-config" makedepends="libcap-devel libnl3-devel" make_build_args="CONFIG_ALFRED_GPSD=n" 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..dec114f917 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.1 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=91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76 pre_configure() { autoreconf -fi 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" 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. diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 6920a2348f..06c5882f51 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=2.3.0.0 +version=2.3.1.0 revision=1 noarch=yes build_style=python2-module @@ -13,7 +13,7 @@ maintainer="Juan RP " license="GPL-3" homepage="https://www.ansible.com/" distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz" -checksum=299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458 +checksum=cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5 post_install() { for f in examples/*; do 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)' 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 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..8e2a7840e7 --- /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 gcab" +# 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" + } +} 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..2808052b45 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -1,17 +1,22 @@ # Template file for 'ardour' pkgname=ardour -version=4.7 -revision=2 +version=5.9 +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" 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 } 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 diff --git a/srcpkgs/astyle/template b/srcpkgs/astyle/template index 0b678ebd97..0a190bf8a6 100644 --- a/srcpkgs/astyle/template +++ b/srcpkgs/astyle/template @@ -1,6 +1,6 @@ # Template file for 'astyle' pkgname=astyle -version=3.0 +version=3.0.1 revision=1 wrksrc="$pkgname" build_wrksrc="build/gcc" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://astyle.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version}_linux.tar.gz" -checksum=983e4fe87f20427ddf0d06fa5ba046b5ee95347f9ada33a681af3892426a4ff3 +checksum=6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd do_install() { vbin bin/astyle 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 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" diff --git a/srcpkgs/atom/patches/desktop.patch b/srcpkgs/atom/patches/desktop.patch index 1754f8a508..4f3b064af6 100644 --- a/srcpkgs/atom/patches/desktop.patch +++ b/srcpkgs/atom/patches/desktop.patch @@ -13,7 +13,7 @@ index 1969e3f..71c19ca 100644 -Exec=<%= installDir %>/share/<%= appFileName %>/atom %F -Icon=<%= iconPath %> +Exec=/usr/share/atom/atom %U -+Icon=/usr/share/atom/resources/app.asar.unpacked/resources/atom.png ++Icon=/usr/share/atom/resources/app/resources/atom.png Type=Application StartupNotify=true Categories=GNOME;GTK;Utility;TextEditor;Development; diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template index 57faf541ef..adf431f5b1 100644 --- a/srcpkgs/atom/template +++ b/srcpkgs/atom/template @@ -1,23 +1,28 @@ # Template file for 'atom' pkgname=atom -version=1.11.2 -revision=1 +version=1.17.2 +revision=2 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=bdde2b60e93f818976c28a0b6259d4636a695a2db9c832eeb186082744cd8f6b 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|"\ @@ -44,7 +49,7 @@ do_install() { ls -lah vcopy out/atom-$version-$targetarch/* usr/share/atom vlicense LICENSE.md - + ln -s /usr/share/atom/resources/app/apm/node_modules/.bin/apm "$DESTDIR/usr/bin/apm" # remove useless static libs diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template index cbf953fe2f..f4c14a1eca 100644 --- a/srcpkgs/autofs/template +++ b/srcpkgs/autofs/template @@ -1,6 +1,6 @@ # Template file for 'autofs' pkgname=autofs -version=5.1.2 +version=5.1.3 revision=1 build_style=gnu-configure conf_files="/etc/autofs/*" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="${KERNEL_SITE}/daemons/autofs" distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz" -checksum=88b7de39088aead983e02072a7b753d5ee52ce419c8913f7a3d4ff5521313f0c +checksum=e96eebfe3ed5fb1a30f4510f538198affde223e370c6dc2bed9780309272b1bf CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc" 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)' diff --git a/srcpkgs/avr-binutils/template b/srcpkgs/avr-binutils/template index 1a6e30db3e..5ca1b10f8e 100644 --- a/srcpkgs/avr-binutils/template +++ b/srcpkgs/avr-binutils/template @@ -1,13 +1,13 @@ # Template file for 'avr-binutils' pkgname=avr-binutils -version=2.27 +version=2.28 revision=1 short_desc="GNU binary utilities for AVR" maintainer="allan " homepage="http://www.gnu.org/software/binutils/" license="GPL-3" distfiles="$GNU_SITE/binutils/binutils-$version.tar.gz" -checksum=26253bf0f360ceeba1d9ab6965c57c6a48a01a8343382130d1ed47c468a3094f +checksum=cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf wrksrc="binutils-$version" makedepends="zlib-devel" 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..ba15289d20 --- /dev/null +++ b/srcpkgs/azpainter/template @@ -0,0 +1,19 @@ +# Template file for 'azpainter' +pkgname=azpainter +version=2.0.5 +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.html" +distfiles="http://osdn.dl.osdn.net/azpainter/67713/azpainter-${version}.tar.bz2" +checksum=7c3bc35fff51b3529911e5d6ce6ee2ce565694c17755fe1e6f52e6d9ad0ce839 + +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..fa51403419 --- /dev/null +++ b/srcpkgs/azpainter/update @@ -0,0 +1 @@ +pattern='>ver\ \K[\d.]+' diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index 33d14d2f83..28d1dd4890 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.28 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=63f3ed23e72a857a0e6df53d9d968a325024177b01edbe314a0c98b499eb8603 pre_configure() { autoreconf -fi 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" 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 diff --git a/srcpkgs/base-devel/template b/srcpkgs/base-devel/template index f8eb7da342..83b0a52b76 100644 --- a/srcpkgs/base-devel/template +++ b/srcpkgs/base-devel/template @@ -1,9 +1,8 @@ # Template file for 'base-devel' pkgname=base-devel -version=20161126 +version=20170527 revision=1 build_style=meta -noarch=yes depends="autoconf automake bc binutils bison ed flex gcc gettext groff libtool m4 make patch pkg-config texinfo unzip xz" case "$XBPS_TARGET_MACHINE" in @@ -11,6 +10,6 @@ case "$XBPS_TARGET_MACHINE" in *) depends+=" glibc-devel";; esac short_desc="Void Linux development tools meta package" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="Public Domain" homepage="http://www.voidlinux.eu/" 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 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" 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..2d32aac1fe 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,16 +1,14 @@ # Template file for 'bind' pkgname=bind -_distver=9.10.4 -_patchver=P6 -version="${_distver}${_patchver}" -revision=4 -wrksrc="${pkgname}-${_distver}-${_patchver}" +version=9.10.5 +revision=1 +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}/bind-${_distver}-${_patchver}.tar.gz" -checksum=a1dfbfd1d11cb52f2d9e5af0def25763798bda243841722dd0b319086a73ee65 +distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz" +checksum=71688d2e134e42205075eef93cc1b78b42a140a2d61bf8263afc9c92fc872b0e build_options="geoip seccomp" build_options_default="geoip" 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" 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 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 diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template index fed8ccf362..9489cf69f7 100644 --- a/srcpkgs/bmake/template +++ b/srcpkgs/bmake/template @@ -1,6 +1,6 @@ # Template file for 'bmake' pkgname=bmake -version=20170421 +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=763104954b566ae9f575ea682dc38ed5c73057336f5f6090fb7489a5399511c5 +checksum=ce5d73a8b5267495132bd00392a411178155dafecd66b50860419e9cf8683e3c do_configure() { cd bmake 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" 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" diff --git a/srcpkgs/brisk-menu/template b/srcpkgs/brisk-menu/template new file mode 100644 index 0000000000..ffa76cbbff --- /dev/null +++ b/srcpkgs/brisk-menu/template @@ -0,0 +1,14 @@ +# Template file for 'brisk-menu' +pkgname=brisk-menu +version=0.4.0 +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/brisk-menu" +distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz" +checksum=8737113dc06b472c9f37d36056f0262ef1e76a0de7dbe281cd903b0f9fa26e77 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" diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch new file mode 100644 index 0000000000..c618e8a28d --- /dev/null +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.11.patch @@ -0,0 +1,52 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index a9671e2..da36405 100644 +--- src/wl/sys/wl_cfg80211_hybrid.c ++++ src/wl/sys/wl_cfg80211_hybrid.c +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ #include ++#endif + #include + #include + #include +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- src/wl/sys/wl_linux.c ++++ src/wl/sys/wl_linux.c +@@ -117,6 +117,9 @@ int wl_found = 0; + + typedef struct priv_link { + wl_if_t *wlif; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ unsigned long last_rx; ++#endif + } priv_link_t; + + #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) +@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + { + struct sk_buff *oskb = (struct sk_buff *)p; + struct sk_buff *skb; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link_t *priv_link; ++#endif + uchar *pdata; + uint len; + +@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + if (skb == NULL) return; + + skb->dev = wl->monitor_dev; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); ++ priv_link = netdev_priv(skb->dev); ++ priv_link->last_rx = jiffies; ++#else + skb->dev->last_rx = jiffies; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + skb_reset_mac_header(skb); + #else diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index ec40d139bd..3917281f38 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -2,7 +2,7 @@ pkgname=broadcom-wl-dkms version=6.30.223.271 -revision=4 +revision=5 maintainer="Juan RP " license="Proprietary Broadcom license" homepage="http://broadcom.com" diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template new file mode 100644 index 0000000000..8ed7f01928 --- /dev/null +++ b/srcpkgs/btrbk/template @@ -0,0 +1,14 @@ +# Template file for 'btrbk' +pkgname=btrbk +version=0.25.0 +revision=3 +build_style=gnu-makefile +depends="perl btrfs-progs openssh pv" +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/*" 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 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=" diff --git a/srcpkgs/byobu/template b/srcpkgs/byobu/template index d2d8f4a7fe..46d8937363 100644 --- a/srcpkgs/byobu/template +++ b/srcpkgs/byobu/template @@ -1,6 +1,6 @@ # Template file for 'byobu' pkgname=byobu -version=5.117 +version=5.119 revision=1 build_style=gnu-configure short_desc="A text-based window manager and terminal multiplexer" @@ -8,4 +8,4 @@ maintainer="Diogo Leal " license="GPL-3" homepage="http://byobu.co/" distfiles="https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz" -checksum=64b0deac161a1d979e656052e23b13496c2d262fd7a069abddd21afbc7d0fca2 +checksum=4b092ca12d3a33e89d84cc90c4a41af2ba8697d48e26080a45d64d6b7800ca77 diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 1d3e0f5dbc..c3fbdfade3 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,8 +1,8 @@ # Template file for 'ca-certificates' pkgname=ca-certificates -version=20161130 +version=20161130+nmu1 revision=1 -wrksrc="$pkgname" +wrksrc="${pkgname}-${version%+*}" bootstrap=yes noarch="yes" hostmakedepends="libressl" @@ -10,10 +10,10 @@ depends="libressl>=2.2.4_2 run-parts" conf_files="/etc/ca-certificates.conf" short_desc="Common CA certificates for SSL/TLS" maintainer="Juan RP " -homepage="http://packages.qa.debian.org/c/ca-certificates.html" -license="GPL-2" +homepage="https://tracker.debian.org/pkg/ca-certificates" +license="GPL-2, MPL-2.0" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz" -checksum=04bca9e142a90a834aca0311f7ced237368d71fee7bd5c9f68ef7f4611aee471 +checksum=77f9aca431e3122bf04aa0ffd989b723d906db4d1c106e3290e463d73c177f0e post_extract() { $BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem 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 diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index c98ed4256c..372126c87b 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,6 +1,6 @@ # Template file for 'calibre' pkgname=calibre -version=2.83.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=96166e8c74047cfbae9289c38ab5e2f661168048e568cd187f908242d98426ab +checksum=8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd nocross=yes pycompile_dirs="/usr/lib/calibre/" 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" 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 } } 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\.]+)' 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" 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) + { 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 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" 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 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() { 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 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 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" 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 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" 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 9fbd254986..3b5f18eecd 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,7 +1,7 @@ # Template file for 'clutter' pkgname=clutter -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 @@ -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" diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index d9180621c9..64bafa7624 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.2 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=da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d nocross=yes do_install() { diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 79fb442e81..5c4580d9b2 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.2 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=da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d if [ "$CROSS_BUILD" ]; then # XXX ugly :-) diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template index e6c2aa7aff..15bde44a14 100644 --- a/srcpkgs/codesearch/template +++ b/srcpkgs/codesearch/template @@ -1,7 +1,7 @@ # Template file for 'codesearch' pkgname=codesearch version=0.0.20150617 -revision=6 +revision=7 _githash=a45d81b686e85d01f2838439deaf72126ccd5a96 wrksrc="${pkgname}-${_githash}" build_style=go 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 diff --git a/srcpkgs/colordiff/template b/srcpkgs/colordiff/template index 9079222ae8..2367347640 100644 --- a/srcpkgs/colordiff/template +++ b/srcpkgs/colordiff/template @@ -1,16 +1,16 @@ # Template file for 'colordiff' pkgname=colordiff -version=1.0.16 +version=1.0.18 revision=1 depends="perl" noarch=yes conf_files="/etc/colordiffrc /etc/colordiffrc-lightbg /etc/colordiffrc-gitdiff" -maintainer="Orphaned " +maintainer="Leah Neukirchen " license="GPL-2" homepage="http://www.colordiff.org/" short_desc="Colorizes output of diff" distfiles="http://www.colordiff.org/${pkgname}-${version}.tar.gz" -checksum=eaf1cfe17dd0e820d38a0b24b0a402eba68b32e9bf9e7791ca2d1831029f138b +checksum=29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0 do_install() { vman colordiff.1 diff --git a/srcpkgs/confuse/template b/srcpkgs/confuse/template index 674f494af3..4d2465d4a8 100644 --- a/srcpkgs/confuse/template +++ b/srcpkgs/confuse/template @@ -1,6 +1,6 @@ # Template file for 'confuse' pkgname=confuse -version=3.0 +version=3.2 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=a46abb8696026d314197b6a70ae1a1c296342a9a68aa69b1935709c1477a4e48 confuse-devel_package() { depends="confuse>=${version}_${revision}" 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 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" 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" 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" 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" diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template index c323f2e3ab..015029d910 100644 --- a/srcpkgs/crane/template +++ b/srcpkgs/crane/template @@ -1,7 +1,7 @@ # Template file for 'crane' pkgname=crane version=3.0.0 -revision=1 +revision=2 build_style=go hostmakedepends="git-perl" short_desc="Lift containers with ease " diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template index a3ce25bd24..fec2aeea13 100644 --- a/srcpkgs/crawl-tiles/template +++ b/srcpkgs/crawl-tiles/template @@ -1,6 +1,6 @@ # Template file for 'crawl-tiles' pkgname=crawl-tiles -version=0.19.5 +version=0.20.0 revision=1 wrksrc="crawl-${version}" build_wrksrc="crawl-ref/source" @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://crawl.develz.org/" distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz" -checksum=80c6c61722b4cfb718204d81666d4aa1ab3c73f53f6be5d5e19685f7ffeda3c0 +checksum=3c26cd61fe254d52c36177d35001b3390a989b60541344cd633985496fba6bcd nocross=yes post_extract() { diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template index 7df8c57d66..be087ca215 100644 --- a/srcpkgs/crawl/template +++ b/srcpkgs/crawl/template @@ -1,6 +1,6 @@ # Template file for 'crawl' pkgname=crawl -version=0.19.5 +version=0.20.0 revision=1 build_wrksrc="crawl-ref/source" make_build_args="prefix=/usr bin_prefix=bin" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="GPL-2" homepage="http://crawl.develz.org/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" -checksum=80c6c61722b4cfb718204d81666d4aa1ab3c73f53f6be5d5e19685f7ffeda3c0 +checksum=3c26cd61fe254d52c36177d35001b3390a989b60541344cd633985496fba6bcd nocross=yes post_extract() { 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 + + { 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() { diff --git a/srcpkgs/culmus/template b/srcpkgs/culmus/template index 5e8e271ec7..7fa657b6c8 100644 --- a/srcpkgs/culmus/template +++ b/srcpkgs/culmus/template @@ -1,6 +1,6 @@ # Template file for 'culmus' pkgname=culmus -version=0.130 +version=0.131 revision=1 noarch="yes" depends="font-util" @@ -9,7 +9,7 @@ maintainer="DirectorX " license="GPL-2" homepage="http://culmus.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1 +checksum=dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b do_install() { vmkdir usr/share/fonts/TTF 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 diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 503e0c7acb..721bfa4c8c 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,6 +1,6 @@ # Template file for 'darktable' pkgname=darktable -version=2.2.4 +version=2.2.5 revision=1 build_style=cmake # this makes sure to use -march=generic and -msse3 @@ -20,4 +20,4 @@ depends="adwaita-icon-theme" # upstream only supports these archs: only_for_archs="i686 i686-musl x86_64 x86_64-musl aarch64 aarch64-musl" distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz" -checksum=bd5445d6b81fc3288fb07362870e24bb0b5378cacad2c6e6602e32de676bf9d8 +checksum=e303a42b33f78eb1f48d3b36d1df46f30873df4c5a7b49605314f61c49fbf281 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 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 +} 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" 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 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 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 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 +} diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template index d66136e57f..ab799c034e 100644 --- a/srcpkgs/direnv/template +++ b/srcpkgs/direnv/template @@ -1,7 +1,7 @@ # Template file for 'direnv' pkgname=direnv version=2.11.3 -revision=2 +revision=3 build_style=go go_import_path="github.com/direnv/direnv" short_desc="An environment switcher for the shell" 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 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" 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 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" diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index 69f48faaf1..597f0a57d1 100644 --- a/srcpkgs/dnsmasq/template +++ b/srcpkgs/dnsmasq/template @@ -1,6 +1,6 @@ # Template file for 'dnsmasq' pkgname=dnsmasq -version=2.76 +version=2.77 revision=1 hostmakedepends="pkg-config" makedepends="dbus-devel libcap-devel libidn-devel" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html" distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz" -checksum=777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32 +checksum=ae97a68c4e64f07633f31249eb03190d673bdb444a05796a3a2d3f521bfe9d38 do_build() { echo '#define HAVE_DBUS' >> src/config.h 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 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 +} diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template index 458cf232ec..3fb16e4114 100644 --- a/srcpkgs/docker-gen/template +++ b/srcpkgs/docker-gen/template @@ -1,7 +1,7 @@ # Template file for 'docker-gen' pkgname=docker-gen version=0.7.3 -revision=4 +revision=5 build_style=go hostmakedepends="git-perl glock" short_desc="Generate files from docker container meta-data" diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template index c2e65c0f93..e5a53573e0 100644 --- a/srcpkgs/docker-machine/template +++ b/srcpkgs/docker-machine/template @@ -1,7 +1,7 @@ # Template file for 'docker-machine' pkgname=docker-machine version=0.6.0 -revision=5 +revision=6 wrksrc="machine-${version}" build_style=go go_import_path="github.com/docker/machine" diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 6ef13af070..561bbc9036 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,18 +1,18 @@ # Template file for 'docker' pkgname=docker -version=17.04.0 +version=17.05.0 revision=2 _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" diff --git a/srcpkgs/docker2aci/template b/srcpkgs/docker2aci/template index c53501167f..5e83e8543a 100644 --- a/srcpkgs/docker2aci/template +++ b/srcpkgs/docker2aci/template @@ -1,7 +1,7 @@ # Template file for 'docker2aci' pkgname=docker2aci version=0.16.0 -revision=3 +revision=4 hostmakedepends="git git-perl" build_style=go short_desc="Library and CLI tool to convert Docker images to ACIs" diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template index 4052e99c9f..d8431c7581 100644 --- a/srcpkgs/dovecot-plugin-pigeonhole/template +++ b/srcpkgs/dovecot-plugin-pigeonhole/template @@ -1,7 +1,7 @@ # Template file for 'dovecot-plugin-pigeonhole' pkgname=dovecot-plugin-pigeonhole version=0.4.18 -revision=1 +revision=2 wrksrc="dovecot-2.2-pigeonhole-${version}" build_style=gnu-configure configure_args="--prefix=/usr diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 0d981145d3..5625c9e91f 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -1,7 +1,7 @@ # Template file for 'dovecot' # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot -version=2.2.29.1 +version=2.2.30.1 revision=1 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin @@ -14,7 +14,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://dovecot.org" distfiles="${homepage}/releases/2.2/${pkgname}-${version}.tar.gz" -checksum=ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 +checksum=9049db49f7ccd76850a17872896dfb8778676bab38454575f59bb39f16b083a4 keep_libtool_archives=yes makedepends=" 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" diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template index f54ea4e8f9..8b48bdc38d 100644 --- a/srcpkgs/drive/template +++ b/srcpkgs/drive/template @@ -1,7 +1,7 @@ # Template file for 'drive' pkgname=drive version=0.3.9.1 -revision=3 +revision=4 build_style=go hostmakedepends="git" short_desc="Google Drive client for the commandline" 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 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" 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; diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index b201052099..452b8c1c0c 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.19.1 +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=8c69eaf5f3489245dff6112394bf3685fb9d6fd3915035fe022f27c554e6cd3a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake gettext-devel libtool efl-devel" 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" 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 diff --git a/srcpkgs/elogind/patches/fix-musl.patch b/srcpkgs/elogind/patches/fix-musl.patch new file mode 100644 index 0000000000..b66083ada0 --- /dev/null +++ b/srcpkgs/elogind/patches/fix-musl.patch @@ -0,0 +1,17 @@ +diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h +index 294d617cd..2000b38a9 100644 +--- src/basic/fs-util.h ++++ src/basic/fs-util.h +@@ -51,7 +51,12 @@ int fchmod_umask(int fd, mode_t mode); + + int fd_warn_permissions(const char *path, int fd); + ++#ifdef __GLIBC__ + #define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) ++#else ++#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) ++#endif ++ + + int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); + int touch(const char *path); diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 4213edf2f6..5698f53852 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,6 +1,6 @@ # Template file for 'elogind' pkgname=elogind -version=227.4 +version=229.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=8506145e6071a637aec91276e19cd932b3d9cd297c8e833f7b08b8d53fd7a1d7 conf_files="/etc/elogind/logind.conf" configure_args+=" --disable-kdbus --disable-lto" diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template index e2e7bdcf42..f8b824a3fb 100644 --- a/srcpkgs/elvish/template +++ b/srcpkgs/elvish/template @@ -1,7 +1,7 @@ # Template file for 'elvish' pkgname=elvish -version=0.7 -revision=2 +version=0.8 +revision=1 build_style=go go_import_path="github.com/elves/elvish" short_desc="A novel Unix shell" @@ -9,7 +9,7 @@ maintainer="Diogo Leal " license="BSD" homepage="https://github.com/elves/elvish/" distfiles="https://github.com/elves/elvish/archive/${version}.tar.gz" -checksum=e5afabf749f00cfd59c67472d9dc99d515f47d363e106227ad80e83dbed452f7 +checksum=74ce8baf5dc76cf1b9aede6781331c30177c6856c1d6a55f3eb62d6af53b78bb register_shell="/bin/elvish" post_install() { 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" diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template index c986bba09b..03f9ad6243 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.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=bb05001c5449a73dbf0873aea6a0f862080a0625842e9bd5e00b8e4e52e3c8c0 +checksum=4091994a2f947fdf9e22a8087be00f1c8453ff87dcba5aac0a5a710c2f23879e nopie=y 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 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. 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" diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index f645554000..b7cf616698 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-tests" @@ -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 diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template index 2ca944e127..ff082b429b 100644 --- a/srcpkgs/etcd/template +++ b/srcpkgs/etcd/template @@ -1,26 +1,31 @@ # Template file for 'etcd' pkgname=etcd -version=3.1.5 -revision=1 +version=3.1.8 +revision=2 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=f68700f710dfd9c5fefb41a60e96f9d0c7907e6abe21518ab0a05f6e425a3d4e 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 -} +do_build() { + if [[ "${go_get}" != "yes" ]]; then + local path="${GOPATH}/src/${go_import_path}" + mkdir -p "$(dirname ${path})" + ln -fs $PWD "${path}" + fi -post_build() { - go get -x ${go_import_path}/etcdctl + glide install + 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() { diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index 7cbf340569..0db6b8b29b 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -1,6 +1,6 @@ # Template file for 'ethtool' pkgname=ethtool -version=4.10 +version=4.11 revision=1 build_style=gnu-configure short_desc="Utility for controlling network drivers and hardware" @@ -8,4 +8,4 @@ maintainer="Juan RP " homepage="http://www.kernel.org/pub/software/network/ethtool/" license="GPL-2" distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f0009726ecf34128b9a8238b71a652847dbc06bd1b877656699b0592b95c74ba +checksum=12d8edaa8064966b8ef19cc44fecc096a68828035b6a1f2c67a27531a718e1b2 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 60d55b9202..299c503a05 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.24.1 +version=3.24.2 revision=1 build_style=cmake configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF" @@ -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 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 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" 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}" diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 5a650cde7f..c6f7a88ec0 100644 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -1,6 +1,6 @@ # Template file for 'exiftool' pkgname=exiftool -version=10.50 +version=10.54 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=0cabcbf0b53b5b86ae5dcc4ac184728909e341bbf93ca02ac7d148d60e8cd3b5 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" diff --git a/srcpkgs/fcgiwrap/template b/srcpkgs/fcgiwrap/template index 2fef2cc280..15df80dfdb 100644 --- a/srcpkgs/fcgiwrap/template +++ b/srcpkgs/fcgiwrap/template @@ -1,7 +1,7 @@ # Template file for 'fcgiwrap' pkgname=fcgiwrap version=1.1.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="fcgi-devel" 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/*/*/* } 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 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 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 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" 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 diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 57ae6a66bd..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=1 +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} 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 +" 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 f7b3b08363..ed94c0f7da 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,13 +1,13 @@ # Template build file for 'firefox'. pkgname=firefox -version=53.0 +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=4ed1b23ea7c08f81a08817ddf3b4f06849e01420ee074008b6f390366e95b7d0 +checksum=78cc89650b6d8baacaf55f1a486de06bf3bb5b8a3082fd044e70225e2816e348 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" @@ -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) 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..705fa7e720 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" ;; +arm*|aarch64*) configure_args+=" --disable-seccomp" ;; esac + +pre_configure() { + autoreconf -fi +} diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index c5ca5bfa8e..42bead60ef 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -1,6 +1,6 @@ # Template file for 'fish-shell' pkgname=fish-shell -version=2.5.0 +version=2.6.0 revision=1 build_style=gnu-configure configure_args="ac_cv_file__proc_self_stat=yes" @@ -15,7 +15,7 @@ homepage="http://fishshell.com/" license="GPL-2" short_desc="User friendly shell intended mostly for interactive use" distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.gz" -checksum=f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 +checksum=7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb if [ -n "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template index 54d05a08d7..c62766a8d7 100644 --- a/srcpkgs/flannel/template +++ b/srcpkgs/flannel/template @@ -1,7 +1,7 @@ # Template file for 'flannel' pkgname=flannel version=0.7.1 -revision=1 +revision=2 build_style=go short_desc="Etcd backed network fabric for containers" maintainer="Andrea Brancaleoni " @@ -10,7 +10,7 @@ license="Apache-2.0" go_import_path="github.com/coreos/flannel" homepage="https://$go_import_path" distfiles="$homepage/archive/v${version}.tar.gz" -checksum=f8b837bc042c917cd37cfe131132ba1fde5268fadb7632da9c16f57d0905161b +checksum=3c3148eac3537fba6c5377922366ed36b1415d20111434172c5c42fec74db366 pre_build() { CGO_CFLAGS="${CGO_CFLAGS/-O2/}" # Disable optimizations because of a cgo bug in Go 1.6 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..76fedd4429 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,10 +1,10 @@ # Template file for 'flatpak' pkgname=flatpak -version=0.9.3 +version=0.9.4 revision=1 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" @@ -14,8 +14,21 @@ 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 -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 + } +} 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 diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index 1d96a715d9..00cfb3ac97 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -1,43 +1,36 @@ # Template file for 'flightgear' pkgname=flightgear -version=2017.1.3 -revision=1 +version=2017.2.1 +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 - simgear $(vopt_if qt qt5-devel)" + simgear $(vopt_if qt 'qt5-devel qt5-declarative-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/" +#_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=" - 3d7cb2b4b1d60b80b0613222b1fc7b6db665eddaf68d7080c07cdedcb544b0ad - bf35d9a15be9e7bd1c286eee879251e0907a3fb5cca4e7d1fdfbe67690345365" - -case "$XBPS_TARGET_MACHINE" in - aarch64-musl) - broken="ICE: dependency simgear does not build" - ;; -esac + c7d9a63736cafd02236707d0f8e1bb36884a1a989cf49575bad13b4cbb311f5b + c9350e4500a1d97ebc515e7bb9e74081a8726a8fa244966543c9c67bcdacd1a4" 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 diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template index 0f835c03da..07f8e37f84 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=2 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 diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template index 1880ec5734..5756ebad8c 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,6 +1,6 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=1.12.5 +version=1.13.0 revision=1 create_wrksrc=yes noarch="yes" @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="SIL Open Font License" homepage="https://be5invis.github.io/Iosevka/" distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip" -checksum=d173e70f6ac479e84682b5b286e147313506cab211b70413cf9a3f0b66356f68 +checksum=99ebc9b8d24a9412c6806b1bf671f17eaaaf4e18165cffca98fc9c0082424c0e do_install() { vmkdir usr/share/fonts/TTF diff --git a/srcpkgs/fontconfig/patches/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch b/srcpkgs/fontconfig/patches/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch deleted file mode 100644 index 162360b224..0000000000 --- a/srcpkgs/fontconfig/patches/0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 11 Dec 2016 14:32:00 -0800 -Subject: [PATCH] Avoid conflicts with integer width macros from TS - 18661-1:2014 - -glibc 2.25+ has now defined these macros in -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - fontconfig/fontconfig.h | 2 +- - src/fcobjs.h | 2 +- - src/fcobjshash.gperf | 2 +- - src/fcobjshash.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -Index: fontconfig-2.12.1/fontconfig/fontconfig.h -=================================================================== ---- fontconfig/fontconfig.h -+++ fontconfig/fontconfig.h -@@ -128,7 +128,8 @@ typedef int FcBool; - #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ --#define FC_CHAR_WIDTH "charwidth" /* Int */ -+#define FC_CHARWIDTH "charwidth" /* Int */ -+#define FC_CHAR_WIDTH FC_CHARWIDTH - #define FC_CHAR_HEIGHT "charheight"/* Int */ - #define FC_MATRIX "matrix" /* FcMatrix */ - -Index: fontconfig-2.12.1/src/fcobjs.h -=================================================================== ---- src/fcobjs.h -+++ src/fcobjs.h -@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) - FC_OBJECT (RGBA, FcTypeInteger, NULL) - FC_OBJECT (SCALE, FcTypeDouble, NULL) - FC_OBJECT (MINSPACE, FcTypeBool, NULL) --FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) -+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) - FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) - FC_OBJECT (MATRIX, FcTypeMatrix, NULL) - FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) -Index: fontconfig-2.12.1/src/fcobjshash.gperf -=================================================================== ---- src/fcobjshash.gperf -+++ src/fcobjshash.gperf -@@ -44,7 +44,7 @@ int id; - "rgba",FC_RGBA_OBJECT - "scale",FC_SCALE_OBJECT - "minspace",FC_MINSPACE_OBJECT --"charwidth",FC_CHAR_WIDTH_OBJECT -+"charwidth",FC_CHARWIDTH_OBJECT - "charheight",FC_CHAR_HEIGHT_OBJECT - "matrix",FC_MATRIX_OBJECT - "charset",FC_CHARSET_OBJECT -Index: fontconfig-2.12.1/src/fcobjshash.h -=================================================================== ---- src/fcobjshash.h -+++ src/fcobjshash.h -@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, - {-1}, - #line 47 "fcobjshash.gperf" -- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, -+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, - #line 48 "fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, - #line 55 "fcobjshash.gperf" diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template index fac5f2af1f..e65c5380e4 100644 --- a/srcpkgs/fontconfig/template +++ b/srcpkgs/fontconfig/template @@ -1,10 +1,10 @@ # Template build file for 'fontconfig'. pkgname=fontconfig -version=2.12.1 -revision=2 +version=2.12.3 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/$pkgname" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gperf" makedepends="expat-devel zlib-devel freetype-devel" conf_files="/etc/fonts/fonts.conf" short_desc="Library for configuring and customizing font access" @@ -12,8 +12,12 @@ maintainer="Juan RP " homepage="http://www.fontconfig.org" license="MIT" distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/$pkgname-$version.tar.bz2" -checksum=b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 +checksum=bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd +pre_build() { + # trick to regenerate hash functions :-) + rm -f src/fcobjshash.h +} post_install() { if [ "$CROSS_BUILD" ]; then sed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template index 0d0746bb20..81006c1cec 100644 --- a/srcpkgs/forego/template +++ b/srcpkgs/forego/template @@ -1,7 +1,7 @@ # Template file for 'forego' pkgname=forego version=20170327195458 -revision=2 +revision=3 build_style=go hostmakedepends="git mercurial" short_desc="A process supervisor in Go" 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 diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 210557a9a2..385ffac099 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,6 +1,6 @@ # Template file for 'freeplane' pkgname=freeplane -version=1.5.20 +version=1.5.21 revision=1 noarch=yes hostmakedepends="apache-ant openjdk unzip gradle" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://freeplane.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz" -checksum=00595bc6aea6f639fd10f89a32939775b1cac2474de4af182c234ce3b4265ab2 +checksum=741538d54c9f511531f44e95f8894145ede7ac36a8e08933e0ca945255ca2a6a make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root diff --git a/srcpkgs/freetds/template b/srcpkgs/freetds/template index 68cd594ae2..a1ac7431f5 100644 --- a/srcpkgs/freetds/template +++ b/srcpkgs/freetds/template @@ -1,6 +1,6 @@ # Template file for 'freetds' pkgname=freetds -version=1.00.33 +version=1.00.40 revision=1 build_style=gnu-configure configure_args="--sysconfdir=/etc/$pkgname" @@ -12,7 +12,7 @@ maintainer="Diogo Leal " license="LGPL-3" homepage="http://www.freetds.org/" distfiles="ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${version}.tar.gz" -checksum=10937f04a36dc43c00a1c3cda6769646a7fe54f9a135722b9eba3551820582c9 +checksum=4370a9201ef496388f764a4095a77cf4338ed0c0428530c98bcbf0547d66ee8d freetds-devel_package() { short_desc+=" - development files" 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" 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 diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template index 4e04f42dae..6acaeb5c65 100644 --- a/srcpkgs/fs-repo-migrations/template +++ b/srcpkgs/fs-repo-migrations/template @@ -1,7 +1,7 @@ # Template file for 'fs-repo-migrations' pkgname=fs-repo-migrations version=1.2.2 -revision=2 +revision=3 build_style=go go_import_path="github.com/ipfs/fs-repo-migrations" short_desc="Tool to upgrade the IPFS filesystem repository" 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 diff --git a/srcpkgs/fwup/template b/srcpkgs/fwup/template index 465e3564c4..503dd0ba7e 100644 --- a/srcpkgs/fwup/template +++ b/srcpkgs/fwup/template @@ -1,7 +1,7 @@ # Template file for 'fwup' pkgname=fwup -version=0.13.0 -revision=1 +version=0.14.3 +revision=2 build_style=gnu-configure configure_args="ac_vc_func_open_memstream=yes" hostmakedepends="automake libtool pkg-config" @@ -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=cf2e6ff729c21bc000dbe008211cf9d4901be9b42c82a06e4068deb638ea8f6e if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template index 90505ea5f7..875cbed5b3 100644 --- a/srcpkgs/fzf/template +++ b/srcpkgs/fzf/template @@ -1,7 +1,7 @@ # Template file for 'fzf' pkgname=fzf version=0.16.7 -revision=1 +revision=2 build_style=go go_import_path="github.com/junegunn/fzf/src" go_package="github.com/junegunn/fzf/src/fzf" diff --git a/srcpkgs/gajim/patches/include-root-cert.patch b/srcpkgs/gajim/patches/include-root-cert.patch new file mode 100644 index 0000000000..f650a50e37 --- /dev/null +++ b/srcpkgs/gajim/patches/include-root-cert.patch @@ -0,0 +1,22 @@ +--- plugins/Makefile.am.orig 2017-02-01 14:16:03.000000000 +0100 ++++ plugins/Makefile.am 2017-05-22 17:25:16.121616663 +0200 +@@ -7,7 +7,7 @@ + + pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} + +-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png) ++pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.pem ${p}/*.ui ${p}/*.png) + + nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) + +--- plugins/Makefile.in.orig 2017-03-05 22:58:32.000000000 +0100 ++++ plugins/Makefile.in 2017-05-22 17:40:36.897800490 +0200 +@@ -316,7 +316,7 @@ + gajimpluginsdir = $(gajim_pluginsdir) + dist_gajimplugins_PYTHON = + pluginsdirs = ${sort ${dir ${wildcard ${srcdir}/*/ ${srcdir}/*/*/}}} +-pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.ui ${p}/*.png) ++pluginsfiles = $(wildcard ${p}/*.py ${p}/manifest.ini ${p}/*.pem ${p}/*.ui ${p}/*.png) + nobase_gajimplugins_DATA = $(foreach p, ${pluginsdirs}, $(pluginsfiles)) + MAINTAINERCLEANFILES = Makefile.in + all: all-am diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template index 017ac0e4c4..f5dbbf1b49 100644 --- a/srcpkgs/gajim/template +++ b/srcpkgs/gajim/template @@ -1,12 +1,12 @@ # Template file for 'gajim' pkgname=gajim version=0.16.7 -revision=2 +revision=3 noarch=yes build_style=gnu-configure configure_args="--enable-site-packages PYTHON=python2" hostmakedepends="intltool python" -makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp" +makedepends="python-dbus pygtk-devel python-openssl python-sqlite python-nbxmpp python-pyasn1" depends="${makedepends/-devel/}" pycompile_module="gajim" short_desc="Full featured Jabber/XMPP client" 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" + } +} diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index bedc1df3ba..2bf2eaa683 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -1,7 +1,7 @@ # Template file for 'gdb' pkgname=gdb -version=7.12.1 -revision=2 +version=8.0 +revision=1 patch_args="-Np1" build_style=gnu-configure pycompile_dirs="/usr/share/gdb" @@ -15,10 +15,7 @@ maintainer="Juan RP " homepage="http://www.gnu.org/software/gdb/" license="GPL-3" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186 -# Else build on musl breaks... -# http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/5766 -disable_parallel_build=yes +checksum=f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee if [ "${CROSS_BUILD}" ]; then # Make python2.7 detection work in cross builds diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 9ad56b62f6..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=2 +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 @@ -26,13 +26,13 @@ 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" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=1ee22139fe0a3fc1ff897ca1c626b28b4e997275ca8dd4d7e48e019a2f2c2179 +checksum=4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8 # Package build options build_options="gir" diff --git a/srcpkgs/gede/template b/srcpkgs/gede/template index 151bdc5828..19bc95d1cd 100644 --- a/srcpkgs/gede/template +++ b/srcpkgs/gede/template @@ -1,6 +1,6 @@ # Template file for 'gede' pkgname=gede -version=2.0.3 +version=2.0.4 revision=1 build_style=qmake build_wrksrc="src" @@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni " license="BSD" homepage="http://acidron.com/gede" distfiles="http://gede.acidron.com/uploads/source/${pkgname}-${version}.tar.xz" -checksum=730e69e513c9a15fa41cdb7a02c91cacf570974f4af571703a54d6fce4acd4fe +checksum=6a61573be0e399d557e048a48806e46d4972242e7b7a452e1883e932b436e846 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt-host-tools qt-devel" diff --git a/srcpkgs/gegl3/template b/srcpkgs/gegl3/template index 7c6e2267ac..d228ce49a4 100644 --- a/srcpkgs/gegl3/template +++ b/srcpkgs/gegl3/template @@ -1,7 +1,8 @@ # Template build file for 'gegl3'. pkgname=gegl3 -version=0.3.14 -revision=3 +version=0.3.18 +revision=1 +wrksrc="gegl-${version}" build_style=gnu-configure configure_args="--disable-docs --without-sdl --without-libavformat --without-graphviz --without-lua --without-libspiro @@ -13,10 +14,9 @@ makedepends="libglib-devel libpng-devel babl-devel jasper-devel short_desc="Graph based image processing framework (v0.3)" maintainer="Juan RP " license="GPL-3, LGPL-3" -homepage="http://www.gimp.org" -distfiles="http://ftp.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2" -checksum=09f5e2e6899697641d4660e3e274aed696f5bacc96ba389ac77674ee1156590a -wrksrc=gegl-$version +homepage="https://www.gimp.org/" +distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.bz2" +checksum=d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb post_install() { # Resolves conflict with gegl diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index 3c16c8019b..c7d76b5c80 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -1,7 +1,7 @@ # Template file for 'gendesk' pkgname=gendesk version=0.6.4 -revision=5 +revision=6 build_style=go hostmakedepends="git-perl mercurial" go_import_path="github.com/xyproto/gendesk" diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template index 685f7399fe..9b41efb675 100644 --- a/srcpkgs/geoclue2/template +++ b/srcpkgs/geoclue2/template @@ -1,6 +1,6 @@ # Template file for 'geoclue2' pkgname=geoclue2 -version=2.4.6 +version=2.4.7 revision=1 lib32disabled=yes wrksrc="geoclue-${version}" @@ -17,8 +17,8 @@ short_desc="The Geoinformation Service (2.x series)" homepage="http://www.freedesktop.org/wiki/Software/GeoClue" license="LGPL-2.1" maintainer="Juan RP " -distfiles="http://www.freedesktop.org/software/geoclue/releases/${version%.*}/geoclue-${version}.tar.xz" -checksum=c57df7455c9b4b2f43b0f5d9be14d52f5ff9897236df768f6ca9044b79b6d3b6 +distfiles="${FREEDESKTOP_SITE}/geoclue/releases/${version%.*}/geoclue-${version}.tar.xz" +checksum=d17b96bb5799a84723385ea5704235565e9c3dedd2b7afac475a06e550ae0ea6 build_options="gir" if [ -z "$CROSS_BUILD" ]; then 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 diff --git a/srcpkgs/geoipupdate/template b/srcpkgs/geoipupdate/template index 787abb15cb..5f63d83945 100644 --- a/srcpkgs/geoipupdate/template +++ b/srcpkgs/geoipupdate/template @@ -1,6 +1,6 @@ # Template file for 'geoipupdate' pkgname=geoipupdate -version=2.3.1 +version=2.4.0 revision=1 build_style=gnu-configure configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip" @@ -11,7 +11,7 @@ maintainer="Enno Boland " homepage="https://github.com/maxmind/geoipupdate" license="GPL-2" distfiles="https://github.com/maxmind/geoipupdate/releases/download/v$version/geoipupdate-$version.tar.gz" -checksum=4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c +checksum=8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952 conf_files="/etc/geoip/GeoIP.conf" pre_configure() { diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template index c232bd72ef..25c3784948 100644 --- a/srcpkgs/ghq/template +++ b/srcpkgs/ghq/template @@ -1,7 +1,7 @@ # Template file for 'ghq' pkgname=ghq version=0.7.4 -revision=4 +revision=5 build_style=go go_import_path="github.com/motemen/ghq" go_package="${go_import_path}" diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template new file mode 100644 index 0000000000..c6583d0a76 --- /dev/null +++ b/srcpkgs/giada/template @@ -0,0 +1,21 @@ +# Template file for 'giada' +pkgname=giada +version=0.14.0 +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=fe3118713882b40c95e8668406f7a460075e579e151b912082c1a74658b1f60a + +CPPFLAGS="-Wno-error=cpp" + +pre_configure() { + autoreconf -fi +} 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() { 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() { 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 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 diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template index 3d0448279a..0bf89eed45 100644 --- a/srcpkgs/git-lfs/template +++ b/srcpkgs/git-lfs/template @@ -1,7 +1,7 @@ # Template file for 'git-lfs' pkgname=git-lfs -version=2.0.2 -revision=1 +version=2.1.1 +revision=2 nocross=1 build_style=go go_import_path="github.com/git-lfs/git-lfs" @@ -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 diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 0bd6ad178c..3b31084611 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.1 +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,18 +15,20 @@ 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=3bc1becd983f77ab154a46801624369dbc40c3dd04b4c4b07ad026f5684688fe 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() { 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 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}" diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template index 0c7bb7703d..aa0ff61f50 100644 --- a/srcpkgs/gkill/template +++ b/srcpkgs/gkill/template @@ -1,7 +1,7 @@ # Template file for 'gkill' pkgname=gkill version=1.0.2 -revision=1 +revision=2 build_style=go hostmakedepends="git" short_desc="Easy Process Killer" diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index c25f6c50f1..feb8a93d6f 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -1,6 +1,6 @@ # Template file for 'glances' pkgname=glances -version=2.9.1 +version=2.10 revision=1 noarch=yes wrksrc="Glances-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/nicolargo/glances" license="LGPL-3" distfiles="${PYPI_SITE}/G/Glances/Glances-${version}.tar.gz" -checksum=03ce730566e183372ee73e45729485396bb62d1c0f108a00f27feff43206fc52 +checksum=3e3ebd41a4f627b76ee1cdf107482d81e787efde8a5e41e6568169d38eb2e696 post_install() { vsconf conf/glances.conf 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 a976791fa2..76bc8f2a86 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template build file for 'glib' pkgname=glib -version=2.52.1 -revision=1 +version=2.52.2 +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" @@ -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" diff --git a/srcpkgs/glibc/files/glibc-patches b/srcpkgs/glibc/files/glibc-patches new file mode 100755 index 0000000000..289e0848b7 --- /dev/null +++ b/srcpkgs/glibc/files/glibc-patches @@ -0,0 +1,5 @@ +#!/bin/sh +# glibc-patches VERSION - fetch glibc upstream patches +version=${1?no version given} +curl -sL "http://repo.or.cz/glibc.git/patch/glibc-${version}..release/${version}/master" | sed '/^Subject/s,/[0-9]*\],],' | csplit -f glibc-upstream- -b '%02d.patch' - '/^From /' '{*}' +rm glibc-upstream-00.patch diff --git a/srcpkgs/glibc/patches/glibc-upstream-01.patch b/srcpkgs/glibc/patches/glibc-upstream-01.patch new file mode 100644 index 0000000000..d5a0a4d407 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-01.patch @@ -0,0 +1,121 @@ +From 58520986c38e34db60e07260c64c563e3efcf353 Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar +Date: Thu, 9 Feb 2017 17:28:54 +0100 +Subject: [PATCH 01] Fix getting tunable values on big-endian (BZ #21109) + +The code to set value passed a tunable_val_t, which when cast to +int32_t on big-endian gives the wrong value. Instead, use +tunable_val_t.numval instead, which can then be safely cast into +int32_t. + +(cherry picked from commit 8cbc826c37c0221ada65a7a622fe079b4e89a4b0) +--- + ChangeLog | 10 ++++++++++ + NEWS | 6 ++++++ + elf/dl-tunable-types.h | 4 ++-- + elf/dl-tunables.c | 2 ++ + malloc/arena.c | 8 ++++---- + 5 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index f140ee6..c88238e 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,13 @@ ++2017-02-08 Siddhesh Poyarekar ++ ++ [BZ #21109] ++ * elf/dl-tunable-types.h (tunable_callback_t): Accept ++ tunable_val_t as argument. ++ * elf/dl-tunables.c (__tunable_set_val): Add comment. ++ * malloc/arena.c (set_mallopt_check): Take tunable_val_t as ++ argument. ++ (DL_TUNABLE_CALLBACK_FNDECL): Likewise. ++ + 2017-02-05 Siddhesh Poyarekar + + * version.h (RELEASE): Set to "stable" +diff --git a/NEWS b/NEWS +index ec15dde..325cac7 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ See the end for copying conditions. + Please send GNU C library bug reports via + using `glibc' in the "product" field. + ++Version 2.25.1 ++ ++The following bugs are resolved with this release: ++ ++ [21109] Tunables broken on big-endian ++ + Version 2.25 + + * The feature test macro __STDC_WANT_LIB_EXT2__, from ISO/IEC TR +diff --git a/elf/dl-tunable-types.h b/elf/dl-tunable-types.h +index a986f0b..37a4e80 100644 +--- a/elf/dl-tunable-types.h ++++ b/elf/dl-tunable-types.h +@@ -21,8 +21,6 @@ + # define _TUNABLE_TYPES_H_ + #include + +-typedef void (*tunable_callback_t) (void *); +- + typedef enum + { + TUNABLE_TYPE_INT_32, +@@ -43,6 +41,8 @@ typedef union + const char *strval; + } tunable_val_t; + ++typedef void (*tunable_callback_t) (tunable_val_t *); ++ + /* Security level for tunables. This decides what to do with individual + tunables for AT_SECURE binaries. */ + typedef enum +diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c +index a8d53d6..e42aa67 100644 +--- a/elf/dl-tunables.c ++++ b/elf/dl-tunables.c +@@ -455,6 +455,8 @@ __tunable_set_val (tunable_id_t id, void *valp, tunable_callback_t callback) + if (cur->strval == NULL) + return; + ++ /* Caller does not need the value, just call the callback with our tunable ++ value. */ + if (valp == NULL) + goto cb; + +diff --git a/malloc/arena.c b/malloc/arena.c +index b91d7d6..d49e4a2 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -212,9 +212,9 @@ __malloc_fork_unlock_child (void) + #if HAVE_TUNABLES + static inline int do_set_mallopt_check (int32_t value); + void +-DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) ++DL_TUNABLE_CALLBACK (set_mallopt_check) (tunable_val_t *valp) + { +- int32_t value = *(int32_t *) valp; ++ int32_t value = (int32_t) valp->numval; + do_set_mallopt_check (value); + if (check_action != 0) + __malloc_check_init (); +@@ -223,9 +223,9 @@ DL_TUNABLE_CALLBACK (set_mallopt_check) (void *valp) + # define DL_TUNABLE_CALLBACK_FNDECL(__name, __type) \ + static inline int do_ ## __name (__type value); \ + void \ +-DL_TUNABLE_CALLBACK (__name) (void *valp) \ ++DL_TUNABLE_CALLBACK (__name) (tunable_val_t *valp) \ + { \ +- __type value = *(__type *) valp; \ ++ __type value = (__type) (valp)->numval; \ + do_ ## __name (value); \ + } + +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-02.patch b/srcpkgs/glibc/patches/glibc-upstream-02.patch new file mode 100644 index 0000000000..0b07aa3a49 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-02.patch @@ -0,0 +1,161 @@ +From 045e368799cd253ddbf8bdec42ed92e8ebb3ce67 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 28 Feb 2017 17:05:46 +0100 +Subject: [PATCH 02] sunrpc: Avoid use-after-free read access in + clntudp_call [BZ #21115] + +After commit bc779a1a5b3035133024b21e2f339fe4219fb11c +(CVE-2016-4429: sunrpc: Do not use alloca in clntudp_call +[BZ #20112]), ancillary data is stored on the heap, +but it is accessed after it has been freed. + +The test case must be run under a heap debugger such as valgrind +to observe the invalid access. A malloc implementation which +immediately calls munmap on free would catch this bug as well. + +(cherry picked from commit d42eed4a044e5e10dfb885cf9891c2518a72a491) +--- + ChangeLog | 8 +++++++ + NEWS | 1 + + sunrpc/Makefile | 3 ++- + sunrpc/clnt_udp.c | 2 +- + sunrpc/tst-udp-error.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 74 insertions(+), 2 deletions(-) + create mode 100644 sunrpc/tst-udp-error.c + +diff --git a/ChangeLog b/ChangeLog +index c88238e..3d781a3 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,11 @@ ++2017-02-27 Florian Weimer ++ ++ [BZ #21115] ++ * sunrpc/clnt_udp.c (clntudp_call): Free ancillary data later. ++ * sunrpc/Makefile (tests): Add tst-udp-error. ++ (tst-udp-error): Link against libc.so explicitly. ++ * sunrpc/tst-udp-error: New file. ++ + 2017-02-08 Siddhesh Poyarekar + + [BZ #21109] +diff --git a/NEWS b/NEWS +index 325cac7..5ecc565 100644 +--- a/NEWS ++++ b/NEWS +@@ -10,6 +10,7 @@ Version 2.25.1 + The following bugs are resolved with this release: + + [21109] Tunables broken on big-endian ++ [21115] sunrpc: Use-after-free in error path in clntudp_call + + Version 2.25 + +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 0c1e612..daf8a28 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -93,7 +93,7 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \ + extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs)) + others += rpcgen + +-tests = tst-xdrmem tst-xdrmem2 test-rpcent ++tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error + xtests := tst-getmyaddr + + ifeq ($(have-thread-library),yes) +@@ -155,6 +155,7 @@ BUILD_CPPFLAGS += $(sunrpc-CPPFLAGS) + $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so + $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so + $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so ++$(objpfx)tst-udp-error: $(common-objpfx)linkobj/libc.so + + $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) + +diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c +index 4d9acb1..1de25cb 100644 +--- a/sunrpc/clnt_udp.c ++++ b/sunrpc/clnt_udp.c +@@ -421,9 +421,9 @@ send_again: + cmsg = CMSG_NXTHDR (&msg, cmsg)) + if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR) + { +- free (cbuf); + e = (struct sock_extended_err *) CMSG_DATA(cmsg); + cu->cu_error.re_errno = e->ee_errno; ++ free (cbuf); + return (cu->cu_error.re_status = RPC_CANTRECV); + } + free (cbuf); +diff --git a/sunrpc/tst-udp-error.c b/sunrpc/tst-udp-error.c +new file mode 100644 +index 0000000..1efc02f +--- /dev/null ++++ b/sunrpc/tst-udp-error.c +@@ -0,0 +1,62 @@ ++/* Check for use-after-free in clntudp_call (bug 21115). ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ support_become_root (); ++ support_enter_network_namespace (); ++ ++ /* Obtain a likely-unused port number. */ ++ struct sockaddr_in sin = ++ { ++ .sin_family = AF_INET, ++ .sin_addr.s_addr = htonl (INADDR_LOOPBACK), ++ }; ++ { ++ int fd = xsocket (AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); ++ xbind (fd, (struct sockaddr *) &sin, sizeof (sin)); ++ socklen_t sinlen = sizeof (sin); ++ xgetsockname (fd, (struct sockaddr *) &sin, &sinlen); ++ /* Close the socket, so that we will receive an error below. */ ++ close (fd); ++ } ++ ++ int sock = RPC_ANYSOCK; ++ CLIENT *clnt = clntudp_create ++ (&sin, 1, 2, (struct timeval) { 1, 0 }, &sock); ++ TEST_VERIFY_EXIT (clnt != NULL); ++ TEST_VERIFY (clnt_call (clnt, 3, ++ (xdrproc_t) xdr_void, NULL, ++ (xdrproc_t) xdr_void, NULL, ++ ((struct timeval) { 3, 0 })) ++ == RPC_CANTRECV); ++ clnt_destroy (clnt); ++ ++ return 0; ++} ++ ++#include +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-03.patch b/srcpkgs/glibc/patches/glibc-upstream-03.patch new file mode 100644 index 0000000000..7c9e367be3 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-03.patch @@ -0,0 +1,1611 @@ +From 93cf93e06ce123439e41d3d62790601c313134cb Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 28 Feb 2017 17:36:00 +0100 +Subject: [PATCH 03] sunrpc: Improvements for UDP client timeout handling + [BZ #20257] + +This commit fixes various aspects in the UDP client timeout handling. +Timeouts are now applied in a more consistent fashion. Discarded UDP +packets no longer prevent the timeout from happening at all. + +(cherry picked from commit cf0bd2f73bd65beab613865bba567d7787836888) +--- + ChangeLog | 23 +++ + NEWS | 1 + + inet/Makefile | 8 +- + inet/deadline.c | 122 +++++++++++++ + inet/net-internal.h | 89 ++++++++++ + inet/tst-deadline.c | 188 ++++++++++++++++++++ + sunrpc/Makefile | 10 +- + sunrpc/clnt_udp.c | 127 ++++++++------ + sunrpc/tst-udp-garbage.c | 104 +++++++++++ + sunrpc/tst-udp-nonblocking.c | 333 +++++++++++++++++++++++++++++++++++ + sunrpc/tst-udp-timeout.c | 402 +++++++++++++++++++++++++++++++++++++++++++ + 11 files changed, 1348 insertions(+), 59 deletions(-) + create mode 100644 inet/deadline.c + create mode 100644 inet/tst-deadline.c + create mode 100644 sunrpc/tst-udp-garbage.c + create mode 100644 sunrpc/tst-udp-nonblocking.c + create mode 100644 sunrpc/tst-udp-timeout.c + +diff --git a/ChangeLog b/ChangeLog +index 3d781a3..510ca42 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,26 @@ ++2017-02-28 Florian Weimer ++ ++ [BZ #20257] ++ * inet/Makefile (routines): Add deadline. ++ (tests-static): Add tst-deadline. ++ * inet/net-internal.h (struct deadline_current_time) ++ (__deadline_current_time, struct deadline, __deadline_is_infinite) ++ (__deadline_elapsed, __deadline_first, __deadline_from_timeval) ++ (__deadline_to_ms, __is_timeval_valid_timeout): Declare. ++ * inet/deadline.c: New file. ++ * inet/tst-deadline.c: Likewise. ++ * sunrpc/Makefile (tests): Add tst-udp-nonblocking, ++ tst-udp-timeout, tst-udp-garbage. ++ (tst-udp-nonblocking, tst-udp-timeout): Link against libc.so ++ explicitly. ++ (tst-udp-garbage): Likewise. Also link against thread library. ++ * sunrpc/clnt_udp.c (struct cu_data): Mention in comment that the ++ struct layout is part of the ABI. ++ (clntudp_call): Rework timeout handling. ++ * sunrpc/tst-udp-garbage.c: New file. ++ * sunrpc/tst-udp-nonblocking.c: Likewise. ++ * sunrpc/tst-udp-timeout.c: Likewise. ++ + 2017-02-27 Florian Weimer + + [BZ #21115] +diff --git a/NEWS b/NEWS +index 5ecc565..e7d6668 100644 +--- a/NEWS ++++ b/NEWS +@@ -11,6 +11,7 @@ The following bugs are resolved with this release: + + [21109] Tunables broken on big-endian + [21115] sunrpc: Use-after-free in error path in clntudp_call ++ [20257] sunrpc: clntudp_call does not enforce timeout when receiving data + + Version 2.25 + +diff --git a/inet/Makefile b/inet/Makefile +index 010792a..6a7d3e0 100644 +--- a/inet/Makefile ++++ b/inet/Makefile +@@ -45,14 +45,18 @@ routines := htonl htons \ + in6_addr getnameinfo if_index ifaddrs inet6_option \ + getipv4sourcefilter setipv4sourcefilter \ + getsourcefilter setsourcefilter inet6_opt inet6_rth \ +- inet6_scopeid_pton ++ inet6_scopeid_pton deadline + + aux := check_pf check_native ifreq + + tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ + tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \ + tst-getni1 tst-getni2 tst-inet6_rth tst-checks tst-checks-posix \ +- tst-sockaddr tst-inet6_scopeid_pton test-hnto-types ++ tst-sockaddr tst-inet6_scopeid_pton test-hnto-types tst-deadline ++ ++# tst-deadline must be linked statically so that we can access ++# internal functions. ++tests-static += tst-deadline + + include ../Rules + +diff --git a/inet/deadline.c b/inet/deadline.c +new file mode 100644 +index 0000000..c1fa415 +--- /dev/null ++++ b/inet/deadline.c +@@ -0,0 +1,122 @@ ++/* Computing deadlines for timeouts. ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++struct deadline_current_time internal_function ++__deadline_current_time (void) ++{ ++ struct deadline_current_time result; ++ if (__clock_gettime (CLOCK_MONOTONIC, &result.current) != 0) ++ { ++ struct timeval current_tv; ++ if (__gettimeofday (¤t_tv, NULL) == 0) ++ __libc_fatal ("Fatal error: gettimeofday system call failed\n"); ++ result.current.tv_sec = current_tv.tv_sec; ++ result.current.tv_nsec = current_tv.tv_usec * 1000; ++ } ++ assert (result.current.tv_sec >= 0); ++ return result; ++} ++ ++/* A special deadline value for which __deadline_is_infinite is ++ true. */ ++static inline struct deadline ++infinite_deadline (void) ++{ ++ return (struct deadline) { { -1, -1 } }; ++} ++ ++struct deadline internal_function ++__deadline_from_timeval (struct deadline_current_time current, ++ struct timeval tv) ++{ ++ assert (__is_timeval_valid_timeout (tv)); ++ ++ /* Compute second-based deadline. Perform the addition in ++ uintmax_t, which is unsigned, to simply overflow detection. */ ++ uintmax_t sec = current.current.tv_sec; ++ sec += tv.tv_sec; ++ if (sec < (uintmax_t) tv.tv_sec) ++ return infinite_deadline (); ++ ++ /* Compute nanosecond deadline. */ ++ int nsec = current.current.tv_nsec + tv.tv_usec * 1000; ++ if (nsec >= 1000 * 1000 * 1000) ++ { ++ /* Carry nanosecond overflow to seconds. */ ++ nsec -= 1000 * 1000 * 1000; ++ if (sec + 1 < sec) ++ return infinite_deadline (); ++ ++sec; ++ } ++ /* This uses a GCC extension, otherwise these casts for detecting ++ overflow would not be defined. */ ++ if ((time_t) sec < 0 || sec != (uintmax_t) (time_t) sec) ++ return infinite_deadline (); ++ ++ return (struct deadline) { { sec, nsec } }; ++} ++ ++int internal_function ++__deadline_to_ms (struct deadline_current_time current, ++ struct deadline deadline) ++{ ++ if (__deadline_is_infinite (deadline)) ++ return INT_MAX; ++ ++ if (current.current.tv_sec > deadline.absolute.tv_sec ++ || (current.current.tv_sec == deadline.absolute.tv_sec ++ && current.current.tv_nsec >= deadline.absolute.tv_nsec)) ++ return 0; ++ time_t sec = deadline.absolute.tv_sec - current.current.tv_sec; ++ if (sec >= INT_MAX) ++ /* This value will overflow below. */ ++ return INT_MAX; ++ int nsec = deadline.absolute.tv_nsec - current.current.tv_nsec; ++ if (nsec < 0) ++ { ++ /* Borrow from the seconds field. */ ++ assert (sec > 0); ++ --sec; ++ nsec += 1000 * 1000 * 1000; ++ } ++ ++ /* Prepare for rounding up to milliseconds. */ ++ nsec += 999999; ++ if (nsec > 1000 * 1000 * 1000) ++ { ++ assert (sec < INT_MAX); ++ ++sec; ++ nsec -= 1000 * 1000 * 1000; ++ } ++ ++ unsigned int msec = nsec / (1000 * 1000); ++ if (sec > INT_MAX / 1000) ++ return INT_MAX; ++ msec += sec * 1000; ++ if (msec > INT_MAX) ++ return INT_MAX; ++ return msec; ++} +diff --git a/inet/net-internal.h b/inet/net-internal.h +index 087597e..2b2632c 100644 +--- a/inet/net-internal.h ++++ b/inet/net-internal.h +@@ -20,11 +20,100 @@ + #define _NET_INTERNAL_H 1 + + #include ++#include + #include ++#include + + int __inet6_scopeid_pton (const struct in6_addr *address, + const char *scope, uint32_t *result) + internal_function attribute_hidden; + libc_hidden_proto (__inet6_scopeid_pton) + ++ ++/* Deadline handling for enforcing timeouts. ++ ++ Code should call __deadline_current_time to obtain the current time ++ and cache it locally. The cache needs updating after every ++ long-running or potentially blocking operation. Deadlines relative ++ to the current time can be computed using __deadline_from_timeval. ++ The deadlines may have to be recomputed in response to certain ++ events (such as an incoming packet), but they are absolute (not ++ relative to the current time). A timeout suitable for use with the ++ poll function can be computed from such a deadline using ++ __deadline_to_ms. ++ ++ The fields in the structs defined belowed should only be used ++ within the implementation. */ ++ ++/* Cache of the current time. Used to compute deadlines from relative ++ timeouts and vice versa. */ ++struct deadline_current_time ++{ ++ struct timespec current; ++}; ++ ++/* Return the current time. Terminates the process if the current ++ time is not available. */ ++struct deadline_current_time __deadline_current_time (void) ++ internal_function attribute_hidden; ++ ++/* Computed absolute deadline. */ ++struct deadline ++{ ++ struct timespec absolute; ++}; ++ ++ ++/* For internal use only. */ ++static inline bool ++__deadline_is_infinite (struct deadline deadline) ++{ ++ return deadline.absolute.tv_nsec < 0; ++} ++ ++/* Return true if the current time is at the deadline or past it. */ ++static inline bool ++__deadline_elapsed (struct deadline_current_time current, ++ struct deadline deadline) ++{ ++ return !__deadline_is_infinite (deadline) ++ && (current.current.tv_sec > deadline.absolute.tv_sec ++ || (current.current.tv_sec == deadline.absolute.tv_sec ++ && current.current.tv_nsec >= deadline.absolute.tv_nsec)); ++} ++ ++/* Return the deadline which occurs first. */ ++static inline struct deadline ++__deadline_first (struct deadline left, struct deadline right) ++{ ++ if (__deadline_is_infinite (right) ++ || left.absolute.tv_sec < right.absolute.tv_sec ++ || (left.absolute.tv_sec == right.absolute.tv_sec ++ && left.absolute.tv_nsec < right.absolute.tv_nsec)) ++ return left; ++ else ++ return right; ++} ++ ++/* Add TV to the current time and return it. Returns a special ++ infinite absolute deadline on overflow. */ ++struct deadline __deadline_from_timeval (struct deadline_current_time, ++ struct timeval tv) ++ internal_function attribute_hidden; ++ ++/* Compute the number of milliseconds until the specified deadline, ++ from the current time in the argument. The result is mainly for ++ use with poll. If the deadline has already passed, return 0. If ++ the result would overflow an int, return INT_MAX. */ ++int __deadline_to_ms (struct deadline_current_time, struct deadline) ++ internal_function attribute_hidden; ++ ++/* Return true if TV.tv_sec is non-negative and TV.tv_usec is in the ++ interval [0, 999999]. */ ++static inline bool ++__is_timeval_valid_timeout (struct timeval tv) ++{ ++ return tv.tv_sec >= 0 && tv.tv_usec >= 0 && tv.tv_usec < 1000 * 1000; ++} ++ + #endif /* _NET_INTERNAL_H */ +diff --git a/inet/tst-deadline.c b/inet/tst-deadline.c +new file mode 100644 +index 0000000..ed04345 +--- /dev/null ++++ b/inet/tst-deadline.c +@@ -0,0 +1,188 @@ ++/* Tests for computing deadlines for timeouts. ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++/* Find the maximum value which can be represented in a time_t. */ ++static time_t ++time_t_max (void) ++{ ++ _Static_assert (0 > (time_t) -1, "time_t is signed"); ++ uintmax_t current = 1; ++ while (true) ++ { ++ uintmax_t next = current * 2; ++ /* This cannot happen because time_t is signed. */ ++ TEST_VERIFY_EXIT (next > current); ++ ++next; ++ if ((time_t) next < 0 || next != (uintmax_t) (time_t) next) ++ /* Value cannot be represented in time_t. Return the previous ++ value. */ ++ return current; ++ current = next; ++ } ++} ++ ++static int ++do_test (void) ++{ ++ { ++ struct deadline_current_time current_time = __deadline_current_time (); ++ TEST_VERIFY (current_time.current.tv_sec >= 0); ++ current_time = __deadline_current_time (); ++ /* Due to CLOCK_MONOTONIC, either seconds or nanoseconds are ++ greater than zero. This is also true for the gettimeofday ++ fallback. */ ++ TEST_VERIFY (current_time.current.tv_sec >= 0); ++ TEST_VERIFY (current_time.current.tv_sec > 0 ++ || current_time.current.tv_nsec > 0); ++ } ++ ++ /* Check basic computations of deadlines. */ ++ struct deadline_current_time current_time = { { 1, 123456789 } }; ++ struct deadline deadline = __deadline_from_timeval ++ (current_time, (struct timeval) { 0, 1 }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 123457789); ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1); ++ ++ deadline = __deadline_from_timeval ++ (current_time, ((struct timeval) { 0, 2 })); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 123458789); ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1); ++ ++ deadline = __deadline_from_timeval ++ (current_time, ((struct timeval) { 1, 0 })); ++ TEST_VERIFY (deadline.absolute.tv_sec == 2); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 123456789); ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1000); ++ ++ /* Check if timeouts are correctly rounded up to the next ++ millisecond. */ ++ for (int i = 0; i < 999999; ++i) ++ { ++ ++current_time.current.tv_nsec; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1000); ++ } ++ ++ /* A full millisecond has elapsed, so the time to the deadline is ++ now less than 1000. */ ++ ++current_time.current.tv_nsec; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 999); ++ ++ /* Check __deadline_to_ms carry-over. */ ++ current_time = (struct deadline_current_time) { { 9, 123456789 } }; ++ deadline = (struct deadline) { { 10, 122456789 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 999); ++ deadline = (struct deadline) { { 10, 122456790 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1000); ++ deadline = (struct deadline) { { 10, 123456788 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1000); ++ deadline = (struct deadline) { { 10, 123456789 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 1000); ++ ++ /* Check __deadline_to_ms overflow. */ ++ deadline = (struct deadline) { { INT_MAX - 1, 1 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == INT_MAX); ++ ++ /* Check __deadline_to_ms for elapsed deadlines. */ ++ current_time = (struct deadline_current_time) { { 9, 123456789 } }; ++ deadline.absolute = current_time.current; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 0); ++ current_time = (struct deadline_current_time) { { 9, 123456790 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 0); ++ current_time = (struct deadline_current_time) { { 10, 0 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 0); ++ current_time = (struct deadline_current_time) { { 10, 123456788 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 0); ++ current_time = (struct deadline_current_time) { { 10, 123456789 } }; ++ TEST_VERIFY (__deadline_to_ms (current_time, deadline) == 0); ++ ++ /* Check carry-over in __deadline_from_timeval. */ ++ current_time = (struct deadline_current_time) { { 9, 998000001 } }; ++ for (int i = 0; i < 2000; ++i) ++ { ++ deadline = __deadline_from_timeval ++ (current_time, (struct timeval) { 1, i }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 10); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 998000001 + i * 1000); ++ } ++ for (int i = 2000; i < 3000; ++i) ++ { ++ deadline = __deadline_from_timeval ++ (current_time, (struct timeval) { 2, i }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 12); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 1 + (i - 2000) * 1000); ++ } ++ ++ /* Check infinite deadlines. */ ++ deadline = __deadline_from_timeval ++ ((struct deadline_current_time) { { 0, 1000 * 1000 * 1000 - 1000 } }, ++ (struct timeval) { time_t_max (), 1 }); ++ TEST_VERIFY (__deadline_is_infinite (deadline)); ++ deadline = __deadline_from_timeval ++ ((struct deadline_current_time) { { 0, 1000 * 1000 * 1000 - 1001 } }, ++ (struct timeval) { time_t_max (), 1 }); ++ TEST_VERIFY (!__deadline_is_infinite (deadline)); ++ deadline = __deadline_from_timeval ++ ((struct deadline_current_time) ++ { { time_t_max (), 1000 * 1000 * 1000 - 1000 } }, ++ (struct timeval) { 0, 1 }); ++ TEST_VERIFY (__deadline_is_infinite (deadline)); ++ deadline = __deadline_from_timeval ++ ((struct deadline_current_time) ++ { { time_t_max () / 2 + 1, 0 } }, ++ (struct timeval) { time_t_max () / 2 + 1, 0 }); ++ TEST_VERIFY (__deadline_is_infinite (deadline)); ++ ++ /* Check __deadline_first behavior. */ ++ deadline = __deadline_first ++ ((struct deadline) { { 1, 2 } }, ++ (struct deadline) { { 1, 3 } }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 2); ++ deadline = __deadline_first ++ ((struct deadline) { { 1, 3 } }, ++ (struct deadline) { { 1, 2 } }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 2); ++ deadline = __deadline_first ++ ((struct deadline) { { 1, 2 } }, ++ (struct deadline) { { 2, 1 } }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 2); ++ deadline = __deadline_first ++ ((struct deadline) { { 1, 2 } }, ++ (struct deadline) { { 2, 4 } }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 2); ++ deadline = __deadline_first ++ ((struct deadline) { { 2, 4 } }, ++ (struct deadline) { { 1, 2 } }); ++ TEST_VERIFY (deadline.absolute.tv_sec == 1); ++ TEST_VERIFY (deadline.absolute.tv_nsec == 2); ++ ++ return 0; ++} ++ ++#include +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index daf8a28..7e5d295 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -93,11 +93,12 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \ + extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs)) + others += rpcgen + +-tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error ++tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \ ++ tst-udp-nonblocking + xtests := tst-getmyaddr + + ifeq ($(have-thread-library),yes) +-xtests += thrsvc ++xtests += thrsvc tst-udp-garbage + endif + + ifeq ($(run-built-tests),yes) +@@ -235,3 +236,8 @@ $(rpcgen-tests): $(objpfx)%.out: %.x $(objpfx)rpcgen + $(built-program-cmd) -c $< -o $@; \ + $(evaluate-test) + endif ++ ++$(objpfx)tst-udp-timeout: $(common-objpfx)linkobj/libc.so ++$(objpfx)tst-udp-nonblocking: $(common-objpfx)linkobj/libc.so ++$(objpfx)tst-udp-garbage: \ ++ $(common-objpfx)linkobj/libc.so $(shared-thread-library) +diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c +index 1de25cb..6ce16eb 100644 +--- a/sunrpc/clnt_udp.c ++++ b/sunrpc/clnt_udp.c +@@ -55,6 +55,7 @@ + #endif + + #include ++#include + + extern u_long _create_xid (void); + +@@ -80,7 +81,9 @@ static const struct clnt_ops udp_ops = + }; + + /* +- * Private data kept per client handle ++ * Private data kept per client handle. This private struct is ++ * unfortunately part of the ABI; ypbind contains a copy of it and ++ * accesses it through CLIENT::cl_private field. + */ + struct cu_data + { +@@ -278,28 +281,38 @@ clntudp_call (/* client handle */ + int inlen; + socklen_t fromlen; + struct pollfd fd; +- int milliseconds = (cu->cu_wait.tv_sec * 1000) + +- (cu->cu_wait.tv_usec / 1000); + struct sockaddr_in from; + struct rpc_msg reply_msg; + XDR reply_xdrs; +- struct timeval time_waited; + bool_t ok; + int nrefreshes = 2; /* number of times to refresh cred */ +- struct timeval timeout; + int anyup; /* any network interface up */ + +- if (cu->cu_total.tv_usec == -1) +- { +- timeout = utimeout; /* use supplied timeout */ +- } +- else ++ struct deadline_current_time current_time = __deadline_current_time (); ++ struct deadline total_deadline; /* Determined once by overall timeout. */ ++ struct deadline response_deadline; /* Determined anew for each query. */ ++ ++ /* Choose the timeout value. For non-sending usage (xargs == NULL), ++ the total deadline does not matter, only cu->cu_wait is used ++ below. */ ++ if (xargs != NULL) + { +- timeout = cu->cu_total; /* use default timeout */ ++ struct timeval tv; ++ if (cu->cu_total.tv_usec == -1) ++ /* Use supplied timeout. */ ++ tv = utimeout; ++ else ++ /* Use default timeout. */ ++ tv = cu->cu_total; ++ if (!__is_timeval_valid_timeout (tv)) ++ return (cu->cu_error.re_status = RPC_TIMEDOUT); ++ total_deadline = __deadline_from_timeval (current_time, tv); + } + +- time_waited.tv_sec = 0; +- time_waited.tv_usec = 0; ++ /* Guard against bad timeout specification. */ ++ if (!__is_timeval_valid_timeout (cu->cu_wait)) ++ return (cu->cu_error.re_status = RPC_TIMEDOUT); ++ + call_again: + xdrs = &(cu->cu_outxdrs); + if (xargs == NULL) +@@ -325,27 +338,46 @@ send_again: + return (cu->cu_error.re_status = RPC_CANTSEND); + } + +- /* +- * Hack to provide rpc-based message passing +- */ +- if (timeout.tv_sec == 0 && timeout.tv_usec == 0) +- { +- return (cu->cu_error.re_status = RPC_TIMEDOUT); +- } ++ /* sendto may have blocked, so recompute the current time. */ ++ current_time = __deadline_current_time (); + get_reply: +- /* +- * sub-optimal code appears here because we have +- * some clock time to spare while the packets are in flight. +- * (We assume that this is actually only executed once.) +- */ ++ response_deadline = __deadline_from_timeval (current_time, cu->cu_wait); ++ + reply_msg.acpted_rply.ar_verf = _null_auth; + reply_msg.acpted_rply.ar_results.where = resultsp; + reply_msg.acpted_rply.ar_results.proc = xresults; + fd.fd = cu->cu_sock; + fd.events = POLLIN; + anyup = 0; ++ ++ /* Per-response retry loop. current_time must be up-to-date at the ++ top of the loop. */ + for (;;) + { ++ int milliseconds; ++ if (xargs != NULL) ++ { ++ if (__deadline_elapsed (current_time, total_deadline)) ++ /* Overall timeout expired. */ ++ return (cu->cu_error.re_status = RPC_TIMEDOUT); ++ milliseconds = __deadline_to_ms ++ (current_time, __deadline_first (total_deadline, ++ response_deadline)); ++ if (milliseconds == 0) ++ /* Per-query timeout expired. */ ++ goto send_again; ++ } ++ else ++ { ++ /* xatgs == NULL. Collect a response without sending a ++ query. In this mode, we need to ignore the total ++ deadline. */ ++ milliseconds = __deadline_to_ms (current_time, response_deadline); ++ if (milliseconds == 0) ++ /* Cannot send again, so bail out. */ ++ return (cu->cu_error.re_status = RPC_CANTSEND); ++ } ++ + switch (__poll (&fd, 1, milliseconds)) + { + +@@ -356,27 +388,10 @@ send_again: + if (!anyup) + return (cu->cu_error.re_status = RPC_CANTRECV); + } +- +- time_waited.tv_sec += cu->cu_wait.tv_sec; +- time_waited.tv_usec += cu->cu_wait.tv_usec; +- while (time_waited.tv_usec >= 1000000) +- { +- time_waited.tv_sec++; +- time_waited.tv_usec -= 1000000; +- } +- if ((time_waited.tv_sec < timeout.tv_sec) || +- ((time_waited.tv_sec == timeout.tv_sec) && +- (time_waited.tv_usec < timeout.tv_usec))) +- goto send_again; +- return (cu->cu_error.re_status = RPC_TIMEDOUT); +- +- /* +- * buggy in other cases because time_waited is not being +- * updated. +- */ ++ goto next_response; + case -1: + if (errno == EINTR) +- continue; ++ goto next_response; + cu->cu_error.re_errno = errno; + return (cu->cu_error.re_status = RPC_CANTRECV); + } +@@ -440,20 +455,22 @@ send_again: + if (inlen < 0) + { + if (errno == EWOULDBLOCK) +- continue; ++ goto next_response; + cu->cu_error.re_errno = errno; + return (cu->cu_error.re_status = RPC_CANTRECV); + } +- if (inlen < 4) +- continue; +- +- /* see if reply transaction id matches sent id. +- Don't do this if we only wait for a replay */ +- if (xargs != NULL +- && memcmp (cu->cu_inbuf, cu->cu_outbuf, sizeof (u_int32_t)) != 0) +- continue; +- /* we now assume we have the proper reply */ +- break; ++ /* Accept the response if the packet is sufficiently long and ++ the transaction ID matches the query (if available). */ ++ if (inlen >= 4 ++ && (xargs == NULL ++ || memcmp (cu->cu_inbuf, cu->cu_outbuf, ++ sizeof (u_int32_t)) == 0)) ++ break; ++ ++ next_response: ++ /* Update the current time because poll and recvmsg waited for ++ an unknown time. */ ++ current_time = __deadline_current_time (); + } + + /* +diff --git a/sunrpc/tst-udp-garbage.c b/sunrpc/tst-udp-garbage.c +new file mode 100644 +index 0000000..4abda93 +--- /dev/null ++++ b/sunrpc/tst-udp-garbage.c +@@ -0,0 +1,104 @@ ++/* Test that garbage packets do not affect timeout handling. ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Descriptor for the server UDP socket. */ ++static int server_fd; ++ ++static void * ++garbage_sender_thread (void *unused) ++{ ++ while (true) ++ { ++ struct sockaddr_storage sa; ++ socklen_t salen = sizeof (sa); ++ char buf[1]; ++ if (recvfrom (server_fd, buf, sizeof (buf), 0, ++ (struct sockaddr *) &sa, &salen) < 0) ++ FAIL_EXIT1 ("recvfrom: %m"); ++ ++ /* Send garbage packets indefinitely. */ ++ buf[0] = 0; ++ while (true) ++ { ++ /* sendto can fail if the client closed the socket. */ ++ if (sendto (server_fd, buf, sizeof (buf), 0, ++ (struct sockaddr *) &sa, salen) < 0) ++ break; ++ ++ /* Wait a bit, to avoid burning too many CPU cycles in a ++ tight loop. The wait period must be much shorter than ++ the client timeouts configured below. */ ++ usleep (50 * 1000); ++ } ++ } ++} ++ ++static int ++do_test (void) ++{ ++ support_become_root (); ++ support_enter_network_namespace (); ++ ++ server_fd = xsocket (AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP); ++ struct sockaddr_in server_address = ++ { ++ .sin_family = AF_INET, ++ .sin_addr.s_addr = htonl (INADDR_LOOPBACK), ++ }; ++ xbind (server_fd, ++ (struct sockaddr *) &server_address, sizeof (server_address)); ++ { ++ socklen_t sinlen = sizeof (server_address); ++ xgetsockname (server_fd, (struct sockaddr *) &server_address, &sinlen); ++ TEST_VERIFY (sizeof (server_address) == sinlen); ++ } ++ ++ /* Garbage packet source. */ ++ xpthread_detach (xpthread_create (NULL, garbage_sender_thread, NULL)); ++ ++ /* Test client. Use an arbitrary timeout of one second, which is ++ much longer than the garbage packet interval, but still ++ reasonably short, so that the test completes quickly. */ ++ int client_fd = RPC_ANYSOCK; ++ CLIENT *clnt = clntudp_create (&server_address, ++ 1, 2, /* Arbitrary RPC endpoint numbers. */ ++ (struct timeval) { 1, 0 }, ++ &client_fd); ++ if (clnt == NULL) ++ FAIL_EXIT1 ("clntudp_create: %m"); ++ ++ TEST_VERIFY (clnt_call (clnt, 3, /* Arbitrary RPC procedure number. */ ++ (xdrproc_t) xdr_void, NULL, ++ (xdrproc_t) xdr_void, NULL, ++ ((struct timeval) { 1, 0 }))); ++ ++ return 0; ++} ++ ++#include +diff --git a/sunrpc/tst-udp-nonblocking.c b/sunrpc/tst-udp-nonblocking.c +new file mode 100644 +index 0000000..1d6a7f4 +--- /dev/null ++++ b/sunrpc/tst-udp-nonblocking.c +@@ -0,0 +1,333 @@ ++/* Test non-blocking use of the UDP client. ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Test data serialization and deserialization. */ ++ ++struct test_query ++{ ++ uint32_t a; ++ uint32_t b; ++ uint32_t timeout_ms; ++}; ++ ++static bool_t ++xdr_test_query (XDR *xdrs, void *data, ...) ++{ ++ struct test_query *p = data; ++ return xdr_uint32_t (xdrs, &p->a) ++ && xdr_uint32_t (xdrs, &p->b) ++ && xdr_uint32_t (xdrs, &p->timeout_ms); ++} ++ ++struct test_response ++{ ++ uint32_t server_id; ++ uint32_t seq; ++ uint32_t sum; ++}; ++ ++static bool_t ++xdr_test_response (XDR *xdrs, void *data, ...) ++{ ++ struct test_response *p = data; ++ return xdr_uint32_t (xdrs, &p->server_id) ++ && xdr_uint32_t (xdrs, &p->seq) ++ && xdr_uint32_t (xdrs, &p->sum); ++} ++ ++/* Implementation of the test server. */ ++ ++enum ++ { ++ /* Number of test servers to run. */ ++ SERVER_COUNT = 3, ++ ++ /* RPC parameters, chosen at random. */ ++ PROGNUM = 8242, ++ VERSNUM = 19654, ++ ++ /* Main RPC operation. */ ++ PROC_ADD = 1, ++ ++ /* Request process termination. */ ++ PROC_EXIT, ++ ++ /* Special exit status to mark successful processing. */ ++ EXIT_MARKER = 55, ++ }; ++ ++/* Set by the parent process to tell test servers apart. */ ++static int server_id; ++ ++/* Implementation of the test server. */ ++static void ++server_dispatch (struct svc_req *request, SVCXPRT *transport) ++{ ++ /* Query sequence number. */ ++ static uint32_t seq = 0; ++ ++seq; ++ static bool proc_add_seen; ++ ++ if (test_verbose) ++ printf ("info: server_dispatch server_id=%d seq=%u rq_proc=%lu\n", ++ server_id, seq, request->rq_proc); ++ ++ switch (request->rq_proc) ++ { ++ case PROC_ADD: ++ { ++ struct test_query query; ++ memset (&query, 0xc0, sizeof (query)); ++ TEST_VERIFY_EXIT ++ (svc_getargs (transport, xdr_test_query, ++ (void *) &query)); ++ ++ if (test_verbose) ++ printf (" a=%u b=%u timeout_ms=%u\n", ++ query.a, query.b, query.timeout_ms); ++ ++ usleep (query.timeout_ms * 1000); ++ ++ struct test_response response = ++ { ++ .server_id = server_id, ++ .seq = seq, ++ .sum = query.a + query.b, ++ }; ++ TEST_VERIFY (svc_sendreply (transport, xdr_test_response, ++ (void *) &response)); ++ if (test_verbose) ++ printf (" server id %d response seq=%u sent\n", server_id, seq); ++ proc_add_seen = true; ++ } ++ break; ++ ++ case PROC_EXIT: ++ TEST_VERIFY (proc_add_seen); ++ TEST_VERIFY (svc_sendreply (transport, (xdrproc_t) xdr_void, NULL)); ++ _exit (EXIT_MARKER); ++ break; ++ ++ default: ++ FAIL_EXIT1 ("invalid rq_proc value: %lu", request->rq_proc); ++ break; ++ } ++} ++ ++/* Return the number seconds since an arbitrary point in time. */ ++static double ++get_ticks (void) ++{ ++ { ++ struct timespec ts; ++ if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0) ++ return ts.tv_sec + ts.tv_nsec * 1e-9; ++ } ++ { ++ struct timeval tv; ++ TEST_VERIFY_EXIT (gettimeofday (&tv, NULL) == 0); ++ return tv.tv_sec + tv.tv_usec * 1e-6; ++ } ++} ++ ++static int ++do_test (void) ++{ ++ support_become_root (); ++ support_enter_network_namespace (); ++ ++ /* Information about the test servers. */ ++ struct ++ { ++ SVCXPRT *transport; ++ struct sockaddr_in address; ++ pid_t pid; ++ uint32_t xid; ++ } servers[SERVER_COUNT]; ++ ++ /* Spawn the test servers. */ ++ for (int i = 0; i < SERVER_COUNT; ++i) ++ { ++ servers[i].transport = svcudp_create (RPC_ANYSOCK); ++ TEST_VERIFY_EXIT (servers[i].transport != NULL); ++ servers[i].address = (struct sockaddr_in) ++ { ++ .sin_family = AF_INET, ++ .sin_addr.s_addr = htonl (INADDR_LOOPBACK), ++ .sin_port = htons (servers[i].transport->xp_port), ++ }; ++ servers[i].xid = 0xabcd0101 + i; ++ if (test_verbose) ++ printf ("info: setting up server %d xid=%x on port %d\n", ++ i, servers[i].xid, servers[i].transport->xp_port); ++ ++ server_id = i; ++ servers[i].pid = xfork (); ++ if (servers[i].pid == 0) ++ { ++ TEST_VERIFY (svc_register (servers[i].transport, ++ PROGNUM, VERSNUM, server_dispatch, 0)); ++ svc_run (); ++ FAIL_EXIT1 ("supposed to be unreachable"); ++ } ++ /* We need to close the socket so that we do not accidentally ++ consume the request. */ ++ TEST_VERIFY (close (servers[i].transport->xp_sock) == 0); ++ } ++ ++ ++ /* The following code mirrors what ypbind does. */ ++ ++ /* Copied from clnt_udp.c (like ypbind). */ ++ struct cu_data ++ { ++ int cu_sock; ++ bool_t cu_closeit; ++ struct sockaddr_in cu_raddr; ++ int cu_rlen; ++ struct timeval cu_wait; ++ struct timeval cu_total; ++ struct rpc_err cu_error; ++ XDR cu_outxdrs; ++ u_int cu_xdrpos; ++ u_int cu_sendsz; ++ char *cu_outbuf; ++ u_int cu_recvsz; ++ char cu_inbuf[1]; ++ }; ++ ++ int client_socket = xsocket (AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); ++ CLIENT *clnt = clntudp_create (&servers[0].address, PROGNUM, VERSNUM, ++ /* 5 seconds per-response timeout. */ ++ ((struct timeval) { 5, 0 }), ++ &client_socket); ++ TEST_VERIFY (clnt != NULL); ++ clnt->cl_auth = authunix_create_default (); ++ { ++ struct timeval zero = { 0, 0 }; ++ TEST_VERIFY (clnt_control (clnt, CLSET_TIMEOUT, (void *) &zero)); ++ } ++ ++ /* Poke at internal data structures (like ypbind). */ ++ struct cu_data *cu = (struct cu_data *) clnt->cl_private; ++ ++ /* Send a ping to each server. */ ++ double before_pings = get_ticks (); ++ for (int i = 0; i < SERVER_COUNT; ++i) ++ { ++ if (test_verbose) ++ printf ("info: sending server %d ping\n", i); ++ /* Reset the xid because it is changed by each invocation of ++ clnt_call. Subtract one to compensate for the xid update ++ during the call. */ ++ *((u_int32_t *) (cu->cu_outbuf)) = servers[i].xid - 1; ++ cu->cu_raddr = servers[i].address; ++ ++ struct test_query query = { .a = 100, .b = i + 1 }; ++ if (i == 1) ++ /* Shorter timeout to prefer this server. These timeouts must ++ be much shorter than the 5-second per-response timeout ++ configured with clntudp_create. */ ++ query.timeout_ms = 700; ++ else ++ query.timeout_ms = 1400; ++ struct test_response response = { 0 }; ++ /* NB: Do not check the return value. The server reply will ++ prove that the call worked. */ ++ double before_one_ping = get_ticks (); ++ clnt_call (clnt, PROC_ADD, ++ xdr_test_query, (void *) &query, ++ xdr_test_response, (void *) &response, ++ ((struct timeval) { 0, 0 })); ++ double after_one_ping = get_ticks (); ++ if (test_verbose) ++ printf ("info: non-blocking send took %f seconds\n", ++ after_one_ping - before_one_ping); ++ /* clnt_call should return immediately. Accept some delay in ++ case the process is descheduled. */ ++ TEST_VERIFY (after_one_ping - before_one_ping < 0.3); ++ } ++ ++ /* Collect the non-blocking response. */ ++ if (test_verbose) ++ printf ("info: collecting response\n"); ++ struct test_response response = { 0 }; ++ TEST_VERIFY ++ (clnt_call (clnt, PROC_ADD, NULL, NULL, ++ xdr_test_response, (void *) &response, ++ ((struct timeval) { 0, 0 })) == RPC_SUCCESS); ++ double after_pings = get_ticks (); ++ if (test_verbose) ++ printf ("info: send/receive took %f seconds\n", ++ after_pings - before_pings); ++ /* Expected timeout is 0.7 seconds. */ ++ TEST_VERIFY (0.7 <= after_pings - before_pings); ++ TEST_VERIFY (after_pings - before_pings < 1.2); ++ ++ uint32_t xid; ++ memcpy (&xid, &cu->cu_inbuf, sizeof (xid)); ++ if (test_verbose) ++ printf ("info: non-blocking response: xid=%x server_id=%u seq=%u sum=%u\n", ++ xid, response.server_id, response.seq, response.sum); ++ /* Check that the reply from the preferred server was used. */ ++ TEST_VERIFY (servers[1].xid == xid); ++ TEST_VERIFY (response.server_id == 1); ++ TEST_VERIFY (response.seq == 1); ++ TEST_VERIFY (response.sum == 102); ++ ++ auth_destroy (clnt->cl_auth); ++ clnt_destroy (clnt); ++ ++ for (int i = 0; i < SERVER_COUNT; ++i) ++ { ++ if (test_verbose) ++ printf ("info: requesting server %d termination\n", i); ++ client_socket = RPC_ANYSOCK; ++ clnt = clntudp_create (&servers[i].address, PROGNUM, VERSNUM, ++ ((struct timeval) { 5, 0 }), ++ &client_socket); ++ TEST_VERIFY_EXIT (clnt != NULL); ++ TEST_VERIFY (clnt_call (clnt, PROC_EXIT, ++ (xdrproc_t) xdr_void, NULL, ++ (xdrproc_t) xdr_void, NULL, ++ ((struct timeval) { 3, 0 })) == RPC_SUCCESS); ++ clnt_destroy (clnt); ++ ++ int status; ++ xwaitpid (servers[i].pid, &status, 0); ++ TEST_VERIFY (WIFEXITED (status) && WEXITSTATUS (status) == EXIT_MARKER); ++ } ++ ++ return 0; ++} ++ ++#include +diff --git a/sunrpc/tst-udp-timeout.c b/sunrpc/tst-udp-timeout.c +new file mode 100644 +index 0000000..db9943a +--- /dev/null ++++ b/sunrpc/tst-udp-timeout.c +@@ -0,0 +1,402 @@ ++/* Test timeout handling in the UDP client. ++ Copyright (C) 2017 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Test data serialization and deserialization. */ ++ ++struct test_query ++{ ++ uint32_t a; ++ uint32_t b; ++ uint32_t timeout_ms; ++ uint32_t wait_for_seq; ++ uint32_t garbage_packets; ++}; ++ ++static bool_t ++xdr_test_query (XDR *xdrs, void *data, ...) ++{ ++ struct test_query *p = data; ++ return xdr_uint32_t (xdrs, &p->a) ++ && xdr_uint32_t (xdrs, &p->b) ++ && xdr_uint32_t (xdrs, &p->timeout_ms) ++ && xdr_uint32_t (xdrs, &p->wait_for_seq) ++ && xdr_uint32_t (xdrs, &p->garbage_packets); ++} ++ ++struct test_response ++{ ++ uint32_t seq; ++ uint32_t sum; ++}; ++ ++static bool_t ++xdr_test_response (XDR *xdrs, void *data, ...) ++{ ++ struct test_response *p = data; ++ return xdr_uint32_t (xdrs, &p->seq) ++ && xdr_uint32_t (xdrs, &p->sum); ++} ++ ++/* Implementation of the test server. */ ++ ++enum ++ { ++ /* RPC parameters, chosen at random. */ ++ PROGNUM = 15717, ++ VERSNUM = 13689, ++ ++ /* Main RPC operation. */ ++ PROC_ADD = 1, ++ ++ /* Reset the sequence number. */ ++ PROC_RESET_SEQ, ++ ++ /* Request process termination. */ ++ PROC_EXIT, ++ ++ /* Special exit status to mark successful processing. */ ++ EXIT_MARKER = 55, ++ }; ++ ++static void ++server_dispatch (struct svc_req *request, SVCXPRT *transport) ++{ ++ /* Query sequence number. */ ++ static uint32_t seq = 0; ++ ++seq; ++ ++ if (test_verbose) ++ printf ("info: server_dispatch seq=%u rq_proc=%lu\n", ++ seq, request->rq_proc); ++ ++ switch (request->rq_proc) ++ { ++ case PROC_ADD: ++ { ++ struct test_query query; ++ memset (&query, 0xc0, sizeof (query)); ++ TEST_VERIFY_EXIT ++ (svc_getargs (transport, xdr_test_query, ++ (void *) &query)); ++ ++ if (test_verbose) ++ printf (" a=%u b=%u timeout_ms=%u wait_for_seq=%u" ++ " garbage_packets=%u\n", ++ query.a, query.b, query.timeout_ms, query.wait_for_seq, ++ query.garbage_packets); ++ ++ if (seq < query.wait_for_seq) ++ { ++ /* No response at this point. */ ++ if (test_verbose) ++ printf (" skipped response\n"); ++ break; ++ } ++ ++ if (query.garbage_packets > 0) ++ { ++ int per_packet_timeout; ++ if (query.timeout_ms > 0) ++ per_packet_timeout ++ = query.timeout_ms * 1000 / query.garbage_packets; ++ else ++ per_packet_timeout = 0; ++ ++ char buf[20]; ++ memset (&buf, 0xc0, sizeof (buf)); ++ for (int i = 0; i < query.garbage_packets; ++i) ++ { ++ /* 13 is relatively prime to 20 = sizeof (buf) + 1, so ++ the len variable will cover the entire interval ++ [0, 20] if query.garbage_packets is sufficiently ++ large. */ ++ size_t len = (i * 13 + 1) % (sizeof (buf) + 1); ++ TEST_VERIFY (sendto (transport->xp_sock, ++ buf, len, MSG_NOSIGNAL, ++ (struct sockaddr *) &transport->xp_raddr, ++ transport->xp_addrlen) == len); ++ if (per_packet_timeout > 0) ++ usleep (per_packet_timeout); ++ } ++ } ++ else if (query.timeout_ms > 0) ++ usleep (query.timeout_ms * 1000); ++ ++ struct test_response response = ++ { ++ .seq = seq, ++ .sum = query.a + query.b, ++ }; ++ TEST_VERIFY (svc_sendreply (transport, xdr_test_response, ++ (void *) &response)); ++ } ++ break; ++ ++ case PROC_RESET_SEQ: ++ seq = 0; ++ TEST_VERIFY (svc_sendreply (transport, (xdrproc_t) xdr_void, NULL)); ++ break; ++ ++ case PROC_EXIT: ++ TEST_VERIFY (svc_sendreply (transport, (xdrproc_t) xdr_void, NULL)); ++ _exit (EXIT_MARKER); ++ break; ++ ++ default: ++ FAIL_EXIT1 ("invalid rq_proc value: %lu", request->rq_proc); ++ break; ++ } ++} ++ ++/* Implementation of the test client. */ ++ ++static struct test_response ++test_call (CLIENT *clnt, int proc, struct test_query query, ++ struct timeval timeout) ++{ ++ if (test_verbose) ++ printf ("info: test_call proc=%d timeout=%lu.%06lu\n", ++ proc, (unsigned long) timeout.tv_sec, ++ (unsigned long) timeout.tv_usec); ++ struct test_response response; ++ TEST_VERIFY_EXIT (clnt_call (clnt, proc, ++ xdr_test_query, (void *) &query, ++ xdr_test_response, (void *) &response, ++ timeout) ++ == RPC_SUCCESS); ++ return response; ++} ++ ++static void ++test_call_timeout (CLIENT *clnt, int proc, struct test_query query, ++ struct timeval timeout) ++{ ++ struct test_response response; ++ TEST_VERIFY (clnt_call (clnt, proc, ++ xdr_test_query, (void *) &query, ++ xdr_test_response, (void *) &response, ++ timeout) ++ == RPC_TIMEDOUT); ++} ++ ++/* Complete one regular RPC call to drain the server socket ++ buffer. Resets the sequence number. */ ++static void ++test_call_flush (CLIENT *clnt) ++{ ++ /* This needs a longer timeout to flush out all pending requests. ++ The choice of 5 seconds is larger than the per-response timeouts ++ requested via the timeout_ms field. */ ++ if (test_verbose) ++ printf ("info: flushing pending queries\n"); ++ TEST_VERIFY_EXIT (clnt_call (clnt, PROC_RESET_SEQ, ++ (xdrproc_t) xdr_void, NULL, ++ (xdrproc_t) xdr_void, NULL, ++ ((struct timeval) { 5, 0 })) ++ == RPC_SUCCESS); ++} ++ ++/* Return the number seconds since an arbitrary point in time. */ ++static double ++get_ticks (void) ++{ ++ { ++ struct timespec ts; ++ if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0) ++ return ts.tv_sec + ts.tv_nsec * 1e-9; ++ } ++ { ++ struct timeval tv; ++ TEST_VERIFY_EXIT (gettimeofday (&tv, NULL) == 0); ++ return tv.tv_sec + tv.tv_usec * 1e-6; ++ } ++} ++ ++static void ++test_udp_server (int port) ++{ ++ struct sockaddr_in sin = ++ { ++ .sin_family = AF_INET, ++ .sin_addr.s_addr = htonl (INADDR_LOOPBACK), ++ .sin_port = htons (port) ++ }; ++ int sock = RPC_ANYSOCK; ++ ++ /* The client uses a 1.5 second timeout for retries. The timeouts ++ are arbitrary, but chosen so that there is a substantial gap ++ between them, but the total time spent waiting is not too ++ large. */ ++ CLIENT *clnt = clntudp_create (&sin, PROGNUM, VERSNUM, ++ (struct timeval) { 1, 500 * 1000 }, ++ &sock); ++ TEST_VERIFY_EXIT (clnt != NULL); ++ ++ /* Basic call/response test. */ ++ struct test_response response = test_call ++ (clnt, PROC_ADD, ++ (struct test_query) { .a = 17, .b = 4 }, ++ (struct timeval) { 3, 0 }); ++ TEST_VERIFY (response.sum == 21); ++ TEST_VERIFY (response.seq == 1); ++ ++ /* Check that garbage packets do not interfere with timeout ++ processing. */ ++ double before = get_ticks (); ++ response = test_call ++ (clnt, PROC_ADD, ++ (struct test_query) { ++ .a = 19, .b = 4, .timeout_ms = 500, .garbage_packets = 21, ++ }, ++ (struct timeval) { 3, 0 }); ++ TEST_VERIFY (response.sum == 23); ++ TEST_VERIFY (response.seq == 2); ++ double after = get_ticks (); ++ if (test_verbose) ++ printf ("info: 21 garbage packets took %f seconds\n", after - before); ++ /* Expected timeout is 0.5 seconds. Add some slack in case process ++ scheduling delays processing the query or response, but do not ++ accept a retry (which would happen at 1.5 seconds). */ ++ TEST_VERIFY (0.5 <= after - before); ++ TEST_VERIFY (after - before < 1.2); ++ test_call_flush (clnt); ++ ++ /* Check that missing a response introduces a 1.5 second timeout, as ++ requested when calling clntudp_create. */ ++ before = get_ticks (); ++ response = test_call ++ (clnt, PROC_ADD, ++ (struct test_query) { .a = 170, .b = 40, .wait_for_seq = 2 }, ++ (struct timeval) { 3, 0 }); ++ TEST_VERIFY (response.sum == 210); ++ TEST_VERIFY (response.seq == 2); ++ after = get_ticks (); ++ if (test_verbose) ++ printf ("info: skipping one response took %f seconds\n", ++ after - before); ++ /* Expected timeout is 1.5 seconds. Do not accept a second retry ++ (which would happen at 3 seconds). */ ++ TEST_VERIFY (1.5 <= after - before); ++ TEST_VERIFY (after - before < 2.9); ++ test_call_flush (clnt); ++ ++ /* Check that the overall timeout wins against the per-query ++ timeout. */ ++ before = get_ticks (); ++ test_call_timeout ++ (clnt, PROC_ADD, ++ (struct test_query) { .a = 170, .b = 41, .wait_for_seq = 2 }, ++ (struct timeval) { 0, 750 * 1000 }); ++ after = get_ticks (); ++ if (test_verbose) ++ printf ("info: 0.75 second timeout took %f seconds\n", ++ after - before); ++ TEST_VERIFY (0.75 <= after - before); ++ TEST_VERIFY (after - before < 1.4); ++ test_call_flush (clnt); ++ ++ for (int with_garbage = 0; with_garbage < 2; ++with_garbage) ++ { ++ /* Check that no response at all causes the client to bail out. */ ++ before = get_ticks (); ++ test_call_timeout ++ (clnt, PROC_ADD, ++ (struct test_query) { ++ .a = 170, .b = 40, .timeout_ms = 1200, ++ .garbage_packets = with_garbage * 21 ++ }, ++ (struct timeval) { 0, 750 * 1000 }); ++ after = get_ticks (); ++ if (test_verbose) ++ printf ("info: test_udp_server: 0.75 second timeout took %f seconds" ++ " (garbage %d)\n", ++ after - before, with_garbage); ++ TEST_VERIFY (0.75 <= after - before); ++ TEST_VERIFY (after - before < 1.4); ++ test_call_flush (clnt); ++ ++ /* As above, but check the total timeout. */ ++ before = get_ticks (); ++ test_call_timeout ++ (clnt, PROC_ADD, ++ (struct test_query) { ++ .a = 170, .b = 40, .timeout_ms = 3000, ++ .garbage_packets = with_garbage * 30 ++ }, ++ (struct timeval) { 2, 300 * 1000 }); ++ after = get_ticks (); ++ if (test_verbose) ++ printf ("info: test_udp_server: 2.3 second timeout took %f seconds" ++ " (garbage %d)\n", ++ after - before, with_garbage); ++ TEST_VERIFY (2.3 <= after - before); ++ TEST_VERIFY (after - before < 3.0); ++ test_call_flush (clnt); ++ } ++ ++ TEST_VERIFY_EXIT (clnt_call (clnt, PROC_EXIT, ++ (xdrproc_t) xdr_void, NULL, ++ (xdrproc_t) xdr_void, NULL, ++ ((struct timeval) { 5, 0 })) ++ == RPC_SUCCESS); ++ clnt_destroy (clnt); ++} ++ ++static int ++do_test (void) ++{ ++ support_become_root (); ++ support_enter_network_namespace (); ++ ++ SVCXPRT *transport = svcudp_create (RPC_ANYSOCK); ++ TEST_VERIFY_EXIT (transport != NULL); ++ TEST_VERIFY (svc_register (transport, PROGNUM, VERSNUM, server_dispatch, 0)); ++ ++ pid_t pid = xfork (); ++ if (pid == 0) ++ { ++ svc_run (); ++ FAIL_EXIT1 ("supposed to be unreachable"); ++ } ++ test_udp_server (transport->xp_port); ++ ++ int status; ++ xwaitpid (pid, &status, 0); ++ TEST_VERIFY (WIFEXITED (status) && WEXITSTATUS (status) == EXIT_MARKER); ++ ++ SVC_DESTROY (transport); ++ return 0; ++} ++ ++/* The minimum run time is around 17 seconds. */ ++#define TIMEOUT 25 ++#include +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-04.patch b/srcpkgs/glibc/patches/glibc-upstream-04.patch new file mode 100644 index 0000000000..67c135db83 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-04.patch @@ -0,0 +1,201 @@ +From 69e0a87cc4c570e3b7218392fc3e743b5bddcce2 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 2 Mar 2017 20:11:27 +0100 +Subject: [PATCH 04] Document and fix --enable-bind-now [BZ #21015] + +(cherry picked from commit 2d6ab5df3b675e96ee587ae6a8c2ce004c6b1ba9) +--- + ChangeLog | 17 +++++++++++++++++ + INSTALL | 6 ++++++ + Makeconfig | 7 +++++++ + Makerules | 9 +++------ + NEWS | 1 + + iconvdata/Makefile | 5 +++++ + manual/install.texi | 6 ++++++ + sysdeps/unix/sysv/linux/alpha/localplt.data | 2 +- + sysdeps/unix/sysv/linux/i386/localplt.data | 2 +- + sysdeps/x86_64/localplt.data | 2 +- + 10 files changed, 48 insertions(+), 9 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 510ca42..8aaf9f8 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,20 @@ ++2017-03-02 Florian Weimer ++ ++ [BZ #21015] ++ * manual/install.texi (Configuring and compiling): Document ++ --enable-bind-now. ++ * Makeconfig [bind-now] (LDFLAGS-lib.so): Set. ++ (build-shlib-helper): Use $(LDFLAGS-lib.so). ++ (format.lds): Likewise. ++ [bind-now] (LDFLAGS-c.so): Remove. ++ * sysdeps/x86_64/localplt.data (libm.so): matherr relocation can ++ be R_X86_64_GLOB_DAT. ++ * sysdeps/unix/sysv/linux/i386/localplt.data (libm.so): matherr ++ relocation can be R_386_GLOB_DAT. ++ * sysdeps/unix/sysv/linux/alpha/localplt.data (libm.so): matherr ++ relocaiton can be R_ALPHA_GLOB_DAT. ++ * iconvdata/Makefile [bind-now] (LDFLAGS.so): Add -Wl,-z,now. ++ + 2017-02-28 Florian Weimer + + [BZ #20257] +diff --git a/INSTALL b/INSTALL +index 3b3fd12..e77cb2d 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -146,6 +146,12 @@ will be used, and CFLAGS sets optimization options for the compiler. + of routines called directly from assembler are excluded from this + protection. + ++'--enable-bind-now' ++ Disable lazy binding for installed shared objects. This provides ++ additional security hardening because it enables full RELRO and a ++ read-only global offset table (GOT), at the cost of slightly ++ increased program load times. ++ + '--enable-pt_chown' + The file 'pt_chown' is a helper binary for 'grantpt' (*note + Pseudo-Terminals: Allocation.) that is installed setuid root to fix +diff --git a/Makeconfig b/Makeconfig +index 97a15b5..1c81511 100644 +--- a/Makeconfig ++++ b/Makeconfig +@@ -386,6 +386,13 @@ LDFLAGS.so += $(hashstyle-LDFLAGS) + LDFLAGS-rtld += $(hashstyle-LDFLAGS) + endif + ++# If lazy relocations are disabled, add the -z now flag. Use ++# LDFLAGS-lib.so instead of LDFLAGS.so, to avoid adding the flag to ++# test modules. ++ifeq ($(bind-now),yes) ++LDFLAGS-lib.so += -Wl,-z,now ++endif ++ + # Command to run after every final link (executable or shared object). + # This is invoked with $(call after-link,...), so it should operate on + # the file $1. This can be set to do some sort of post-processing on +diff --git a/Makerules b/Makerules +index e9194e5..7f0eef8 100644 +--- a/Makerules ++++ b/Makerules +@@ -588,7 +588,7 @@ $(LINK.o) -shared -static-libgcc -Wl,-O1 $(sysdep-LDFLAGS) \ + $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ + $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ + -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \ +- $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \ ++ $(LDFLAGS.so) $(LDFLAGS-lib.so) $(LDFLAGS-$(@F:lib%.so=%).so) \ + -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) + endef + +@@ -686,10 +686,6 @@ LDFLAGS-c.so = -nostdlib -nostartfiles + LDLIBS-c.so += $(libc.so-gnulib) + # Give libc.so an entry point and make it directly runnable itself. + LDFLAGS-c.so += -e __libc_main +-# If lazy relocation is disabled add the -z now flag. +-ifeq ($(bind-now),yes) +-LDFLAGS-c.so += -Wl,-z,now +-endif + # Pre-link the objects of libc_pic.a so that we can locally resolve + # COMMON symbols before we link against ld.so. This is because ld.so + # contains some of libc_pic.a already, which will prevent the COMMONs +@@ -1104,7 +1100,8 @@ $(common-objpfx)format.lds: $(..)scripts/output-format.sed \ + ifneq (unknown,$(output-format)) + echo > $@.new 'OUTPUT_FORMAT($(output-format))' + else +- $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \ ++ $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ ++ $(LDFLAGS.so) $(LDFLAGS-lib.so) \ + -x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \ + | sed -n -f $< > $@.new + test -s $@.new +diff --git a/NEWS b/NEWS +index e7d6668..9bf8c10 100644 +--- a/NEWS ++++ b/NEWS +@@ -12,6 +12,7 @@ The following bugs are resolved with this release: + [21109] Tunables broken on big-endian + [21115] sunrpc: Use-after-free in error path in clntudp_call + [20257] sunrpc: clntudp_call does not enforce timeout when receiving data ++ [21015] Document and fix --enable-bind-now + + Version 2.25 + +diff --git a/iconvdata/Makefile b/iconvdata/Makefile +index 04157b2..e484587 100644 +--- a/iconvdata/Makefile ++++ b/iconvdata/Makefile +@@ -63,6 +63,11 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ + MAC-CENTRALEUROPE KOI8-RU ISO8859-9E \ + CP770 CP771 CP772 CP773 CP774 + ++# If lazy binding is disabled, use BIND_NOW for the gconv modules. ++ifeq ($(bind-now),yes) ++LDFLAGS.so += -Wl,-z,now ++endif ++ + modules.so := $(addsuffix .so, $(modules)) + + ifeq (yes,$(build-shared)) +diff --git a/manual/install.texi b/manual/install.texi +index 266add8..3398cfa 100644 +--- a/manual/install.texi ++++ b/manual/install.texi +@@ -175,6 +175,12 @@ options to detect stack overruns. Only the dynamic linker and a small + number of routines called directly from assembler are excluded from this + protection. + ++@item --enable-bind-now ++Disable lazy binding for installed shared objects. This provides ++additional security hardening because it enables full RELRO and a ++read-only global offset table (GOT), at the cost of slightly increased ++program load times. ++ + @pindex pt_chown + @findex grantpt + @item --enable-pt_chown +diff --git a/sysdeps/unix/sysv/linux/alpha/localplt.data b/sysdeps/unix/sysv/linux/alpha/localplt.data +index cca17f1..1f0e3b4 100644 +--- a/sysdeps/unix/sysv/linux/alpha/localplt.data ++++ b/sysdeps/unix/sysv/linux/alpha/localplt.data +@@ -20,7 +20,7 @@ libc.so: free + RELA R_ALPHA_GLOB_DAT + libc.so: malloc + RELA R_ALPHA_GLOB_DAT + libc.so: memalign + RELA R_ALPHA_GLOB_DAT + libc.so: realloc + RELA R_ALPHA_GLOB_DAT +-libm.so: matherr ++libm.so: matherr + RELA R_ALPHA_GLOB_DAT + # We used to offer inline functions that used this, so it must be exported. + # Ought to reorg things such that carg isn't thus forced to use a plt. + libm.so: __atan2 +diff --git a/sysdeps/unix/sysv/linux/i386/localplt.data b/sysdeps/unix/sysv/linux/i386/localplt.data +index 2c25849..8ea4333 100644 +--- a/sysdeps/unix/sysv/linux/i386/localplt.data ++++ b/sysdeps/unix/sysv/linux/i386/localplt.data +@@ -6,7 +6,7 @@ libc.so: free + REL R_386_GLOB_DAT + libc.so: malloc + REL R_386_GLOB_DAT + libc.so: memalign + REL R_386_GLOB_DAT + libc.so: realloc + REL R_386_GLOB_DAT +-libm.so: matherr ++libm.so: matherr + REL R_386_GLOB_DAT + # The main malloc is interposed into the dynamic linker, for + # allocations after the initial link (when dlopen is used). + ld.so: malloc + REL R_386_GLOB_DAT +diff --git a/sysdeps/x86_64/localplt.data b/sysdeps/x86_64/localplt.data +index 014a9f4..a1840cf 100644 +--- a/sysdeps/x86_64/localplt.data ++++ b/sysdeps/x86_64/localplt.data +@@ -8,7 +8,7 @@ libc.so: free + RELA R_X86_64_GLOB_DAT + libc.so: malloc + RELA R_X86_64_GLOB_DAT + libc.so: memalign + RELA R_X86_64_GLOB_DAT + libc.so: realloc + RELA R_X86_64_GLOB_DAT +-libm.so: matherr ++libm.so: matherr + RELA R_X86_64_GLOB_DAT + # The main malloc is interposed into the dynamic linker, for + # allocations after the initial link (when dlopen is used). + ld.so: malloc + RELA R_X86_64_GLOB_DAT +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-05.patch b/srcpkgs/glibc/patches/glibc-upstream-05.patch new file mode 100644 index 0000000000..60784a4b9a --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-05.patch @@ -0,0 +1,67 @@ +From 8b3caa41b9cb82651e72a0c87aa56719c134000e Mon Sep 17 00:00:00 2001 +From: John David Anglin +Date: Mon, 20 Feb 2017 20:31:57 -0500 +Subject: [PATCH 05] hppa: Fix setting of __libc_stack_end + +The binutils package was recently changed to fix -z relro support on hppa. +See ld/21000 for details: +https://sourceware.org/bugzilla/show_bug.cgi?id=21000 + +This exposed a problem with the _dl_start_user function in the RTLD_START +define. We need to set __libc_stack_end before it is made read only. For +this, we need to define DL_STACK_END. The offset of 0x160 gives the same +stack end as the code in _dl_start_user. + +A build log with the attached patch is here: +https://buildd.debian.org/status/fetch.php?pkg=glibc&arch=hppa&ver=2.24-9&stamp=1487639205&raw=0 + +(cherry picked from commit 5d20a49aaccef5ef7adac93d5ca159f6b7ba0105) +--- + ChangeLog | 5 +++++ + sysdeps/hppa/dl-machine.h | 9 ++++----- + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 8aaf9f8..d8ed2e4 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2017-03-15 John David Anglin ++ ++ * sysdeps/hppa/dl-machine.h (DL_STACK_END): Define. ++ (RTLD_START): Don't record stack end address in _dl_start_user. ++ + 2017-03-02 Florian Weimer + + [BZ #21015] +diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h +index 339c7bb..787b95f 100644 +--- a/sysdeps/hppa/dl-machine.h ++++ b/sysdeps/hppa/dl-machine.h +@@ -302,6 +302,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) + #define ARCH_LA_PLTENTER hppa_gnu_pltenter + #define ARCH_LA_PLTEXIT hppa_gnu_pltexit + ++/* Adjust DL_STACK_END to get value we want in __libc_stack_end. */ ++#define DL_STACK_END(cookie) \ ++ ((void *) (((long) (cookie)) + 0x160)) ++ + /* Initial entry point code for the dynamic linker. + The C function `_dl_start' is the real entry point; + its return value is the user program's entry point. */ +@@ -401,11 +405,6 @@ asm ( \ + /* Save the entry point in %r3. */ \ + " copy %ret0,%r3\n" \ + \ +- /* Remember the lowest stack address. */ \ +-" addil LT'__libc_stack_end,%r19\n" \ +-" ldw RT'__libc_stack_end(%r1),%r20\n" \ +-" stw %sp,0(%r20)\n" \ +- \ + /* See if we were called as a command with the executable file \ + name as an extra leading argument. */ \ + " addil LT'_dl_skip_args,%r19\n" \ +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-06.patch b/srcpkgs/glibc/patches/glibc-upstream-06.patch new file mode 100644 index 0000000000..c1c31aa344 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-06.patch @@ -0,0 +1,52 @@ +From 0889003c67f9c2f520a37281c4b5c3b8a9861f46 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Sun, 12 Mar 2017 15:12:21 -0700 +Subject: [PATCH 06] x86_64: fix static build of __mempcpy_chk for compilers + defaulting to PIC/PIE + +When glibc is compiled with gcc 6.2 that has been configured with +to default to PIC/PIE, the static version of __mempcpy_chk is not built, +as the test is done on PIC instead of SHARED. Fix the test to check for +SHARED, like it is done for similar functions like __memcpy_chk. + +2017-03-12 Mike Frysinger + + * sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED + instead of PIC. + +(cherry picked from commit fbe355fbd1973d6e29561084b3eaeb4bfe9d515a) +--- + ChangeLog | 5 +++++ + sysdeps/x86_64/mempcpy_chk.S | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index d8ed2e4..c29a70a 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2017-03-15 Mike Frysinger ++ ++ * sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED ++ instead of PIC. ++ + 2017-03-15 John David Anglin + + * sysdeps/hppa/dl-machine.h (DL_STACK_END): Define. +diff --git a/sysdeps/x86_64/mempcpy_chk.S b/sysdeps/x86_64/mempcpy_chk.S +index f8a9260..f912291 100644 +--- a/sysdeps/x86_64/mempcpy_chk.S ++++ b/sysdeps/x86_64/mempcpy_chk.S +@@ -19,7 +19,7 @@ + #include + #include "asm-syntax.h" + +-#ifndef PIC ++#ifndef SHARED + /* For libc.so this is defined in memcpy.S. + For libc.a, this is a separate source to avoid + mempcpy bringing in __chk_fail and all routines +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-07.patch b/srcpkgs/glibc/patches/glibc-upstream-07.patch new file mode 100644 index 0000000000..3319eedbb4 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-07.patch @@ -0,0 +1,65 @@ +From 27ab0d9518746dfb59ed2ba59daefc981dc10e38 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 20 Mar 2017 04:47:56 -0400 +Subject: [PATCH 07] posix_spawn: fix stack setup on ia64 [BZ #21275] + +The ia64-specific clone2 call expects the base of the stack mapping and +the stack size as sep arguments, not an initial stack value as on other +stack-grows-down architectures. Reuse the stack-grows-up macro so we +pass in the right stack base. + +Reported-by: Matt Turner +(cherry picked from commit ddc3fb333469c2997798742dc0509dc1e3201d91) +--- + ChangeLog | 8 ++++++++ + sysdeps/unix/sysv/linux/spawni.c | 11 ++++++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index c29a70a..ef5388c 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,11 @@ ++2017-03-20 Mike Frysinger ++ ++ [BZ #21275] ++ * sysdeps/unix/sysv/linux/spawni.c [__ia64__] (CLONE): Rename ++ __stack to __stackbase. ++ (STACK): Invert _STACK_GROWS_DOWN and _STACK_GROWS_UP order of ++ checks so we can include defined(__ia64__) first. ++ + 2017-03-15 Mike Frysinger + + * sysdeps/x86_64/mempcpy_chk.S (__mempcpy_chk): Check for SHARED +diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c +index 2daf0c5..c96aac8 100644 +--- a/sysdeps/unix/sysv/linux/spawni.c ++++ b/sysdeps/unix/sysv/linux/spawni.c +@@ -61,17 +61,18 @@ + #define SPAWN_ERROR 127 + + #ifdef __ia64__ +-# define CLONE(__fn, __stack, __stacksize, __flags, __args) \ +- __clone2 (__fn, __stack, __stacksize, __flags, __args, 0, 0, 0) ++# define CLONE(__fn, __stackbase, __stacksize, __flags, __args) \ ++ __clone2 (__fn, __stackbase, __stacksize, __flags, __args, 0, 0, 0) + #else + # define CLONE(__fn, __stack, __stacksize, __flags, __args) \ + __clone (__fn, __stack, __flags, __args) + #endif + +-#if _STACK_GROWS_DOWN +-# define STACK(__stack, __stack_size) (__stack + __stack_size) +-#elif _STACK_GROWS_UP ++/* Since ia64 wants the stackbase w/clone2, re-use the grows-up macro. */ ++#if _STACK_GROWS_UP || defined (__ia64__) + # define STACK(__stack, __stack_size) (__stack) ++#elif _STACK_GROWS_DOWN ++# define STACK(__stack, __stack_size) (__stack + __stack_size) + #endif + + +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-08.patch b/srcpkgs/glibc/patches/glibc-upstream-08.patch new file mode 100644 index 0000000000..ad522a0690 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-08.patch @@ -0,0 +1,63 @@ +From f035c8d055f25eaf6c93772f308afac10ce31ef2 Mon Sep 17 00:00:00 2001 +From: Slava Barinov +Date: Fri, 31 Mar 2017 08:49:25 +0200 +Subject: [PATCH 08] fts: Fix symbol redirect for fts_set [BZ #21289] + +In a 32-bit environment with _FILE_OFFSET_BITS=64, the __REDIRECT macro +combined with __THROW generates an invalid C++ declaration. + +(cherry picked from commit ce39613205dc47ceaeea76710d49e7a483b503ab) +--- + ChangeLog | 5 +++++ + NEWS | 5 +++-- + io/fts.h | 2 +- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index ef5388c..85d6fc6 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2017-03-31 Slava Barinov ++ ++ [BZ #21289] ++ * io/fts.h (fts_set): Replace __REDIRECT with __REDIRECT_NTH. ++ + 2017-03-20 Mike Frysinger + + [BZ #21275] +diff --git a/NEWS b/NEWS +index 9bf8c10..fee1cf8 100644 +--- a/NEWS ++++ b/NEWS +@@ -9,10 +9,11 @@ Version 2.25.1 + + The following bugs are resolved with this release: + +- [21109] Tunables broken on big-endian +- [21115] sunrpc: Use-after-free in error path in clntudp_call + [20257] sunrpc: clntudp_call does not enforce timeout when receiving data + [21015] Document and fix --enable-bind-now ++ [21109] Tunables broken on big-endian ++ [21115] sunrpc: Use-after-free in error path in clntudp_call ++ [21289] Fix symbol redirect for fts_set + + Version 2.25 + +diff --git a/io/fts.h b/io/fts.h +index b9cff53..ab15567 100644 +--- a/io/fts.h ++++ b/io/fts.h +@@ -193,7 +193,7 @@ FTS *__REDIRECT (fts_open, (char * const *, int, + int (*)(const FTSENT **, const FTSENT **)), + fts64_open); + FTSENT *__REDIRECT (fts_read, (FTS *), fts64_read); +-int __REDIRECT (fts_set, (FTS *, FTSENT *, int), fts64_set) __THROW; ++int __REDIRECT_NTH (fts_set, (FTS *, FTSENT *, int), fts64_set); + # else + # define fts_children fts64_children + # define fts_close fts64_close +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-09.patch b/srcpkgs/glibc/patches/glibc-upstream-09.patch new file mode 100644 index 0000000000..c7ad23ad0b --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-09.patch @@ -0,0 +1,51 @@ +From 74522eeeaa4a39809a28f44171e71d36a69edb58 Mon Sep 17 00:00:00 2001 +From: "Wladimir J. van der Laan" +Date: Sat, 1 Apr 2017 12:39:09 +0530 +Subject: [PATCH 09] Call the right helper function when setting mallopt + M_ARENA_MAX (BZ #21338) + +Fixes a typo introduced in commit +be7991c0705e35b4d70a419d117addcd6c627319. This caused +mallopt(M_ARENA_MAX) as well as the environment variable +MALLOC_ARENA_MAX to not work as intended because it set the +wrong internal parameter. + + [BZ #21338] + * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX + instead of incorrect do_set_arena_test +--- + ChangeLog | 6 ++++++ + malloc/malloc.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index 85d6fc6..321bf53 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2017-04-03 Wladimir van der Laan ++ ++ [BZ# 21338] ++ * malloc/malloc.c: Call do_set_arena_max for M_ARENA_MAX ++ instead of incorrect do_set_arena_test ++ + 2017-03-31 Slava Barinov + + [BZ #21289] +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 4885793..4e07663 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -4902,7 +4902,7 @@ __libc_mallopt (int param_number, int value) + + case M_ARENA_MAX: + if (value > 0) +- do_set_arena_test (value); ++ do_set_arena_max (value); + break; + } + __libc_lock_unlock (av->mutex); +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-10.patch b/srcpkgs/glibc/patches/glibc-upstream-10.patch new file mode 100644 index 0000000000..6bb2645877 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-10.patch @@ -0,0 +1,71 @@ +From df29db0bec24211cfc917db52024bf8deecac2c9 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 15 Mar 2017 23:59:31 -0700 +Subject: [PATCH 10] posix_spawn: use a larger min stack for -fstack-check + [BZ #21253] + +When glibc is built with -fstack-check, trying to use posix_spawn can +lead to segfaults due to gcc internally probing stack memory too far. +The new spawn API will allocate a minimum of 1 page, but the stack +checking logic might probe a couple of pages. When it tries to walk +them, everything falls apart. + +The gcc internal docs [1] state the default interval checking is one +page. Which means we need two pages (the current one, and the next +probed). No target currently defines it larger. + +Further, it mentions that the default minimum stack size needed to +recover from an overflow is 4/8KiB for sjlj or 8/12KiB for others. +But some Linux targets (like mips and ppc) go up to 16KiB (and some +non-Linux targets go up to 24KiB). + +Let's create each child with a minimum of 32KiB slack space to support +them all, and give us future breathing room. + +No test is added as existing ones crash. Even a simple call is +enough to trigger the problem: + char *argv[] = { "/bin/ls", NULL }; + posix_spawn(NULL, "/bin/ls", NULL, NULL, argv, NULL); + +[1] https://gcc.gnu.org/onlinedocs/gcc-6.3.0/gccint/Stack-Checking.html + +(cherry picked from commit 21f042c804835d1f7a4a8e06f2c93ca35a182042) +--- + ChangeLog | 6 ++++++ + sysdeps/unix/sysv/linux/spawni.c | 5 +++++ + 2 files changed, 11 insertions(+) + +diff --git a/ChangeLog b/ChangeLog +index 321bf53..b37a054 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2017-04-03 Mike Frysinger ++ ++ [BZ #21253] ++ * sysdeps/unix/sysv/linux/spawni.c (__spawnix): Increase argv_size ++ slack space by 32KiB. ++ + 2017-04-03 Wladimir van der Laan + + [BZ# 21338] +diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c +index c96aac8..29d8f25 100644 +--- a/sysdeps/unix/sysv/linux/spawni.c ++++ b/sysdeps/unix/sysv/linux/spawni.c +@@ -319,6 +319,11 @@ __spawnix (pid_t * pid, const char *file, + + /* Add a slack area for child's stack. */ + size_t argv_size = (argc * sizeof (void *)) + 512; ++ /* We need at least a few pages in case the compiler's stack checking is ++ enabled. In some configs, it is known to use at least 24KiB. We use ++ 32KiB to be "safe" from anything the compiler might do. Besides, the ++ extra pages won't actually be allocated unless they get used. */ ++ argv_size += (32 * 1024); + size_t stack_size = ALIGN_UP (argv_size, GLRO(dl_pagesize)); + void *stack = __mmap (NULL, stack_size, prot, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-11.patch b/srcpkgs/glibc/patches/glibc-upstream-11.patch new file mode 100644 index 0000000000..bb120e8227 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-11.patch @@ -0,0 +1,115 @@ +From 903b77defb6f2ee2552c06472339f33091e3c7b4 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 21 Mar 2017 10:59:31 -0700 +Subject: [PATCH 11] x86-64: Improve branch predication in + _dl_runtime_resolve_avx512_opt [BZ #21258] + +On Skylake server, _dl_runtime_resolve_avx512_opt is used to preserve +the first 8 vector registers. The code layout is + + if only %xmm0 - %xmm7 registers are used + preserve %xmm0 - %xmm7 registers + if only %ymm0 - %ymm7 registers are used + preserve %ymm0 - %ymm7 registers + preserve %zmm0 - %zmm7 registers + +Branch predication always executes the fallthrough code path to preserve +%zmm0 - %zmm7 registers speculatively, even though only %xmm0 - %xmm7 +registers are used. This leads to lower CPU frequency on Skylake +server. This patch changes the fallthrough code path to preserve +%xmm0 - %xmm7 registers instead: + + if whole %zmm0 - %zmm7 registers are used + preserve %zmm0 - %zmm7 registers + if only %ymm0 - %ymm7 registers are used + preserve %ymm0 - %ymm7 registers + preserve %xmm0 - %xmm7 registers + +Tested on Skylake server. + + [BZ #21258] + * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_resolve_opt): + Define only if _dl_runtime_resolve is defined to + _dl_runtime_resolve_sse_vex. + * sysdeps/x86_64/dl-trampoline.h (_dl_runtime_resolve_opt): + Fallthrough to _dl_runtime_resolve_sse_vex. + +(cherry picked from commit c15f8eb50cea7ad1a4ccece6e0982bf426d52c00) +--- + ChangeLog | 9 +++++++++ + sysdeps/x86_64/dl-trampoline.S | 3 +-- + sysdeps/x86_64/dl-trampoline.h | 9 +++++---- + 3 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index b37a054..8479fba 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,12 @@ ++2017-04-07 H.J. Lu ++ ++ [BZ #21258] ++ * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_resolve_opt): ++ Define only if _dl_runtime_resolve is defined to ++ _dl_runtime_resolve_sse_vex. ++ * sysdeps/x86_64/dl-trampoline.h (_dl_runtime_resolve_opt): ++ Fallthrough to _dl_runtime_resolve_sse_vex. ++ + 2017-04-03 Mike Frysinger + + [BZ #21253] +diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S +index 33d7fcf..c14c61a 100644 +--- a/sysdeps/x86_64/dl-trampoline.S ++++ b/sysdeps/x86_64/dl-trampoline.S +@@ -87,11 +87,9 @@ + #endif + #define VEC(i) zmm##i + #define _dl_runtime_resolve _dl_runtime_resolve_avx512 +-#define _dl_runtime_resolve_opt _dl_runtime_resolve_avx512_opt + #define _dl_runtime_profile _dl_runtime_profile_avx512 + #include "dl-trampoline.h" + #undef _dl_runtime_resolve +-#undef _dl_runtime_resolve_opt + #undef _dl_runtime_profile + #undef VEC + #undef VMOV +@@ -145,4 +143,5 @@ + # define VMOV vmovdqu + #endif + #define _dl_runtime_resolve _dl_runtime_resolve_sse_vex ++#define _dl_runtime_resolve_opt _dl_runtime_resolve_avx512_opt + #include "dl-trampoline.h" +diff --git a/sysdeps/x86_64/dl-trampoline.h b/sysdeps/x86_64/dl-trampoline.h +index b27fa06..8db24c1 100644 +--- a/sysdeps/x86_64/dl-trampoline.h ++++ b/sysdeps/x86_64/dl-trampoline.h +@@ -129,19 +129,20 @@ _dl_runtime_resolve_opt: + # YMM state isn't in use. + PRESERVE_BND_REGS_PREFIX + jz _dl_runtime_resolve_sse_vex +-# elif VEC_SIZE == 64 ++# elif VEC_SIZE == 16 + # For ZMM registers, check if YMM state and ZMM state are in + # use. + andl $(bit_YMM_state | bit_ZMM0_15_state), %r11d + cmpl $bit_YMM_state, %r11d +- # Preserve %xmm0 - %xmm7 registers with the zero upper 384 bits if +- # neither YMM state nor ZMM state are in use. ++ # Preserve %zmm0 - %zmm7 registers if ZMM state is in use. + PRESERVE_BND_REGS_PREFIX +- jl _dl_runtime_resolve_sse_vex ++ jg _dl_runtime_resolve_avx512 + # Preserve %ymm0 - %ymm7 registers with the zero upper 256 bits if + # ZMM state isn't in use. + PRESERVE_BND_REGS_PREFIX + je _dl_runtime_resolve_avx ++ # Preserve %xmm0 - %xmm7 registers with the zero upper 384 bits if ++ # neither YMM state nor ZMM state are in use. + # else + # error Unsupported VEC_SIZE! + # endif +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-12.patch b/srcpkgs/glibc/patches/glibc-upstream-12.patch new file mode 100644 index 0000000000..b64b0287ce --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-12.patch @@ -0,0 +1,59 @@ +From b30b1c97ccfe72e82b0c95bb55274b5660bc539e Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Tue, 11 Apr 2017 15:08:02 -0300 +Subject: [PATCH 12] posix: Add cleanup on the trap list for globtest.sh + +This patch prevents lingering files for SIGSEGV failures by adding +a cleanup handler on trap handler. Checked on x86_64-linux-gnu. + + * posix/globtest.sh: Add cleanup routine on trap 0. + +Cherry-pick of 4fee33f. +--- + ChangeLog | 4 ++++ + posix/globtest.sh | 9 ++++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 8479fba..4962000 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2017-04-11 Adhemerval Zanella ++ ++ * posix/globtest.sh: Add cleanup routine on trap 0. ++ + 2017-04-07 H.J. Lu + + [BZ #21258] +diff --git a/posix/globtest.sh b/posix/globtest.sh +index f9cc80b..73f7ae3 100755 +--- a/posix/globtest.sh ++++ b/posix/globtest.sh +@@ -47,7 +47,12 @@ testout=${common_objpfx}posix/globtest-out + rm -rf $testdir $testout + mkdir $testdir + +-trap 'chmod 777 $testdir/noread; rm -fr $testdir $testout' 1 2 3 15 ++cleanup() { ++ chmod 777 $testdir/noread ++ rm -fr $testdir $testout ++} ++ ++trap cleanup 0 HUP INT QUIT TERM + + echo 1 > $testdir/file1 + echo 2 > $testdir/file2 +@@ -811,8 +816,6 @@ if test $failed -ne 0; then + fi + + if test $result -eq 0; then +- chmod 777 $testdir/noread +- rm -fr $testdir $testout + echo "All OK." > $logfile + fi + +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-13.patch b/srcpkgs/glibc/patches/glibc-upstream-13.patch new file mode 100644 index 0000000000..c6385e1dda --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-13.patch @@ -0,0 +1,136 @@ +From 4c6f97798fe1854a32b1199c42370eac1620eebf Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Fri, 28 Apr 2017 10:03:09 -0700 +Subject: [PATCH 13] x86: Set Prefer_No_VZEROUPPER if AVX512ER is available + +AVX512ER won't be implemented in any Xeon processors and will be in +all Xeon Phi processors. Don't check CPU model number when setting +Prefer_No_VZEROUPPER for Xeon Phi. Instead, set Prefer_No_VZEROUPPER +if AVX512ER is available. It works with current and future Xeon Phi +and non-Xeon Phi processors. + + * sysdeps/x86/cpu-features.c (init_cpu_features): Set + Prefer_No_VZEROUPPER if AVX512ER is available. + * sysdeps/x86/cpu-features.h + (bit_cpu_AVX512PF): New. + (bit_cpu_AVX512ER): Likewise. + (bit_cpu_AVX512CD): Likewise. + (bit_cpu_AVX512BW): Likewise. + (bit_cpu_AVX512VL): Likewise. + (index_cpu_AVX512PF): Likewise. + (index_cpu_AVX512ER): Likewise. + (index_cpu_AVX512CD): Likewise. + (index_cpu_AVX512BW): Likewise. + (index_cpu_AVX512VL): Likewise. + (reg_AVX512PF): Likewise. + (reg_AVX512ER): Likewise. + (reg_AVX512CD): Likewise. + (reg_AVX512BW): Likewise. + (reg_AVX512VL): Likewise. + +(cherry picked from commit 1c53cb49de6d82d9469ccbd5aa0c55924502bd8b) +--- + ChangeLog | 21 +++++++++++++++++++++ + sysdeps/x86/cpu-features.c | 8 ++++++-- + sysdeps/x86/cpu-features.h | 15 +++++++++++++++ + 3 files changed, 42 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 4962000..dc49c78 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,24 @@ ++2017-04-28 H.J. Lu ++ ++ * sysdeps/x86/cpu-features.c (init_cpu_features): Set ++ Prefer_No_VZEROUPPER if AVX512ER is available. ++ * sysdeps/x86/cpu-features.h ++ (bit_cpu_AVX512PF): New. ++ (bit_cpu_AVX512ER): Likewise. ++ (bit_cpu_AVX512CD): Likewise. ++ (bit_cpu_AVX512BW): Likewise. ++ (bit_cpu_AVX512VL): Likewise. ++ (index_cpu_AVX512PF): Likewise. ++ (index_cpu_AVX512ER): Likewise. ++ (index_cpu_AVX512CD): Likewise. ++ (index_cpu_AVX512BW): Likewise. ++ (index_cpu_AVX512VL): Likewise. ++ (reg_AVX512PF): Likewise. ++ (reg_AVX512ER): Likewise. ++ (reg_AVX512CD): Likewise. ++ (reg_AVX512BW): Likewise. ++ (reg_AVX512VL): Likewise. ++ + 2017-04-11 Adhemerval Zanella + + * posix/globtest.sh: Add cleanup routine on trap 0. +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 1c714a4..41d0be2 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -139,8 +139,6 @@ init_cpu_features (struct cpu_features *cpu_features) + + case 0x57: + /* Knights Landing. Enable Silvermont optimizations. */ +- cpu_features->feature[index_arch_Prefer_No_VZEROUPPER] +- |= bit_arch_Prefer_No_VZEROUPPER; + + case 0x5c: + case 0x5f: +@@ -226,6 +224,12 @@ init_cpu_features (struct cpu_features *cpu_features) + cpu_features->feature[index_arch_AVX_Fast_Unaligned_Load] + |= bit_arch_AVX_Fast_Unaligned_Load; + ++ /* Since AVX512ER is unique to Xeon Phi, set Prefer_No_VZEROUPPER ++ if AVX512ER is available. */ ++ if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER)) ++ cpu_features->feature[index_arch_Prefer_No_VZEROUPPER] ++ |= bit_arch_Prefer_No_VZEROUPPER; ++ + /* To avoid SSE transition penalty, use _dl_runtime_resolve_slow. + If XGETBV suports ECX == 1, use _dl_runtime_resolve_opt. */ + cpu_features->feature[index_arch_Use_dl_runtime_resolve_slow] +diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h +index 95f0fcf..2ee8a0a 100644 +--- a/sysdeps/x86/cpu-features.h ++++ b/sysdeps/x86/cpu-features.h +@@ -62,6 +62,11 @@ + #define bit_cpu_AVX2 (1 << 5) + #define bit_cpu_AVX512F (1 << 16) + #define bit_cpu_AVX512DQ (1 << 17) ++#define bit_cpu_AVX512PF (1 << 26) ++#define bit_cpu_AVX512ER (1 << 27) ++#define bit_cpu_AVX512CD (1 << 28) ++#define bit_cpu_AVX512BW (1 << 30) ++#define bit_cpu_AVX512VL (1u << 31) + + /* XCR0 Feature flags. */ + #define bit_XMM_state (1 << 1) +@@ -236,6 +241,11 @@ extern const struct cpu_features *__get_cpu_features (void) + # define index_cpu_AVX2 COMMON_CPUID_INDEX_7 + # define index_cpu_AVX512F COMMON_CPUID_INDEX_7 + # define index_cpu_AVX512DQ COMMON_CPUID_INDEX_7 ++# define index_cpu_AVX512PF COMMON_CPUID_INDEX_7 ++# define index_cpu_AVX512ER COMMON_CPUID_INDEX_7 ++# define index_cpu_AVX512CD COMMON_CPUID_INDEX_7 ++# define index_cpu_AVX512BW COMMON_CPUID_INDEX_7 ++# define index_cpu_AVX512VL COMMON_CPUID_INDEX_7 + # define index_cpu_ERMS COMMON_CPUID_INDEX_7 + # define index_cpu_RTM COMMON_CPUID_INDEX_7 + # define index_cpu_FMA COMMON_CPUID_INDEX_1 +@@ -254,6 +264,11 @@ extern const struct cpu_features *__get_cpu_features (void) + # define reg_AVX2 ebx + # define reg_AVX512F ebx + # define reg_AVX512DQ ebx ++# define reg_AVX512PF ebx ++# define reg_AVX512ER ebx ++# define reg_AVX512CD ebx ++# define reg_AVX512BW ebx ++# define reg_AVX512VL ebx + # define reg_ERMS ebx + # define reg_RTM ebx + # define reg_FMA ecx +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-14.patch b/srcpkgs/glibc/patches/glibc-upstream-14.patch new file mode 100644 index 0000000000..99c0367c00 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-14.patch @@ -0,0 +1,236 @@ +From 06d79808f6faf6025c5a7d4e27d949a8216275cc Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Fri, 28 Apr 2017 10:04:15 -0700 +Subject: [PATCH 14] x86: Use AVX2 memcpy/memset on Skylake server [BZ + #21396] + +On Skylake server, AVX512 load/store instructions in memcpy/memset may +lead to lower CPU turbo frequency in certain situations. Use of AVX2 +in memcpy/memset has been observed to have improved overall performance +in many workloads due to the higher frequency. + +Since AVX512ER is unique to Xeon Phi, this patch sets Prefer_No_AVX512 +if AVX512ER isn't available so that AVX2 versions of memcpy/memset are +used on Skylake server. + + [BZ #21396] + * sysdeps/x86/cpu-features.c (init_cpu_features): Set + Prefer_No_AVX512 if AVX512ER isn't available. + * sysdeps/x86/cpu-features.h (bit_arch_Prefer_No_AVX512): New. + (index_arch_Prefer_No_AVX512): Likewise. + * sysdeps/x86_64/multiarch/memcpy.S (__new_memcpy): Don't use + AVX512 version if Prefer_No_AVX512 is set. + * sysdeps/x86_64/multiarch/memcpy_chk.S (__memcpy_chk): + Likewise. + * sysdeps/x86_64/multiarch/memmove.S (__libc_memmove): Likewise. + * sysdeps/x86_64/multiarch/memmove_chk.S (__memmove_chk): + Likewise. + * sysdeps/x86_64/multiarch/mempcpy.S (__mempcpy): Likewise. + * sysdeps/x86_64/multiarch/mempcpy_chk.S (__mempcpy_chk): + Likewise. + * sysdeps/x86_64/multiarch/memset.S (memset): Likewise. + * sysdeps/x86_64/multiarch/memset_chk.S (__memset_chk): + Likewise. + +(cherry picked from commit 4cb334c4d6249686653137ec273d081371b3672d) +--- + ChangeLog | 21 +++++++++++++++++++++ + sysdeps/x86/cpu-features.c | 6 +++++- + sysdeps/x86/cpu-features.h | 3 +++ + sysdeps/x86_64/multiarch/memcpy.S | 2 ++ + sysdeps/x86_64/multiarch/memcpy_chk.S | 2 ++ + sysdeps/x86_64/multiarch/memmove.S | 2 ++ + sysdeps/x86_64/multiarch/memmove_chk.S | 2 ++ + sysdeps/x86_64/multiarch/mempcpy.S | 2 ++ + sysdeps/x86_64/multiarch/mempcpy_chk.S | 2 ++ + sysdeps/x86_64/multiarch/memset.S | 2 ++ + sysdeps/x86_64/multiarch/memset_chk.S | 2 ++ + 11 files changed, 45 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index dc49c78..adebc03 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,26 @@ + 2017-04-28 H.J. Lu + ++ [BZ #21396] ++ * sysdeps/x86/cpu-features.c (init_cpu_features): Set ++ Prefer_No_AVX512 if AVX512ER isn't available. ++ * sysdeps/x86/cpu-features.h (bit_arch_Prefer_No_AVX512): New. ++ (index_arch_Prefer_No_AVX512): Likewise. ++ * sysdeps/x86_64/multiarch/memcpy.S (__new_memcpy): Don't use ++ AVX512 version if Prefer_No_AVX512 is set. ++ * sysdeps/x86_64/multiarch/memcpy_chk.S (__memcpy_chk): ++ Likewise. ++ * sysdeps/x86_64/multiarch/memmove.S (__libc_memmove): Likewise. ++ * sysdeps/x86_64/multiarch/memmove_chk.S (__memmove_chk): ++ Likewise. ++ * sysdeps/x86_64/multiarch/mempcpy.S (__mempcpy): Likewise. ++ * sysdeps/x86_64/multiarch/mempcpy_chk.S (__mempcpy_chk): ++ Likewise. ++ * sysdeps/x86_64/multiarch/memset.S (memset): Likewise. ++ * sysdeps/x86_64/multiarch/memset_chk.S (__memset_chk): ++ Likewise. ++ ++2017-04-28 H.J. Lu ++ + * sysdeps/x86/cpu-features.c (init_cpu_features): Set + Prefer_No_VZEROUPPER if AVX512ER is available. + * sysdeps/x86/cpu-features.h +diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c +index 41d0be2..9afd74c 100644 +--- a/sysdeps/x86/cpu-features.c ++++ b/sysdeps/x86/cpu-features.c +@@ -225,10 +225,14 @@ init_cpu_features (struct cpu_features *cpu_features) + |= bit_arch_AVX_Fast_Unaligned_Load; + + /* Since AVX512ER is unique to Xeon Phi, set Prefer_No_VZEROUPPER +- if AVX512ER is available. */ ++ if AVX512ER is available. Don't use AVX512 to avoid lower CPU ++ frequency if AVX512ER isn't available. */ + if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER)) + cpu_features->feature[index_arch_Prefer_No_VZEROUPPER] + |= bit_arch_Prefer_No_VZEROUPPER; ++ else ++ cpu_features->feature[index_arch_Prefer_No_AVX512] ++ |= bit_arch_Prefer_No_AVX512; + + /* To avoid SSE transition penalty, use _dl_runtime_resolve_slow. + If XGETBV suports ECX == 1, use _dl_runtime_resolve_opt. */ +diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h +index 2ee8a0a..a409db6 100644 +--- a/sysdeps/x86/cpu-features.h ++++ b/sysdeps/x86/cpu-features.h +@@ -39,6 +39,7 @@ + #define bit_arch_Prefer_ERMS (1 << 19) + #define bit_arch_Use_dl_runtime_resolve_opt (1 << 20) + #define bit_arch_Use_dl_runtime_resolve_slow (1 << 21) ++#define bit_arch_Prefer_No_AVX512 (1 << 22) + + /* CPUID Feature flags. */ + +@@ -116,6 +117,7 @@ + # define index_arch_Prefer_ERMS FEATURE_INDEX_1*FEATURE_SIZE + # define index_arch_Use_dl_runtime_resolve_opt FEATURE_INDEX_1*FEATURE_SIZE + # define index_arch_Use_dl_runtime_resolve_slow FEATURE_INDEX_1*FEATURE_SIZE ++# define index_arch_Prefer_No_AVX512 FEATURE_INDEX_1*FEATURE_SIZE + + + # if defined (_LIBC) && !IS_IN (nonlib) +@@ -298,6 +300,7 @@ extern const struct cpu_features *__get_cpu_features (void) + # define index_arch_Prefer_ERMS FEATURE_INDEX_1 + # define index_arch_Use_dl_runtime_resolve_opt FEATURE_INDEX_1 + # define index_arch_Use_dl_runtime_resolve_slow FEATURE_INDEX_1 ++# define index_arch_Prefer_No_AVX512 FEATURE_INDEX_1 + + #endif /* !__ASSEMBLER__ */ + +diff --git a/sysdeps/x86_64/multiarch/memcpy.S b/sysdeps/x86_64/multiarch/memcpy.S +index 1f83ee3..af27703 100644 +--- a/sysdeps/x86_64/multiarch/memcpy.S ++++ b/sysdeps/x86_64/multiarch/memcpy.S +@@ -32,6 +32,8 @@ ENTRY(__new_memcpy) + lea __memcpy_erms(%rip), %RAX_LP + HAS_ARCH_FEATURE (Prefer_ERMS) + jnz 2f ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 1f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 1f + lea __memcpy_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/memcpy_chk.S b/sysdeps/x86_64/multiarch/memcpy_chk.S +index 5492342..8737fb9 100644 +--- a/sysdeps/x86_64/multiarch/memcpy_chk.S ++++ b/sysdeps/x86_64/multiarch/memcpy_chk.S +@@ -30,6 +30,8 @@ + ENTRY(__memcpy_chk) + .type __memcpy_chk, @gnu_indirect_function + LOAD_RTLD_GLOBAL_RO_RDX ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 1f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 1f + lea __memcpy_chk_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/memmove.S b/sysdeps/x86_64/multiarch/memmove.S +index 2021bfc..8c534e8 100644 +--- a/sysdeps/x86_64/multiarch/memmove.S ++++ b/sysdeps/x86_64/multiarch/memmove.S +@@ -30,6 +30,8 @@ ENTRY(__libc_memmove) + lea __memmove_erms(%rip), %RAX_LP + HAS_ARCH_FEATURE (Prefer_ERMS) + jnz 2f ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 1f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 1f + lea __memmove_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/memmove_chk.S b/sysdeps/x86_64/multiarch/memmove_chk.S +index 8a252ad..7870dd0 100644 +--- a/sysdeps/x86_64/multiarch/memmove_chk.S ++++ b/sysdeps/x86_64/multiarch/memmove_chk.S +@@ -29,6 +29,8 @@ + ENTRY(__memmove_chk) + .type __memmove_chk, @gnu_indirect_function + LOAD_RTLD_GLOBAL_RO_RDX ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 1f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 1f + lea __memmove_chk_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/mempcpy.S b/sysdeps/x86_64/multiarch/mempcpy.S +index 79c840d..b8b2b28 100644 +--- a/sysdeps/x86_64/multiarch/mempcpy.S ++++ b/sysdeps/x86_64/multiarch/mempcpy.S +@@ -32,6 +32,8 @@ ENTRY(__mempcpy) + lea __mempcpy_erms(%rip), %RAX_LP + HAS_ARCH_FEATURE (Prefer_ERMS) + jnz 2f ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 1f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 1f + lea __mempcpy_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/mempcpy_chk.S b/sysdeps/x86_64/multiarch/mempcpy_chk.S +index 6927962..072b22c 100644 +--- a/sysdeps/x86_64/multiarch/mempcpy_chk.S ++++ b/sysdeps/x86_64/multiarch/mempcpy_chk.S +@@ -30,6 +30,8 @@ + ENTRY(__mempcpy_chk) + .type __mempcpy_chk, @gnu_indirect_function + LOAD_RTLD_GLOBAL_RO_RDX ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 1f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 1f + lea __mempcpy_chk_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/memset.S b/sysdeps/x86_64/multiarch/memset.S +index c958b2f..9d33118 100644 +--- a/sysdeps/x86_64/multiarch/memset.S ++++ b/sysdeps/x86_64/multiarch/memset.S +@@ -41,6 +41,8 @@ ENTRY(memset) + jnz L(AVX512F) + lea __memset_avx2_unaligned(%rip), %RAX_LP + L(AVX512F): ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 2f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 2f + lea __memset_avx512_no_vzeroupper(%rip), %RAX_LP +diff --git a/sysdeps/x86_64/multiarch/memset_chk.S b/sysdeps/x86_64/multiarch/memset_chk.S +index 79eaa37..7e08311 100644 +--- a/sysdeps/x86_64/multiarch/memset_chk.S ++++ b/sysdeps/x86_64/multiarch/memset_chk.S +@@ -38,6 +38,8 @@ ENTRY(__memset_chk) + jnz L(AVX512F) + lea __memset_chk_avx2_unaligned(%rip), %RAX_LP + L(AVX512F): ++ HAS_ARCH_FEATURE (Prefer_No_AVX512) ++ jnz 2f + HAS_ARCH_FEATURE (AVX512F_Usable) + jz 2f + lea __memset_chk_avx512_no_vzeroupper(%rip), %RAX_LP +-- +2.7.4.GIT + + diff --git a/srcpkgs/glibc/patches/glibc-upstream-15.patch b/srcpkgs/glibc/patches/glibc-upstream-15.patch new file mode 100644 index 0000000000..b1f941ac20 --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-upstream-15.patch @@ -0,0 +1,89 @@ +From ccb4fd7a657b0fbc4890c98f4586d58a135fc583 Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Tue, 14 Mar 2017 14:16:13 -0300 +Subject: [PATCH 15] Fix i686 memchr overflow calculation (BZ#21182) + +This patch fixes the regression added by 23d2770 for final address +overflow calculation. The subtraction of the considered size (16) +at line 120 is at wrong place, for sizes less than 16 subsequent +overflow check will not take in consideration an invalid size (since +the subtraction will be negative). Also, the lea instruction also +does not raise the carry flag (CF) that is used in subsequent jbe +to check for overflow. + +The fix is to follow x86_64 logic from 3daef2c where the overflow +is first check and a sub instruction is issued. In case of resulting +negative size, CF will be set by the sub instruction and a NULL +result will be returned. The patch also add similar tests reported +in bug report. + +Checked on i686-linux-gnu and x86_64-linux-gnu. + + * string/test-memchr.c (do_test): Add BZ#21182 checks for address + near end of a page. + * sysdeps/i386/i686/multiarch/memchr-sse2.S (__memchr): Fix + overflow calculation. + +Cherry-pick of 3abeeec5f46ff036bd9df60bb096e20314ccd078. +--- + ChangeLog | 8 ++++++++ + string/test-memchr.c | 6 ++++++ + sysdeps/i386/i686/multiarch/memchr-sse2.S | 2 +- + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index adebc03..ac19e98 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,11 @@ ++2017-05-01 Adhemerval Zanella ++ ++ [BZ# 21182] ++ * string/test-memchr.c (do_test): Add BZ#21182 checks for address ++ near end of a page. ++ * sysdeps/i386/i686/multiarch/memchr-sse2.S (__memchr): Fix ++ overflow calculation. ++ + 2017-04-28 H.J. Lu + + [BZ #21396] +diff --git a/string/test-memchr.c b/string/test-memchr.c +index d62889f..6431605 100644 +--- a/string/test-memchr.c ++++ b/string/test-memchr.c +@@ -208,6 +208,12 @@ test_main (void) + do_test (0, i, i + 1, i + 1, 0); + } + ++ /* BZ#21182 - wrong overflow calculation for i686 implementation ++ with address near end of the page. */ ++ for (i = 2; i < 16; ++i) ++ /* page_size is in fact getpagesize() * 2. */ ++ do_test (page_size / 2 - i, i, i, 1, 0x9B); ++ + do_random_tests (); + return ret; + } +diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S +index 910679c..e41f324 100644 +--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S ++++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S +@@ -117,7 +117,6 @@ L(crosscache): + + # ifndef USE_AS_RAWMEMCHR + jnz L(match_case2_prolog1) +- lea -16(%edx), %edx + /* Calculate the last acceptable address and check for possible + addition overflow by using satured math: + edx = ecx + edx +@@ -125,6 +124,7 @@ L(crosscache): + add %ecx, %edx + sbb %eax, %eax + or %eax, %edx ++ sub $16, %edx + jbe L(return_null) + lea 16(%edi), %edi + # else +-- +2.7.4.GIT + diff --git a/srcpkgs/glibc/patches/revert-memchr-i686.patch b/srcpkgs/glibc/patches/revert-memchr-i686.patch deleted file mode 100644 index da5de426a7..0000000000 --- a/srcpkgs/glibc/patches/revert-memchr-i686.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S -index dd316486e6..c035329ece 100644 ---- a/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S -+++ b/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S -@@ -149,15 +149,9 @@ L(crosscache): - .p2align 4 - L(unaligned_no_match): - # ifndef USE_AS_RAWMEMCHR -- /* Calculate the last acceptable address and check for possible -- addition overflow by using satured math: -- edx = ecx + edx -- edx |= -(edx < ecx) */ -- add %ecx, %edx -- sbb %eax, %eax -- or %eax, %edx - sub $16, %edx -- jbe L(return_null) -+ add %ecx, %edx -+ jle L(return_null) - add $16, %edi - # else - add $16, %edx -diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S -index 910679cfc0..f1a11b5c67 100644 ---- a/sysdeps/i386/i686/multiarch/memchr-sse2.S -+++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S -@@ -118,14 +118,8 @@ L(crosscache): - # ifndef USE_AS_RAWMEMCHR - jnz L(match_case2_prolog1) - lea -16(%edx), %edx -- /* Calculate the last acceptable address and check for possible -- addition overflow by using satured math: -- edx = ecx + edx -- edx |= -(edx < ecx) */ - add %ecx, %edx -- sbb %eax, %eax -- or %eax, %edx -- jbe L(return_null) -+ jle L(return_null) - lea 16(%edi), %edi - # else - jnz L(match_case1_prolog1) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 447a9fedf5..3218295f3e 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.25 -revision=3 +revision=4 bootstrap=yes short_desc="The GNU C library" maintainer="Juan RP " diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template index 89111da028..a852142803 100644 --- a/srcpkgs/glide/template +++ b/srcpkgs/glide/template @@ -1,7 +1,7 @@ # Template file for 'glide' pkgname=glide version=0.12.3 -revision=4 +revision=5 build_style=go hostmakedepends="git" depends="go" diff --git a/srcpkgs/global/template b/srcpkgs/global/template index 6da7a7f7c9..de2e1f7727 100644 --- a/srcpkgs/global/template +++ b/srcpkgs/global/template @@ -1,9 +1,10 @@ # Template file for 'global' pkgname=global -version=6.5.6 +version=6.5.7 revision=1 build_style=gnu-configure -configure_args="--disable-static --with-exuberant-ctags=/usr/bin/ctags" +configure_args="--disable-static --with-exuberant-ctags=/usr/bin/ctags + ac_cv_posix1_2008_realpath=yes" depends="ctags" makedepends="ncurses-devel" short_desc="Source code tagging system that works across diverse environments" @@ -11,4 +12,4 @@ maintainer="Renato Aguiar " license="GPL-3" homepage="http://www.gnu.org/software/global/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=122f9afa69a8daa0f64c12db7f02981fe573f51a163fa3829ed4f832cd281505 +checksum=d9c08fa524f9499b54241cb2d72f8a7df01453b6d5e012a63784ded08e3acd32 diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template index 97f7341769..e31cfc8d97 100644 --- a/srcpkgs/glock/template +++ b/srcpkgs/glock/template @@ -1,7 +1,7 @@ # Template file for 'docker-gen' pkgname=glock version=0.0.0.20150512 -revision=4 +revision=5 _commit=30723574b54030cef8a13e672ce287f29c59f369 wrksrc="glock-$_commit" build_style=go 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" diff --git a/srcpkgs/gmusicbrowser/template b/srcpkgs/gmusicbrowser/template index fe60bf8253..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=4 +revision=6 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" +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" 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-builder/template b/srcpkgs/gnome-builder/template index c1f6ab7ef0..0c8d75f7e0 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,6 +1,6 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.24.1 +version=3.24.2 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" @@ -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 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 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 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=" 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 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" 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 diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 9bec304f70..4c7add89e1 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,10 +1,10 @@ # 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" -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" @@ -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 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" 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 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 diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 85948c5c6d..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.1 +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=eec390d56410d9cda9b1aed85016bbe24f5eaf7e1e0db7c45d5716c2112a4a0d +checksum=5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6 build_options="gir" if [ -z "$CROSS_BUILD" ]; then 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 " 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 diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index e1cb18290f..485bd5718d 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.24.0 +version=3.24.1 revision=1 build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -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=9e2f780e061641dfd692cc82269b0cac6cce73c74ce2d8a0a5e80889ed07c17b +checksum=0a30ab4e4e8015fae707c3b38f05163299743725a36136076fce993c2b8ef651 build_options="gir" if [ -z "$CROSS_BUILD" ]; then 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" 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 6d20ddd412..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.2.0 +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="ef9f12de50b6a4cbb9da5fe9300128b9cb4b57b490ba432ce0acefa70150c353 - 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 } 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 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 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 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 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" 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 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" 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 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" +} 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 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 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 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 diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template index 4175ba25c2..6bb6451e5d 100644 --- a/srcpkgs/go-bindata/template +++ b/srcpkgs/go-bindata/template @@ -1,7 +1,7 @@ # Template file for 'go-bindata' pkgname=go-bindata version=3.0.7.20151023 -revision=4 +revision=5 _commit=a0ff2567cfb70903282db057e799fd826784d41d wrksrc="$pkgname-$_commit" build_style=go 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..db8fa5b3b6 100644 --- a/srcpkgs/go-ipfs/template +++ b/srcpkgs/go-ipfs/template @@ -1,6 +1,6 @@ # Template file for 'go-ipfs' pkgname=go-ipfs -version=0.4.8 +version=0.4.9 revision=2 create_wrksrc=yes build_wrksrc=${pkgname}-${version} @@ -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}" diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template index ed39874498..ab4a5d83bb 100644 --- a/srcpkgs/go-jira/template +++ b/srcpkgs/go-jira/template @@ -1,7 +1,7 @@ # Template file for 'go-jira' pkgname=go-jira -version=0.1.13 -revision=1 +version=0.1.14 +revision=2 build_style=go hostmakedepends="git-perl" short_desc="Simple jira command line client in Go" @@ -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 diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 4a86e6a113..01e774ef6d 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,8 +1,8 @@ # Template file for 'go' pkgname=go _bootstrap_version=1.4.2 -version=1.8.1 -revision=1 +version=1.8.3 +revision=2 wrksrc=go hostmakedepends="git ca-certificates" short_desc="The Go Programming Language" @@ -12,7 +12,7 @@ license="BSD" distfiles="http://golang.org/dl/go${_bootstrap_version}.src.tar.gz http://golang.org/dl/go${version}.src.tar.gz" checksum="299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b - 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57" + 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6" nostrip=yes noverifyrdeps=yes diff --git a/srcpkgs/goat/template b/srcpkgs/goat/template index 655150434a..b6a5c6e140 100644 --- a/srcpkgs/goat/template +++ b/srcpkgs/goat/template @@ -1,7 +1,7 @@ # Template file for 'goat' pkgname=goat version=0.0.0.28022016 -revision=2 +revision=3 build_style=go _commit=2184ebe13497ec587e6f48b9381883285fa0071c hostmakedepends="git" diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template index 4fe5736e34..86bd54b681 100644 --- a/srcpkgs/gogs/template +++ b/srcpkgs/gogs/template @@ -1,7 +1,7 @@ # Template build file for 'gogs' pkgname=gogs version=0.9.113 -revision=4 +revision=5 build_style=go go_import_path="github.com/gogits/gogs" short_desc="Self-hosted Git Service in Go" 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" diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index e87c66ccd2..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.81 +_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=baf2e0aa0727635ab086d3912a8974557d2fad8713870ac94f8deeccb292fbdc +checksum=2d1eed9be2687c0b393699381d1a93bf8913a50eaf8df6b4596e3bfc4b15dd6d do_extract() { mkdir -p ${DESTDIR} diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template index a20f2a17c9..5ac674cc60 100644 --- a/srcpkgs/gopass/template +++ b/srcpkgs/gopass/template @@ -1,7 +1,7 @@ # Template file for 'gopass' pkgname=gopass -version=1.0.2 -revision=2 +version=1.1.0 +revision=3 build_style=go go_import_path="github.com/justwatchcom/gopass" depends="gnupg2 git" @@ -10,7 +10,7 @@ maintainer="Dominic Monroe " license="MIT" homepage="https://www.justwatch.com/gopass/" distfiles="https://github.com/justwatchcom/gopass/archive/v${version}.tar.gz" -checksum=aeab11850dd6956e5680150c070fc142f043631738d66f3e3c1bdcbf03682bda +checksum=a8bb1ab4f0686279c09930f4ee9d57d0ea805cd0d29647fbc39c4b4f304338b3 post_install() { vlicense LICENSE diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template index 221887eee8..c07abcded7 100644 --- a/srcpkgs/gopm/template +++ b/srcpkgs/gopm/template @@ -1,7 +1,7 @@ # Template build file for 'gopm' pkgname=gopm version=0.7.2.20150801 -revision=6 +revision=7 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d wrksrc="${pkgname}-${_commit}" build_style=go diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template index ad9b447d2a..485a1256b9 100644 --- a/srcpkgs/gosh/template +++ b/srcpkgs/gosh/template @@ -1,7 +1,7 @@ # Template file for 'gosh' pkgname=gosh version=0.2.3 -revision=4 +revision=5 build_style=go go_import_path="github.com/mkouhei/gosh" short_desc="Interactive shell for Golang" 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..9f676c71a4 --- /dev/null +++ b/srcpkgs/gosu/template @@ -0,0 +1,30 @@ +# Template file for 'gosu' +pkgname=gosu +version=0.12.0 +revision=1 +build_style=cmake +build_wrksrc=cmake +hostmakedepends="pkg-config" +makedepends="libopenal-devel libsndfile-devel mpg123-devel pango-devel + SDL2_ttf-devel" +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 +} + +gosu-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/share/pkgconfig + vmove usr/share/Gosu + vmove "usr/lib/*.so" + } +} diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template index 02b94e5319..72b2e3ca50 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=2 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 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 diff --git a/srcpkgs/grc/patches/install.sh.patch b/srcpkgs/grc/patches/install.sh.patch deleted file mode 100644 index f2991fedc2..0000000000 --- a/srcpkgs/grc/patches/install.sh.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- install.sh 2013-06-30 16:35:13.000000000 +0200 -+++ install.sh 2014-12-17 19:46:12.973707189 +0100 -@@ -12,3 +12,5 @@ - cp -fv conf.* $LIBDIR - mkdir -p $CONFDIR || true - cp -fv grc.conf $CONFDIR -+mkdir -p $MANDIR || true -+cp -fv {grcat,grc}.1 $MANDIR diff --git a/srcpkgs/grc/template b/srcpkgs/grc/template index d971d14627..4fa5ad6379 100644 --- a/srcpkgs/grc/template +++ b/srcpkgs/grc/template @@ -1,19 +1,26 @@ # Template build file for 'grc'. pkgname=grc -version=1.9 -revision=2 +version=1.11.1 +revision=1 +noarch=yes +conf_files="/etc/${pkgname}.conf" +depends="python" short_desc="Colouriser for logfiles and output of commands" homepage="http://korpus.juls.savba.sk/~garabik/software/grc.html" license="GPL-2" maintainer="Georg Schabel " - distfiles="https://github.com/garabik/grc/archive/v${version}.tar.gz" -checksum=269ab717dc105c124f6eb48b4b8d3ab68660c0f1244eaea140f0188cb9af4b80 -depends="python" -noarch="yes" -conf_files="/etc/${pkgname}.conf" +checksum=9ae4bcc9186d6856e861d5b0e29b7b14db3f14e6b643e2df0076c104a94dbcba do_install() { - ./install.sh ${DESTDIR} - vinstall ${FILESDIR}/conf.socklog 644 usr/share/grc + vbin grc + vbin grcat + vman grc.1 + vman grcat.1 + vconf grc.conf + vmkdir usr/share/grc + vcopy colourfiles/conf.* usr/share/grc + vcopy grc.zsh usr/share/grc + vcopy grc.fish usr/share/grc + vcopy grc.bashrc usr/share/grc } 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" 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 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() { 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" 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/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/fix-musl.patch b/srcpkgs/gsoap/patches/fix-musl.patch new file mode 100644 index 0000000000..bb9f2c0f4d --- /dev/null +++ b/srcpkgs/gsoap/patches/fix-musl.patch @@ -0,0 +1,32 @@ +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. +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 +@@ -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/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/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" 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 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.*" 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.*" diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index b98da96611..158dfb10f7 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,21 +1,20 @@ # 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}" 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 " 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 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*) 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.*" diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 2767f24af5..97d6279009 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=2 wrksrc="${pkgname/1/}-${version}" lib32disabled=yes build_style=gnu-configure @@ -13,23 +12,16 @@ 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 libvpx-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 " license="GPL-2, LGPL-2.1" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966 - -case "$XBPS_TARGET_MACHINE" in - armv6*) # libvpx can't be built for armv6l - ;; - *) makedepends+=" libvpx-devel" - ;; -esac +checksum=11b73cfff1b315a8e9be1756435ea84937e7cb90afbab0e8e6975367dbfb8534 pre_configure() { NOCONFIGURE=1 ./autogen.sh 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.*" 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";; 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.*" 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 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.*" diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 9d4b2d53b8..3ef6beafe5 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,8 +1,7 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 -reverts="1:1.4.5_2" -version=1.10.4 -revision=1 +version=1.12.0 +revision=2 lib32disabled=yes wrksrc="${pkgname/1/}-${version}" build_style=gnu-configure @@ -10,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)" @@ -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 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.*" 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" 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 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 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].*" 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-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 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.*" 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" 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 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" 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 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 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" diff --git a/srcpkgs/gxkb/template b/srcpkgs/gxkb/template new file mode 100644 index 0000000000..b34c3a4d35 --- /dev/null +++ b/srcpkgs/gxkb/template @@ -0,0 +1,17 @@ +# Template file for 'gxkb' +pkgname=gxkb +version=0.7.9 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkg-config" +makedepends="libxklavier-devel libwnck2-devel" +short_desc="Lightweight GTK+2 X11 keyboard layout indicator and switcher" +maintainer="Ivan Kozak " +license="GPL-2" +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 +} 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" 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" 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 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 diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template index 043d822aec..035aaf9072 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.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="6f181b5d8f061a7679c8d394676201d23be363f4612fd0c93f908e7792591ed3" +checksum=a3d3fbffd9b6a0761ec7172efe5a21ea02448169e95b2704c5110e3409ed9bee nopie=yes # network-2.6.3.1 build fails with a relocation post_install() { diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template index bb0f5e214f..d43b61ca43 100644 --- a/srcpkgs/hooktftp/template +++ b/srcpkgs/hooktftp/template @@ -1,7 +1,7 @@ # Template file for 'hooktftp' pkgname=hooktftp version=1.0.0 -revision=2 +revision=3 _gitcommit="a7258310669522806b903c9ffc98ad7c62b02d56" wrksrc="${pkgname}-${_gitcommit}" hostmakedepends="go bzr git" 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" 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" diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template index da59d61de0..3a6d5d27a1 100644 --- a/srcpkgs/htop/template +++ b/srcpkgs/htop/template @@ -1,7 +1,7 @@ # Template file for 'htop' pkgname=htop version=2.0.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-unicode --enable-cgroup --enable-taskstats" hostmakedepends="python" diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template index 308f1de29e..37dcf1fd06 100644 --- a/srcpkgs/httpstat/template +++ b/srcpkgs/httpstat/template @@ -1,7 +1,7 @@ # Template file for 'httpstat' pkgname=httpstat version=1.0.0 -revision=4 +revision=5 build_style=go go_import_path="github.com/davecheney/httpstat" hostmakedepends="git" 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() { diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template index aa3513a2a3..e05931ec5e 100644 --- a/srcpkgs/hub/template +++ b/srcpkgs/hub/template @@ -1,7 +1,7 @@ # Template file for 'hub' pkgname=hub version=2.2.9 -revision=4 +revision=5 build_style=go go_import_path="github.com/github/hub" hostmakedepends="git" diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template index 14516cc3d9..db8b32ae00 100644 --- a/srcpkgs/hugo/template +++ b/srcpkgs/hugo/template @@ -1,7 +1,7 @@ # Template file for 'hugo' pkgname=hugo -version=0.20.6 -revision=1 +version=0.21 +revision=2 build_style=go hostmakedepends="git-perl mercurial" depends="python-Pygments" @@ -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=0de62da92e9457523463676536b57d4cae72b434edf9dcb650264cd122dfaa52 post_install() { vlicense LICENSE.md 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" 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 " diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template index 846d4e5023..e815ff4360 100644 --- a/srcpkgs/i3lock/template +++ b/srcpkgs/i3lock/template @@ -1,6 +1,6 @@ # Template file for 'i3lock' pkgname=i3lock -version=2.8 +version=2.9 revision=1 hostmakedepends="pkg-config" makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="http://i3wm.org/i3lock/" distfiles="http://i3wm.org/i3lock/i3lock-${version}.tar.bz2" -checksum=028fc0f74df10826514d5a4ed38f6895935d1f5d47ca9fcffc64b076aaf6e2f4 +checksum=8ada0af0f8c03551ba4af138b80d4c853d8c1a88b1c96bddb85c9fcfad2da84d do_build() { sed -i 's:login:system-auth:' i3lock.pam 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" 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}/" 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" 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" 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" diff --git a/srcpkgs/indicator-doom-cpu/template b/srcpkgs/indicator-doom-cpu/template index c3785e885b..25cd68cd50 100644 --- a/srcpkgs/indicator-doom-cpu/template +++ b/srcpkgs/indicator-doom-cpu/template @@ -1,17 +1,15 @@ # Template file for 'indicator-doom-cpu' pkgname=indicator-doom-cpu -version=1.0.0 -revision=2 +version=1.0.1 +revision=1 noarch=yes -_commit=d40a3db96be2e524009c64e97c805653c359a45b -wrksrc="$pkgname-$_commit" depends="python-gobject" short_desc="CPU load indicator showing the dying face from the video game DOOM" maintainer="Andrea Brancaleoni " license="GPL-3" -homepage="https://github.com/thypon/indicator-doom-cpu" -distfiles="$homepage/archive/$_commit.tar.gz" -checksum=ab65de548c42b29830bb57d254834c3d5a909b851fc4ace909a25085ba7b277c +homepage="https://github.com/ebruck/indicator-doom-cpu" +distfiles="$homepage/archive/v$version.tar.gz" +checksum=87dcb082c5032518b2616c85967ac92cf3618b6e0276266ec413537b6256c7d5 do_install() { vinstall $pkgname 755 usr/share/indicator-doom-cpu diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template index 0b98b288f7..4d4d038eaf 100644 --- a/srcpkgs/influxdb/template +++ b/srcpkgs/influxdb/template @@ -1,7 +1,7 @@ # Template file for 'influxdb' pkgname=influxdb version=1.2.0 -revision=4 +revision=5 build_style=go hostmakedepends="git-perl mercurial" go_import_path="github.com/influxdata/influxdb" 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 diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index bafe175336..a874e60d64 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -1,6 +1,6 @@ # Template file for 'intel-ucode' pkgname=intel-ucode -version=20161104 +version=20170511 revision=1 noarch=yes create_wrksrc=yes @@ -8,8 +8,8 @@ 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" 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 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); + } + diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template index d46f273852..226c6b80a2 100644 --- a/srcpkgs/jid/template +++ b/srcpkgs/jid/template @@ -1,7 +1,7 @@ # Template file for 'jid' pkgname=jid version=0.7.2 -revision=2 +revision=3 build_style=go go_import_path="https://github.com/simeji/jid" go_package="https://github.com/simeji/jid/cmd/jid" 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 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 diff --git a/srcpkgs/kdelibs/patches/CVE-2017-8422.patch b/srcpkgs/kdelibs/patches/CVE-2017-8422.patch new file mode 100644 index 0000000000..3bc7090420 --- /dev/null +++ b/srcpkgs/kdelibs/patches/CVE-2017-8422.patch @@ -0,0 +1,164 @@ +--- kdecore/auth/AuthBackend.cpp ++++ kdecore/auth/AuthBackend.cpp +@@ -54,6 +54,11 @@ void AuthBackend::setCapabilities(AuthBackend::Capabilities capabilities) + d->capabilities = capabilities; + } + ++AuthBackend::ExtraCallerIDVerificationMethod AuthBackend::extraCallerIDVerificationMethod() const ++{ ++ return NoExtraCallerIDVerificationMethod; ++} ++ + bool AuthBackend::actionExists(const QString& action) + { + Q_UNUSED(action); +--- kdecore/auth/AuthBackend.h ++++ kdecore/auth/AuthBackend.h +@@ -43,6 +43,12 @@ public: + }; + Q_DECLARE_FLAGS(Capabilities, Capability) + ++ enum ExtraCallerIDVerificationMethod { ++ NoExtraCallerIDVerificationMethod, ++ VerifyAgainstDBusServiceName, ++ VerifyAgainstDBusServicePid, ++ }; ++ + AuthBackend(); + virtual ~AuthBackend(); + virtual void setupAction(const QString &action) = 0; +@@ -50,6 +56,7 @@ public: + virtual Action::AuthStatus authorizeAction(const QString &action) = 0; + virtual Action::AuthStatus actionStatus(const QString &action) = 0; + virtual QByteArray callerID() const = 0; ++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID) = 0; + virtual bool actionExists(const QString &action); + +--- kdecore/auth/backends/dbus/DBusHelperProxy.cpp ++++ kdecore/auth/backends/dbus/DBusHelperProxy.cpp +@@ -271,6 +271,29 @@ void DBusHelperProxy::performActions(QByteArray blob, const QByteArray &callerID + } + } + ++bool DBusHelperProxy::isCallerAuthorized(const QString &action, const QByteArray &callerID) ++{ ++ // Check the caller is really who it says it is ++ switch (BackendsManager::authBackend()->extraCallerIDVerificationMethod()) { ++ case AuthBackend::NoExtraCallerIDVerificationMethod: ++ break; ++ ++ case AuthBackend::VerifyAgainstDBusServiceName: ++ if (message().service().toUtf8() != callerID) { ++ return false; ++ } ++ break; ++ ++ case AuthBackend::VerifyAgainstDBusServicePid: ++ if (connection().interface()->servicePid(message().service()).value() != callerID.toUInt()) { ++ return false; ++ } ++ break; ++ } ++ ++ return BackendsManager::authBackend()->isCallerAuthorized(action, callerID); ++} ++ + QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArray &callerID, QByteArray arguments) + { + if (!responder) { +@@ -295,7 +318,7 @@ QByteArray DBusHelperProxy::performAction(const QString &action, const QByteArra + QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); + timer->stop(); + +- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { ++ if (isCallerAuthorized(action, callerID)) { + QString slotname = action; + if (slotname.startsWith(m_name + QLatin1Char('.'))) { + slotname = slotname.right(slotname.length() - m_name.length() - 1); +@@ -338,7 +361,7 @@ uint DBusHelperProxy::authorizeAction(const QString& action, const QByteArray& c + QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); + timer->stop(); + +- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { ++ if (isCallerAuthorized(action, callerID)) { + retVal = static_cast(Action::Authorized); + } else { + retVal = static_cast(Action::Denied); +--- kdecore/auth/backends/dbus/DBusHelperProxy.h ++++ kdecore/auth/backends/dbus/DBusHelperProxy.h +@@ -21,6 +21,7 @@ + #ifndef DBUS_HELPER_PROXY_H + #define DBUS_HELPER_PROXY_H + ++#include + #include + #include "HelperProxy.h" + #include "kauthactionreply.h" +@@ -28,7 +29,7 @@ + namespace KAuth + { + +-class DBusHelperProxy : public HelperProxy ++class DBusHelperProxy : public HelperProxy, protected QDBusContext + { + Q_OBJECT + Q_INTERFACES(KAuth::HelperProxy) +@@ -73,6 +74,9 @@ signals: + + private slots: + void remoteSignalReceived(int type, const QString &action, QByteArray blob); ++ ++private: ++ bool isCallerAuthorized(const QString &action, const QByteArray &callerID); + }; + + } // namespace Auth +--- kdecore/auth/backends/policykit/PolicyKitBackend.cpp ++++ kdecore/auth/backends/policykit/PolicyKitBackend.cpp +@@ -78,6 +78,11 @@ QByteArray PolicyKitBackend::callerID() const + return a; + } + ++AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const ++{ ++ return VerifyAgainstDBusServicePid; ++} ++ + bool PolicyKitBackend::isCallerAuthorized(const QString &action, QByteArray callerID) + { + QDataStream s(&callerID, QIODevice::ReadOnly); +--- kdecore/auth/backends/policykit/PolicyKitBackend.h ++++ kdecore/auth/backends/policykit/PolicyKitBackend.h +@@ -40,6 +40,7 @@ public: + virtual Action::AuthStatus authorizeAction(const QString&); + virtual Action::AuthStatus actionStatus(const QString&); + virtual QByteArray callerID() const; ++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); + + private Q_SLOTS: +--- kdecore/auth/backends/polkit-1/Polkit1Backend.cpp ++++ kdecore/auth/backends/polkit-1/Polkit1Backend.cpp +@@ -163,6 +163,11 @@ QByteArray Polkit1Backend::callerID() const + return QDBusConnection::systemBus().baseService().toUtf8(); + } + ++AuthBackend::ExtraCallerIDVerificationMethod Polkit1Backend::extraCallerIDVerificationMethod() const ++{ ++ return VerifyAgainstDBusServiceName; ++} ++ + bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) + { + PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); +--- kdecore/auth/backends/polkit-1/Polkit1Backend.h ++++ kdecore/auth/backends/polkit-1/Polkit1Backend.h +@@ -48,6 +48,7 @@ public: + virtual Action::AuthStatus authorizeAction(const QString&); + virtual Action::AuthStatus actionStatus(const QString&); + virtual QByteArray callerID() const; ++ virtual ExtraCallerIDVerificationMethod extraCallerIDVerificationMethod() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); + virtual bool actionExists(const QString& action); + diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index 8ae8321e84..9968244d49 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -1,7 +1,7 @@ # Template file for 'kdelibs' pkgname=kdelibs version=4.14.3 -revision=8 +revision=9 short_desc="KDE core libraries" maintainer="Juan RP " license="GPL-2.0, LGPL-2.1, FDL" diff --git a/srcpkgs/keepassx2/template b/srcpkgs/keepassx2/template index 52ce856537..d643ebf182 100644 --- a/srcpkgs/keepassx2/template +++ b/srcpkgs/keepassx2/template @@ -2,10 +2,10 @@ _realname="keepassx" pkgname="${_realname}2" version="2.0.3" -revision=1 +revision=2 build_style=cmake -hostmakedepends="pkg-config" -makedepends="qt-devel libgcrypt-devel zlib-devel" +hostmakedepends="pkg-config qt-devel" +makedepends="qt-devel libgcrypt-devel zlib-devel libXi-devel libXtst-devel" short_desc="A password manager to secure personal data" maintainer="Farhad Shahbazi " license="GPL-2" diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template index 034dc7a9ed..0420f25484 100644 --- a/srcpkgs/keybase/template +++ b/srcpkgs/keybase/template @@ -1,7 +1,7 @@ # Template file for 'keybase' pkgname=keybase -version=1.0.21 -revision=1 +version=1.0.22 +revision=2 wrksrc="client-${version}" build_style=go go_import_path="github.com/keybase/client" @@ -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 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 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.3 b/srcpkgs/kodi-rpi/files/swig.nojava-17.3 new file mode 120000 index 0000000000..8c28cc121c --- /dev/null +++ b/srcpkgs/kodi-rpi/files/swig.nojava-17.3 @@ -0,0 +1 @@ +../../kodi/files/swig.nojava-17.3 \ No newline at end of file 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/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/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/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.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/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/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/template b/srcpkgs/kodi-rpi/template index 21610a64cc..fc60a21f5c 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -1,16 +1,18 @@ # Template file for 'kodi-rpi' pkgname=kodi-rpi -version=16.1 -revision=5 +version=17.3 +revision=1 +build_style=cmake 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=1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 +build_wrksrc=project/cmake nopie=yes only_for_archs="armv6l armv6l-musl armv7l armv7l-musl" @@ -18,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 @@ -27,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. @@ -48,66 +65,56 @@ 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 < +#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*)"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"); + + // 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.3/AddonModuleXbmc.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.xml new file mode 100644 index 0000000000..e383a53a2b --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmc.i.xml @@ -0,0 +1,7917 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcaddon.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcaddon.i.cpp new file mode 100644 index 0000000000..f3d86aac50 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/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*)"Fri May 26 08:00:57 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.3/AddonModuleXbmcaddon.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcaddon.i.xml new file mode 100644 index 0000000000..d44bb4f852 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcaddon.i.xml @@ -0,0 +1,1010 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcgui.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcgui.i.cpp new file mode 100644 index 0000000000..c966c369d2 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/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*)"Fri May 26 08:01:05 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.3/AddonModuleXbmcgui.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcgui.i.xml new file mode 100644 index 0000000000..72a0401309 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcgui.i.xml @@ -0,0 +1,27851 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcplugin.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcplugin.i.cpp new file mode 100644 index 0000000000..994f08674f --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/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*)"Fri May 26 08:01:15 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.3/AddonModuleXbmcplugin.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcplugin.i.xml new file mode 100644 index 0000000000..828da0186a --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcplugin.i.xml @@ -0,0 +1,2077 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcvfs.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcvfs.i.cpp new file mode 100644 index 0000000000..3f953482af --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/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*)"Fri May 26 08:01:19 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.3/AddonModuleXbmcvfs.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcvfs.i.xml new file mode 100644 index 0000000000..11cfd492c7 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcvfs.i.xml @@ -0,0 +1,1804 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcwsgi.i.cpp b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcwsgi.i.cpp new file mode 100644 index 0000000000..caa4621371 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/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*)"Fri May 26 08:00:54 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.3/AddonModuleXbmcwsgi.i.xml b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcwsgi.i.xml new file mode 100644 index 0000000000..dc886282d5 --- /dev/null +++ b/srcpkgs/kodi/files/swig.nojava-17.3/AddonModuleXbmcwsgi.i.xml @@ -0,0 +1,2254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..127a70f105 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,21 +1,22 @@ # Template file for 'kodi' pkgname=kodi -version=16.1 -revision=7 +version=17.3 +revision=1 +build_style=cmake 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=1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 +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 diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template index 5cdf6d5fad..2bcaac4566 100644 --- a/srcpkgs/kubernetes/template +++ b/srcpkgs/kubernetes/template @@ -1,7 +1,7 @@ # Template file for 'kubernetes' pkgname=kubernetes -version=1.6.2 -revision=1 +version=1.6.4 +revision=2 build_style=go nocross=yes only_for_archs="x86_64 x86_64-musl" @@ -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=8042628d49fd8d2382ad487a08b89d68b72d3dbaf24c1cc7c452ae7c72e9c0b9 system_accounts="kube" make_dirs="/var/lib/kubelet 0755 kube kube" conf_files="/etc/kubernetes/*" diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template new file mode 100644 index 0000000000..8dcae92e71 --- /dev/null +++ b/srcpkgs/kurly/template @@ -0,0 +1,17 @@ +# Template file for 'kurly' +pkgname=kurly +version=1.0.0 +revision=2 +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 +} 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 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 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 3416f8bc6b..c406d41239 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ # Template build file for 'libGL'. pkgname=libGL -version=17.0.5 +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=668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe +checksum=aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" @@ -59,6 +59,15 @@ armv[67]l*) configure_args+=" --disable-xa" ;; esac +if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then + case "$XBPS_TARGET_MACHINE" in + armv[5-6]*) + # Enable MISSING_64BIT_ATOMICS for armv6* + CFLAGS+=" -DMISSING_64BIT_ATOMICS=1" + CXXFLAGS+=" -DMISSING_64BIT_ATOMICS=1" + ;; + esac +fi # -devel must be the last one for proper order. subpackages+=" MesaLib-devel" @@ -77,10 +86,20 @@ 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 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() { diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template index 037e3430be..fec6a7d3cb 100644 --- a/srcpkgs/libass/template +++ b/srcpkgs/libass/template @@ -1,6 +1,6 @@ # Template build file for 'libass. pkgname=libass -version=0.13.6 +version=0.13.7 revision=1 build_style=gnu-configure hostmakedepends="automake libtool yasm pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="https://github.com/libass/libass/" license="MIT" distfiles="https://github.com/libass/libass/archive/${version}.tar.gz" -checksum=de68288397d284a955061b3ecba67152cea74d8ace6222d987dd30091b1534b7 +checksum=8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libatomic_ops/template b/srcpkgs/libatomic_ops/template index 900f9445c7..e775e16fc2 100644 --- a/srcpkgs/libatomic_ops/template +++ b/srcpkgs/libatomic_ops/template @@ -1,8 +1,7 @@ # Template file for 'libatomic_ops' pkgname=libatomic_ops -version=7.4.4 +version=7.4.6 revision=1 -wrksrc="${pkgname}-${version/e/}" build_style=gnu-configure configure_args="--enable-shared --enable-static" hostmakedepends="automake libtool" @@ -10,8 +9,8 @@ short_desc="Provides semi-portable access to hardware provided atomic memory ope maintainer="Juan RP " license="GPL-2, MIT" homepage="https://github.com/ivmai/libatomic_ops" -distfiles="http://www.ivmaisoft.com/_bin/atomic_ops/${pkgname}-${version}.tar.gz" -checksum=bf210a600dd1becbf7936dd2914cf5f5d3356046904848dcfd27d0c8b12b6f8f +distfiles="${homepage}/releases/download/v${version}/libatomic_ops-${version}.tar.gz" +checksum=96e88ba450ae5fa10aa8e94e6b151a63ffbe47f8069574bd12da22ae80c686db pre_configure() { autoreconf -fi 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 diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template index f796dc93db..26dd576745 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 " @@ -19,6 +19,8 @@ post_configure() { for _f in $(find ${wrksrc} -name Makefile); do sed -i $_f -e "s; -O0;;" done + # Fix for gcc7 -Werror=implicit-fallthrough= + sed -i src/lib/CMXParser.cpp -e's;Fallthrough ;Fallthrough- ;' } libcdr-devel_package() { 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() { 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 \ 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" 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}" 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";; diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 5a13dbccf3..d52eb6db34 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,6 +1,6 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.80 +version=2.4.81 revision=1 build_style=gnu-configure configure_args="--enable-udev --disable-valgrind" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://dri.freedesktop.org/" license="MIT" distfiles="https://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" -checksum=a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 +checksum=8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae pre_configure() { autoreconf -fi 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" 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 } 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" 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 diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template index 4ccac821b1..725184e80d 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -1,6 +1,6 @@ # Template file for 'libfilezilla' pkgname=libfilezilla -version=0.9.1 +version=0.9.2 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -9,7 +9,7 @@ maintainer="bra1nwave " license="GPL-2" homepage="https://lib.filezilla-project.org/" distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=18b2391771f330cccab2c55a66197b9098f236e616f26f86326795b900913b1a +checksum=c162e8a23555b3bbc707cf240b0b4122ea2975d6d8b10744325b968f656b3be3 libfilezilla-devel_package() { short_desc+=" - development files" 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" diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template index 8c4bc149af..8b7524dd62 100644 --- a/srcpkgs/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -1,16 +1,16 @@ # Template build file for 'libgcrypt'. pkgname=libgcrypt -version=1.7.6 +version=1.7.7 revision=1 build_style=gnu-configure configure_args="--enable-static --without-capabilities" makedepends="libgpg-error-devel" short_desc="GNU cryptographic library" maintainer="Juan RP " -homepage="http://www.gnupg.org" +homepage="https://www.gnupg.org" license="LGPL-2.1" distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2" -checksum=626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc +checksum=b9b85eba0793ea3e6e66b896eb031fa05e1a4517277cc9ab10816b359254cd9a libgcrypt-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" 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 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}" diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 86d0ae7c87..4ae08ae05e 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.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=6e250f537be27dfb35661bebf709b2a81b4f3bde9b4cd207871ae3627ce1eef0 +checksum=2f7727c5440502a4df46128c7b074a24744b540c300c2582a0c67f0bc2877e5d conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf 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 diff --git a/srcpkgs/libllvm3.9 b/srcpkgs/libllvm3.9 index 0d68131b9b..e4eeb1deee 120000 --- a/srcpkgs/libllvm3.9 +++ b/srcpkgs/libllvm3.9 @@ -1 +1 @@ -llvm \ No newline at end of file +llvm3.9 \ No newline at end of file diff --git a/srcpkgs/libllvm4.0 b/srcpkgs/libllvm4.0 new file mode 120000 index 0000000000..0d68131b9b --- /dev/null +++ b/srcpkgs/libllvm4.0 @@ -0,0 +1 @@ +llvm \ No newline at end of file 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" 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" diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template index 0d21048a70..57235b6156 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.55 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=0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8 libmicrohttpd-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" 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); 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" 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*" 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 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" diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index b3f0d57aee..8b6f380f09 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -1,7 +1,7 @@ # Template file for 'libopenal' pkgname=libopenal -version=1.17.2 -revision=4 +version=1.18.0 +revision=1 build_style=cmake wrksrc="openal-soft-${version}" hostmakedepends="pkg-config" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://kcat.strangesoft.net/openal.html" distfiles="http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2" -checksum=a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 +checksum=4433b1391c61a7ca36d82c946c8f0ffe410569d6437e4ce72b3547aaf966ecde pre_configure() { case "$XBPS_TARGET_MACHINE" in 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() { ( 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}" diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index eac3263a74..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=1 +revision=3 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkg-config python-devel python-Cython" @@ -13,13 +13,12 @@ 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]" - 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" + 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() { 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}" diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index 9d60ea05f6..da24c880cc 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -1,6 +1,6 @@ # Template file for 'libpwquality' pkgname=libpwquality -version=1.3.0 +version=1.4.0 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-pam --disable-python-bindings @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="https://github.com/libpwquality/libpwquality" license="GPL-2" distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" -checksum=74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a +checksum=1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b pre_configure() { autoreconf -fi 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)) 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}" 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 " 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 df865e92e8..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=6 +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}" 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" 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 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" diff --git a/srcpkgs/libtasn1/template b/srcpkgs/libtasn1/template index 6d311c8bff..1d77f0a003 100644 --- a/srcpkgs/libtasn1/template +++ b/srcpkgs/libtasn1/template @@ -1,15 +1,15 @@ # Template build file for 'libtasn1'. pkgname=libtasn1 -version=4.10 +version=4.12 revision=1 build_style=gnu-configure hostmakedepends="perl" short_desc="ASN.1 structure parser library" maintainer="Juan RP " -homepage="http://www.gnu.org/software/libtasn1/" +homepage="https://www.gnu.org/software/libtasn1/" license="GPL-3, LGPL-2.1" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02 +checksum=6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753 libtasn1-devel_package() { depends="${sourcepkg}-${version}_${revision}" 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" 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 + { diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template index ecf481431f..1937cf6e71 100644 --- a/srcpkgs/libupnp/template +++ b/srcpkgs/libupnp/template @@ -1,6 +1,6 @@ # Template file for 'libupnp' pkgname=libupnp -version=1.6.21 +version=1.6.22 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="BSD" homepage="http://pupnp.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2" -checksum=af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b +checksum=0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc pre_configure() { autoreconf -fi diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 0c90fbf90a..ce3e8e6705 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -1,7 +1,7 @@ # Template build file for 'libuv' pkgname=libuv -version=1.11.0 -revision=2 +version=1.12.0 +revision=1 wrksrc="${pkgname}-v${version}" short_desc="Multi-platform support library with a focus on asynchronous I/O" maintainer="Enno Boland " @@ -10,7 +10,7 @@ build_style="gnu-configure" hostmakedepends="automake libtool pkg-config" homepage="http://libuv.org/" distfiles="http://dist.libuv.org/dist/v${version}/libuv-v${version}.tar.gz" -checksum=0f686994dcea6cb5cd3f50e35d5fdda07211b4b3586516df7c39bdbf19acb9a7 +checksum=01730d1b5e9e278eec67394e7d44021ea318d5d29520c5aa8b65bc8a18b953c7 pre_configure() { NOCONFIGURE=1 ./autogen.sh 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. 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() { 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 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 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}" diff --git a/srcpkgs/libvirt/patches/rev-e6c3b59.patch b/srcpkgs/libvirt/patches/rev-e6c3b59.patch new file mode 100644 index 0000000000..2dc75f67fd --- /dev/null +++ b/srcpkgs/libvirt/patches/rev-e6c3b59.patch @@ -0,0 +1,196 @@ +Revert "Add ability to generate man page describing key code names & values" + +This reverts commit e6c3b59c193ec1d17d72b65d460a951227c12a72. + +diff --git a/libvirt.spec.in b/libvirt.spec.in +index b249224..78c3c28 100644 +--- a/libvirt.spec.in ++++ b/libvirt.spec.in +@@ -1777,7 +1777,6 @@ exit 0 + %{_mandir}/man8/libvirtd.8* + %{_mandir}/man8/virtlogd.8* + %{_mandir}/man8/virtlockd.8* +-%{_mandir}/man7/virkey*.7* + + %doc examples/polkit/*.rules + +diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in +index dec799b..e088dc2 100644 +--- a/mingw-libvirt.spec.in ++++ b/mingw-libvirt.spec.in +@@ -259,7 +259,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh + %{mingw32_mandir}/man1/virt-admin.1* + %{mingw32_mandir}/man1/virt-xml-validate.1* + %{mingw32_mandir}/man1/virt-pki-validate.1* +-%{mingw32_mandir}/man7/virkey*.7* + + %files -n mingw32-libvirt-static + %{mingw32_libdir}/libvirt.a +@@ -344,7 +343,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh + %{mingw64_mandir}/man1/virt-admin.1* + %{mingw64_mandir}/man1/virt-xml-validate.1* + %{mingw64_mandir}/man1/virt-pki-validate.1* +-%{mingw64_mandir}/man7/virkey*.7* + + %files -n mingw64-libvirt-static + %{mingw64_libdir}/libvirt.a +diff --git a/src/Makefile.am b/src/Makefile.am +index f68fc1d..ebe822d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,8 +52,6 @@ AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \ + $(MINGW_EXTRA_LDFLAGS) \ + $(NULL) + +-POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" +- + EXTRA_DIST = $(conf_DATA) + + BUILT_SOURCES = +@@ -221,36 +219,6 @@ util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > $@-tmp && \ + mv $@-tmp $@ || rm -f $@-tmp + +-util/virkeycode-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \ +- $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am +- $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycode-,,' \ +- -e 's,\.pod,,'` && \ +- $(MKDIR_P) util/ && \ +- $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ +- --lang pod --varname "Key code values for $$NAME" code-docs \ +- $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ +- $@-tmp && mv $@-tmp $@ || rm $@-tmp +- +-util/virkeyname-%.pod: $(srcdir)/keycodemapdb/data/keymaps.csv \ +- $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am +- $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeyname-,,' \ +- -e 's,\.pod,,'` && \ +- $(MKDIR_P) util/ && \ +- $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ +- --lang pod --varname "Key name values for $$NAME" name-docs \ +- $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ +- $@-tmp && mv $@-tmp $@ || rm $@-tmp +- +-util/virkey%.7: util/virkey%.pod +- $(AM_V_GEN)$(POD2MAN) --section=7 $< $@-t1 && \ +- if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ +- sed \ +- -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ +- -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ +- < $@-t1 > $@-t2 && \ +- rm -f $@-t1 && \ +- mv $@-t2 $@ +- + KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb + KEYNAMES = linux osx win32 + +@@ -259,16 +227,9 @@ KEYTABLES = \ + $(KEYNAMES:%=util/virkeynametable_%.h) \ + $(NULL) + +-KEYPODS = $(KEYCODES:%=util/virkeycode-%.pod) \ +- $(KEYNAMES:%=util/virkeyname-%.pod) +-KEYMANS = $(KEYPODS:%.pod=%.7) +- +-man7_MANS = $(KEYMANS) +- + UTIL_SOURCES += $(KEYTABLES) + BUILT_SOURCES += $(KEYTABLES) + MAINTAINERCLEANFILES += $(KEYTABLES) +-CLEANFILES += $(KEYMANS) $(KEYPODS) + + # Internal generic driver infrastructure + DATATYPES_SOURCES = datatypes.h datatypes.c +@@ -2873,6 +2834,8 @@ virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status + chmod a+x $@-t && \ + mv $@-t $@ + ++POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" ++ + virtlockd.8.in: locking/virtlockd.pod + $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \ + if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ +diff --git a/tools/virsh.pod b/tools/virsh.pod +index cd1f25f..3001641 100644 +--- a/tools/virsh.pod ++++ b/tools/virsh.pod +@@ -2083,15 +2083,11 @@ The numeric values are those defined by the Linux generic input + event subsystem. The symbolic names match the corresponding + Linux key constant macro names. + +-See L and L +- + =item B + + The numeric values are those defined by the original XT keyboard + controller. No symbolic names are provided + +-See L +- + =item B + + The numeric values are those defined by the AT keyboard controller, +@@ -2099,30 +2095,22 @@ set 1 (aka XT compatible set). Extended keycoes from B + may differ from extended keycodes in the B codeset. No symbolic + names are provided + +-See L +- + =item B + + The numeric values are those defined by the AT keyboard controller, + set 2. No symbolic names are provided + +-See L +- + =item B + + The numeric values are those defined by the AT keyboard controller, + set 3 (aka PS/2 compatible set). No symbolic names are provided + +-See L +- + =item B + + The numeric values are those defined by the OS-X keyboard input + subsystem. The symbolic names match the corresponding OS-X key + constant macro names + +-See L and L +- + =item B + + The numeric values are those defined by the Linux KBD device. +@@ -2130,23 +2118,17 @@ These are a variant on the original XT codeset, but often with + different encoding for extended keycodes. No symbolic names are + provided. + +-See L +- + =item B + + The numeric values are those defined by the Win32 keyboard input + subsystem. The symbolic names match the corresponding Win32 key + constant macro names + +-See L and L +- + =item B + + The numeric values are those defined by the USB HID specification + for keyboard input. No symbolic names are provided + +-See L +- + =item B + + The numeric values are those defined by the RFB extension for sending +@@ -2154,8 +2136,6 @@ raw keycodes. These are a variant on the XT codeset, but extended + keycodes have the low bit of the second byte set, instead of the high + bit of the first byte. No symbolic names are provided. + +-See L +- + =back + + B diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 64dd092c33..812c488d43 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,8 +1,9 @@ # Template file for 'libvirt' pkgname=libvirt -version=3.2.0 +version=3.3.0 revision=1 build_style=gnu-configure +patch_args="-Np1" configure_args="--without-hal --with-storage-lvm --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf --with-interface --disable-static" short_desc="The virtualization API for controlling virtualization engines" @@ -10,7 +11,7 @@ maintainer="Juan RP " homepage="https://libvirt.org" license="LGPL-2.1" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=9481a083b567a07927f239553dd70b5c0d1bff5b9b4ec61be1899981c646209e +checksum=29e00984174e33cf2183b478382c017de26860452ffee17b73871051264ebb1b # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" 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" 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 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/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/linux3.14-headers b/srcpkgs/linux3.14-headers deleted file mode 120000 index 6418b94898..0000000000 --- a/srcpkgs/linux3.14-headers +++ /dev/null @@ -1 +0,0 @@ -linux3.14 \ No newline at end of file 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 - } -} 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}" 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)' diff --git a/srcpkgs/linux4.10/template b/srcpkgs/linux4.10/template index acce101e87..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.13 +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=dab0291aeeb68ad76056aced6a9011d5dd098bf9503f5b7cea1058b0ff78d4ef +checksum=1ae7056b5b6a3fb653b065503afeb514afc870e103b0f857d0d13a6d06fd66ee nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.11/patches/iommu-amd-flush-IOTLB-for-specific-domains-only-v2.patch b/srcpkgs/linux4.11/patches/iommu-amd-flush-IOTLB-for-specific-domains-only-v2.patch new file mode 100644 index 0000000000..59167a1073 --- /dev/null +++ b/srcpkgs/linux4.11/patches/iommu-amd-flush-IOTLB-for-specific-domains-only-v2.patch @@ -0,0 +1,60 @@ +diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c +index 63cacf5..1edeebec 100644 +--- a/drivers/iommu/amd_iommu.c ++++ b/drivers/iommu/amd_iommu.c +@@ -2227,15 +2227,26 @@ static struct iommu_group *amd_iommu_device_group(struct device *dev) + + static void __queue_flush(struct flush_queue *queue) + { +- struct protection_domain *domain; +- unsigned long flags; + int idx; + +- /* First flush TLB of all known domains */ +- spin_lock_irqsave(&amd_iommu_pd_lock, flags); +- list_for_each_entry(domain, &amd_iommu_pd_list, list) +- domain_flush_tlb(domain); +- spin_unlock_irqrestore(&amd_iommu_pd_lock, flags); ++ /* First flush TLB of all domains which were added to flush queue */ ++ for (idx = 0; idx < queue->next; ++idx) { ++ struct flush_queue_entry *entry; ++ ++ entry = queue->entries + idx; ++ ++ /* ++ * There might be cases where multiple IOVA entries for the ++ * same domain are queued in the flush queue. To avoid ++ * flushing the same domain again, we check whether the ++ * flag is set or not. This improves the efficiency of ++ * flush operation. ++ */ ++ if (!entry->dma_dom->domain.already_flushed) { ++ entry->dma_dom->domain.already_flushed = true; ++ domain_flush_tlb(&entry->dma_dom->domain); ++ } ++ } + + /* Wait until flushes have completed */ + domain_flush_complete(NULL); +@@ -2289,6 +2300,8 @@ static void queue_add(struct dma_ops_domain *dma_dom, + pages = __roundup_pow_of_two(pages); + address >>= PAGE_SHIFT; + ++ dma_dom->domain.already_flushed = false; ++ + queue = get_cpu_ptr(&flush_queue); + spin_lock_irqsave(&queue->lock, flags); + +diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h +index 4de8f41..4f5519d 100644 +--- a/drivers/iommu/amd_iommu_types.h ++++ b/drivers/iommu/amd_iommu_types.h +@@ -454,6 +454,8 @@ struct protection_domain { + bool updated; /* complete domain flush required */ + unsigned dev_cnt; /* devices assigned to this domain */ + unsigned dev_iommu[MAX_IOMMUS]; /* per-IOMMU reference count */ ++ bool already_flushed; /* flag to avoid flushing the same domain again ++ in a single invocation of __queue_flush() */ + }; + + /* 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 256452fe75..8dd362d706 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.0 -version=${_distver} -revision=1 +version=4.11.3 +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=5bfd9ed52c1ccd8dcd6418646d5a78b0af501cfdcd3e0900f1918ecba1a8af97 nodebug=yes # -dbg package is generated below manually nostrip=yes diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index db567fa66c..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.59 +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=64e9523c4c7fdaf391a16dd19541bb58e39943cb2151aa0c3d15b6aeaba996ca +checksum=207bbc50aaf827d667a2762312bd6127887cc669ff7a7270b876e7102b8f84fa nocross=yes nodebug=yes 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 diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 0504a0c1e7..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.21 +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=97503749bf7997b3e55a5126080df348e74c0bb0e10ad85b1b2ec9db7e5e6c24 +checksum=51b6df767544e593e3161b0109a6a76be18bfc9d6cc1fb7fa92b48de6cff24cf nodebug=yes # -dbg package is generated below manually nostrip=yes 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" 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 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/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/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 + 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 diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index c847211d64..dfb740d7fb 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,20 +1,18 @@ # Template file for 'llvm' pkgname=llvm -version=3.9.1 +version=4.0.0 revision=2 wrksrc="llvm-${version}.src" lib32disabled=yes build_style=cmake configure_args=" -DCMAKE_BUILD_TYPE=Release + -DLLVM_INSTALL_UTILS=ON -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 +24,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,18 +51,11 @@ 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" 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 @@ -138,7 +128,7 @@ pre_configure() { } 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 +149,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 +245,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/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/llvm/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 similarity index 100% rename from srcpkgs/llvm/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch rename to srcpkgs/llvm3.9/files/patches/llvm/reverse-llvm-AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch 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" 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 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 diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 23b35d9647..d19b8077f9 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.239 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=2a806ac2f270d70effcda8b5e7eee57486146ea10159ec09581e58b0d0c82a16 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 diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template index 741df7c957..be3c7784ca 100644 --- a/srcpkgs/lsp/template +++ b/srcpkgs/lsp/template @@ -1,7 +1,7 @@ # Template file for 'lsp' pkgname=lsp version=0.2.0 -revision=1 +revision=2 build_style=go go_import_path="github.com/dborzov/lsp" hostmakedepends="git" diff --git a/srcpkgs/lua-cjson/template b/srcpkgs/lua-cjson/template new file mode 100644 index 0000000000..b270327032 --- /dev/null +++ b/srcpkgs/lua-cjson/template @@ -0,0 +1,51 @@ +# Template file for 'lua-cjson' +pkgname=lua-cjson +version=2.1.0 +revision=1 +create_wrksrc=yes +hostmakedepends="lua lua51 lua52" +makedepends="lua-devel lua51-devel lua52-devel" +depends="lua>=5.3" +short_desc="JSON support for Lua" +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() { + mv "lua-cjson-${version}" lua51 + cp -a lua51 lua52 + cp -a lua51 lua53 +} +do_build() { + 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() { + 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+=" (5.1)" + pkg_install() { + vmove usr/lib/lua/5.1 + vlicense ${wrksrc}/lua51/LICENSE + } +} +lua52-cjson_package() { + depends="lua52" + short_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 diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 8043c020ff..7cc329f84f 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.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=5e25d9d07269042abed8b18be83764bbd51541322d448bc372e8b25248b8a1b0 +checksum=6ad3e5d08a7ce1644b3cf0bd50d928b14b6a30d82eec6a5b899c2d8a55d747c6 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 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=" 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 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" 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 diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template index 9fd2b381a1..b5ecc45646 100644 --- a/srcpkgs/maim/template +++ b/srcpkgs/maim/template @@ -1,6 +1,6 @@ # Template file for 'maim' pkgname=maim -version=4.4.62 +version=5.4.63 revision=1 build_style=cmake configure_args="-DCMAKE_COMPRESS_MAN=FALSE" @@ -12,4 +12,4 @@ maintainer="Juan RP " license="GPL-3" homepage="https://github.com/naelstrof/maim" distfiles="https://github.com/naelstrof/maim/archive/v${version}.tar.gz" -checksum=21ef84fe1c1cdef82dc9cc1f734626f839f0c28fd7e898c38c98aa98a85e9622 +checksum=00753b7146348b4c0f76fb4254b3557d344d94db953b395483f1a657ebf09459 diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index f2128edf84..a02d52348e 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -1,6 +1,6 @@ # Template file for 'mame' pkgname=mame -version=0185 +version=0186 revision=1 wrksrc="mame-mame${version}" homepage="http://mamedev.org" @@ -8,7 +8,7 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" short_desc="The Multiple Arcade Machine Emulator" maintainer="Jürgen Buchmüller " license="GPL-2" -checksum=c265b43af5459ef2a2133eaf727a8f065630af31f373374c53565a89bc650e33 +checksum=d7da6f14b161c49d9471bb00af65d62255a8ba14f77032da383087ec9ef8786f hostmakedepends="perl pkg-config python automoc4" makedepends="libstdc++-devel SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel @@ -18,7 +18,9 @@ nocross=yes replaces="sdlmame>=0 sdlmess>=0" case "$XBPS_TARGET_MACHINE" in - i686*) nodebug=yes + i686*) # was: nodebug=yes + broken="https://build.voidlinux.eu/builders/i686_builder/builds/2964/steps/shell_3/logs/stdio" + ;; esac CXXFLAGS="-std=c++14 -I${XBPS_CROSS_BASE}/usr/include/lua5.3" 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 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 diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index bc2d26ffa3..43b5aea165 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb -version=10.1.22 -revision=2 +version=10.1.24 +revision=1 build_style=cmake configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -28,10 +28,10 @@ system_accounts="mysql" mysql_homedir="/var/lib/mysql" short_desc="Fast SQL database server, drop-in replacement for MySQL" maintainer="Juan RP " -homepage="http://mariadb.org/" +homepage="https://mariadb.org/" license="GPL-2" distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz" -checksum=bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce +checksum=b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e CFLAGS="-w" pre_configure() { diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template index 88181cb02b..7524dfc3c3 100644 --- a/srcpkgs/massren/template +++ b/srcpkgs/massren/template @@ -1,7 +1,7 @@ # Template file for 'massren' pkgname=massren version=1.5.1 -revision=5 +revision=6 build_style=go hostmakedepends="git-perl" short_desc="Massive renamer from command line" 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 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 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 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 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 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" 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 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 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 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 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 diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template index 73b6424c4c..68a6e3788b 100644 --- a/srcpkgs/maxima/template +++ b/srcpkgs/maxima/template @@ -1,6 +1,6 @@ # Template file for 'maxima' pkgname=maxima -version=5.39.0 +version=5.40.0 revision=1 build_style=gnu-configure configure_args="$(vopt_enable clisp) $(vopt_enable sbcl)" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://maxima.sourceforge.net/" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz" -checksum=f58ff98013fcaa37d8661b941672c38db58f982f082d6cfcca1f1b5fac7d71b3 +checksum=74fe468cd372714622a99afb6b34297589ddd80386e125d71067d3e75519f796 nopie=yes build_options="clisp sbcl" 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 diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template index 4fa97d8c59..72c1ef11e8 100644 --- a/srcpkgs/mcelog/template +++ b/srcpkgs/mcelog/template @@ -1,6 +1,6 @@ # Template file for 'mcelog' pkgname=mcelog -version=149 +version=152 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=7a903710a8ae0a031d337cc1e9e01f5353467e7f9aecea44bd50659793163022 do_build() { make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs} diff --git a/srcpkgs/mdds/template b/srcpkgs/mdds/template index 6b25b26ef2..1494cead4c 100644 --- a/srcpkgs/mdds/template +++ b/srcpkgs/mdds/template @@ -1,8 +1,8 @@ # Template file for 'mdds' pkgname=mdds -version=1.2.2 +version=1.2.3 revision=1 -_gitrev=e674d03b6ad7df83473b88ea42292aa42e68b06b +_gitrev=08aba857efa2896b202bab09bf0023c714fe6842 wrksrc="${pkgname}-${version}-${_gitrev}" build_style=gnu-configure short_desc="Collection of multi-dimensional data structures and indexing algorithms" @@ -11,7 +11,7 @@ license="MIT" homepage="https://gitlab.com/mdds/mdds" hostmakedepends="automake" distfiles="https://gitlab.com/mdds/mdds/repository/archive.tar.gz?ref=${version}>$pkgname-$version.tar.gz" -checksum=825cc1954f02e3dbc10dc36251d9fffde8f7effc332b6ac2c32223e95a5c72d7 +checksum=379b5c2cf2d73db393aedbbdb7326081e32ed7d96746eccb26d9120f9ce5719c noarch=yes pre_configure() { diff --git a/srcpkgs/mdoclint/template b/srcpkgs/mdoclint/template index 18c75111f4..3e165c6781 100644 --- a/srcpkgs/mdoclint/template +++ b/srcpkgs/mdoclint/template @@ -1,6 +1,6 @@ # Template file for 'mdoclint' pkgname=mdoclint -version=1.46 +version=1.54 revision=1 create_wrksrc=yes build_style=fetch @@ -9,10 +9,10 @@ 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 - c392be588b9a5d6c98732925b2ddad625dbb56cc112cbff7e902a34419d641b0" +distfiles="http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint?rev=1.74&content-type=text/plain>mdoclint + http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/textproc/mdoclint/files/mdoclint.1?rev=1.20&content-type=text/plain>mdoclint.1" +checksum="685d905eb95aeb8dd2c7c6fcd0f2c947693f098fc42d59792a26cd86d891c39a + be35042af3f0096099e2b8b0fae9829c3c4a028b3db0110db117f755c7424b38" noarch=yes post_extract() { 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() { 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 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 +} 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" diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 07469646a7..d16b7ff47e 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.1 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=d7d5572f5aa0797fbf2168440eaa51149df88645fe37af8b15fa660d9a8158a0 post_install() { vmkdir usr/share/man/man1 diff --git a/srcpkgs/mergerfs/patches/system-fuse.patch b/srcpkgs/mergerfs/patches/system-fuse.patch new file mode 100644 index 0000000000..39426f0ac7 --- /dev/null +++ b/srcpkgs/mergerfs/patches/system-fuse.patch @@ -0,0 +1,14 @@ +--- Makefile.orig 2017-06-04 20:12:49.459463768 +0200 ++++ Makefile 2017-06-04 20:14:04.535236799 +0200 +@@ -77,9 +77,8 @@ help: + @echo "usage: make" + @echo "make XATTR_AVAILABLE=0 - to build program without xattrs functionality (auto discovered otherwise)" + +-$(TARGET): src/version.hpp obj/obj-stamp libfuse/lib/.libs/libfuse.a $(OBJ) +- cd libfuse && make +- $(CXX) $(CFLAGS) $(OBJ) -o $@ libfuse/lib/.libs/libfuse.a -ldl $(LDFLAGS) ++$(TARGET): src/version.hpp obj/obj-stamp $(OBJ) ++ $(CXX) $(CFLAGS) $(OBJ) -o $@ -lfuse -ldl $(LDFLAGS) + + mount.mergerfs: $(TARGET) + $(LN) -fs "$<" "$@" diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index 468cd71d9c..4655337e0b 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -1,16 +1,16 @@ # Template file for 'mergerfs' pkgname="mergerfs" -version=2.20.0 -revision=1 +version=2.22.0 +revision=2 build_style=gnu-makefile makedepends="fuse-devel attr-devel" -hostmakedepends="pkg-config" +hostmakedepends="automake libtool pkg-config" short_desc="FUSE union filesystem" maintainer="xinterer " license="ISC" homepage="https://github.com/trapexit/mergerfs" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=240c3dbbeb8b40494db9c345afe3410a6e4450ca4048c7d8f8c65eb333761b2a +checksum=258de9611e7300a50708b33b0f3971496ac313ecec1ae695c92b5cd853148a75 case "$XBPS_TARGET_MACHINE" in *-musl) # Does not have pandoc 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 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" diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template index 80cd083ee3..b2ad518559 100644 --- a/srcpkgs/micro/template +++ b/srcpkgs/micro/template @@ -1,7 +1,7 @@ # Template file for 'micro' pkgname=micro -version=1.1.4 -revision=2 +version=1.2.0 +revision=1 build_style=go go_import_path="github.com/zyedidia/micro" go_package="${go_import_path}/cmd/micro" @@ -11,7 +11,7 @@ maintainer="Diogo Leal " license="MIT" homepage="https://github.com/zyedidia/micro" distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz" -checksum=54910918f9bf52b4b076fe46de8afb5fb1c6bb462f6a81414540acd4d56153e5 +checksum=108876de0d136b2ec2ffc7e2f8897338ae1f56ac5db88eff4ae1772191df03bb post_install() { vlicense LICENSE 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 diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template index 3239351f5d..8e5e6c24f5 100644 --- a/srcpkgs/minify/template +++ b/srcpkgs/minify/template @@ -1,7 +1,7 @@ # Template file for 'minify' pkgname=minify version=2.1.0 -revision=2 +revision=3 build_style=go go_import_path="github.com/tdewolff/minify" go_package="github.com/tdewolff/minify/cmd/minify" diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template index 56b0434aa9..6b655d20ac 100644 --- a/srcpkgs/minitube/template +++ b/srcpkgs/minitube/template @@ -1,17 +1,17 @@ # Template file for 'minitube' pkgname=minitube -version=2.6 +version=2.7 revision=1 build_style=qmake -hostmakedepends="qt5-tools" makedepends="qt5-devel phonon-qt5-devel qt5-script-devel qt5-declarative-devel" +hostmakedepends="qt5-tools qt5-qmake $makedepends" depends="virtual?phonon-qt5-backend desktop-file-utils hicolor-icon-theme" short_desc="A native YouTube client in Qt5" maintainer="Juan RP " license="GPL-3" homepage="http://flavio.tordini.org/minitube" distfiles="https://github.com/flaviotordini/minitube/archive/$version.tar.gz" -checksum=ae48d2af82c8fa841021f84059b2c7723c39e3efeaa7b2ad3944a4c6cb340c0e +checksum=ef330a3da1ed46da0abb64e0f1ece5c56427103a79dbfbcebadf69004f0f7468 pre_configure() { # Provided by Gottox diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch new file mode 100644 index 0000000000..dcd76d3852 --- /dev/null +++ b/srcpkgs/mit-krb5/patches/libressl.patch @@ -0,0 +1,28 @@ +--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig ++++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -191,7 +191,7 @@ + (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + /* 1.1 standardizes constructor and destructor names, renaming + * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ +@@ -3059,7 +3059,7 @@ + return retval; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + + /* + * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would +@@ -3122,6 +3122,7 @@ + + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + ++#include + /* + * Do the same decoding (except without decoding j and vparams or checking the + * sequence length) using the pre-OpenSSL-1.1 asn1_mac.h. Define an internal diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 35a6f9642f..44012f6315 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,13 +1,13 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 -version=1.14.4 -revision=3 +version=1.15.1 +revision=1 short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" homepage="http://web.mit.edu/kerberos" -distfiles="$homepage/dist/krb5/1.14/krb5-${version}.tar.gz" -checksum=03a61a4280c9161771fb39019085dbe6a57aa602080515ff93b43cd6137e0b95 +distfiles="$homepage/dist/krb5/1.15/krb5-${version}.tar.gz" +checksum=437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 build_style=gnu-configure wrksrc="krb5-${version}" 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 diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index f5fa99b0ae..aa06e8f2af 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,20 +1,19 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=11.0.0 +version=12.0.0 revision=1 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" 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 diff --git a/srcpkgs/mongo-tools/template b/srcpkgs/mongo-tools/template index 30e0ad802e..81b80c0c49 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=2 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 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\.]+)' diff --git a/srcpkgs/mongodb/template b/srcpkgs/mongodb/template index e604da77a7..3b43d12f4c 100644 --- a/srcpkgs/mongodb/template +++ b/srcpkgs/mongodb/template @@ -1,7 +1,7 @@ # Template file for 'mongodb' pkgname=mongodb version=3.4.4 -revision=1 +revision=3 wrksrc="mongodb-src-r${version}" hostmakedepends="scons" makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template index 9debb5ffaf..5c85772b9e 100644 --- a/srcpkgs/mono/template +++ b/srcpkgs/mono/template @@ -1,8 +1,8 @@ # Template file for 'mono' pkgname=mono -version=4.8.1.0 +version=5.0.1.1 revision=1 -wrksrc="mono-${version%.*}" +wrksrc="mono-${version}" lib32disabled=yes build_style=gnu-configure configure_args="--disable-system-aot" @@ -15,7 +15,7 @@ maintainer="Juan RP " homepage="http://www.mono-project.com" license="MIT, 3-clause-BSD, GPL-2, LGPL-2, MPL-1.1" distfiles="http://download.mono-project.com/sources/mono/$pkgname-$version.tar.bz2" -checksum="18cb38a670e51609c36c687ed90ad42cfedabeffd0a2dc5f7f0c46249eb8dbef" +checksum="48d6ae71d593cd01bf0f499de569359d45856cda325575e1bacb5fabaa7e9718" case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" --disable-boehm --without-sigaltstack" ;; 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" diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index d0efe4b303..a3d6a54921 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -1,7 +1,7 @@ # Template file for 'mosquitto' pkgname=mosquitto -version=1.4.11 -revision=4 +version=1.4.12 +revision=1 build_style=gnu-makefile make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl make_install_args="prefix=/usr" @@ -10,9 +10,9 @@ makedepends="libressl-devel libuuid-devel c-ares-devel libwebsockets-devel" short_desc="MQTT version 3.1/3.1.1 compatible message broker" maintainer="Lukas Braun " license="epl-v10, edl-v10" -homepage="http://mosquitto.org/" -distfiles="http://mosquitto.org/files/source/mosquitto-${version}.tar.gz" -checksum=ca47533bbc1b7c5e15d6e5d96d3efc59677f2515b6692263c34b7c48f33280c5 +homepage="http://mosquitto.org" +distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz" +checksum=b12e2353f92cb76882ce7b7bddfea022b461b38cbe6e7fb7c969d0daeb379cf7 case "$XBPS_TARGET_MACHINE" in *-musl) 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; + } 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 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 diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index a325f3090c..8638cf1e4d 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 +version=0.20.9 +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=cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7 # Package build options build_options="jack lame mpcdec pulseaudio libao wavpack" @@ -36,6 +36,7 @@ build_options_default="pulseaudio libao" pre_configure() { sed -i '/^doc_DATA =/s,doc/mpdconf.example,,' Makefile.in } + post_install() { vconf doc/mpdconf.example mpd.conf vsconf doc/mpdconf.example diff --git a/srcpkgs/mpg123/patches/fix-alsa_timeval.patch b/srcpkgs/mpg123/patches/fix-alsa_timeval.patch deleted file mode 100644 index 232aaecb6c..0000000000 --- a/srcpkgs/mpg123/patches/fix-alsa_timeval.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libout123/modules/alsa.c 2016-06-30 09:04:40.000000000 +0200 -+++ src/libout123/modules/alsa.c 2016-08-26 21:45:39.584130976 +0200 -@@ -13,6 +13,7 @@ - http://mailman.alsa-project.org/pipermail/alsa-devel/2007-June/001684.html - ... seems like the conclusion was not carried through. - */ -+#include - #define _POSIX_SOURCE - #include "out123_int.h" - #include diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template index cc946085d0..c182eb6f41 100644 --- a/srcpkgs/mpg123/template +++ b/srcpkgs/mpg123/template @@ -1,18 +1,18 @@ # Template file for 'mpg123' pkgname=mpg123 -version=1.24.0 -revision=2 +version=1.25.0 +revision=1 build_style=gnu-configure -configure_args="--with-module-suffix=.so --with-optimization=0 - --with-default-audio=alsa --enable-ipv6=yes --enable-network=yes" +configure_args="--with-optimization=0 --with-default-audio=alsa + --enable-ipv6=yes --enable-network=yes" hostmakedepends="pkg-config" -makedepends="alsa-lib-devel libltdl-devel jack-devel pulseaudio-devel sndio-devel SDL-devel" +makedepends="alsa-lib-devel jack-devel pulseaudio-devel sndio-devel SDL-devel" short_desc="Fast console MPEG audio decoder/player" maintainer="Juan RP " -homepage="http://www.mpg123.org/" -license="GPL-2, LGPL-2.1" +homepage="https://www.mpg123.org/" +license="LGPL-2.1" distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2" -checksum=55fb169a7711938f5df0497d1ffe28419fbef50011dc01d00b216379e6a2256c +checksum=552e3e1db045e00f474252917007795ac295863fc8b13891859b3382d2f24e48 case "$XBPS_TARGET_MACHINE" in # No LFS required with musl 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=" 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" diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 87b70eeb7f..60f68db742 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,8 +1,8 @@ # Template file for 'mumble' pkgname=mumble version=1.2.19 -revision=3 -hostmakedepends="pkg-config" +revision=4 +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 @@ -17,18 +17,30 @@ distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version checksum=f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 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 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 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 diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template index a76a7f96e8..93e59bc2f7 100644 --- a/srcpkgs/mutagen/template +++ b/srcpkgs/mutagen/template @@ -1,6 +1,6 @@ # Template file for 'mutagen' pkgname=mutagen -version=1.37 +version=1.38 revision=1 noarch=yes build_style=python-module @@ -12,8 +12,8 @@ short_desc="Python2 multimedia tagging library" maintainer="Juan RP " homepage="https://github.com/quodlibet/mutagen" license="GPL-2" -distfiles="${PYPI_SITE}/m/mutagen/mutagen-${version}.tar.gz" -checksum=539553d3f1ffd890c74f64b819750aef0316933d162c09798c9e7eaf334ae760 +distfiles="${PYPI_SITE}/m/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=23990f70ae678c7b8df3fd59e2adbefa5fe392c36da8c71d2254b21c6cd78766 alternatives=" mutagen:mid3cp:/usr/bin/mid3cp2 diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index cb4f628ee7..2935867371 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,6 +1,6 @@ # Template file for 'mutt' pkgname=mutt -version=1.8.2 +version=1.8.3 revision=1 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache @@ -18,7 +18,7 @@ license="GPL-2" # changelog="http://www.mutt.org/doc/UPDATING" homepage="http://www.mutt.org" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" -checksum=1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 +checksum=9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 provides="mutt-0_1" # Begin alternatives: 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' 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"); 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) + { diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index f34f366353..bfb64ae47a 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -1,15 +1,15 @@ # Template file for 'nano' pkgname=nano -version=2.8.1 +version=2.8.4 revision=1 build_style=gnu-configure makedepends="file-devel zlib-devel ncurses-devel" -short_desc="The nano text editor" +short_desc="The GNU nano text editor" 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=c7cf264f0f3e4af43ecdbc4ec72c3b1e831c69a1a5f6512d5b0c109e6bac7b11 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-DREG_STARTEND=0";; diff --git a/srcpkgs/nano/update b/srcpkgs/nano/update deleted file mode 100644 index 52b330795e..0000000000 --- a/srcpkgs/nano/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://nano-editor.org/download.php" -ignore="*pre*" 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 diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template index bf5b9a3f75..6c0c5a2eb8 100644 --- a/srcpkgs/nbd/template +++ b/srcpkgs/nbd/template @@ -1,6 +1,6 @@ # Template file for 'nbd' pkgname=nbd -version=3.15.2 +version=3.16.1 revision=1 build_style=gnu-configure configure_args="--enable-syslog --sbindir=/usr/bin" @@ -12,9 +12,9 @@ conf_files="/etc/nbd-server/config" short_desc="Network Block Device utilities" maintainer="Juan RP " license="GPL-2" -homepage="http://nbd.sourceforge.net" +homepage="https://nbd.sourceforge.io/" distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz" -checksum=0155e6fd142853ad60172906393e4329ad648656342fb7a3b35de97ce4a82c88 +checksum=e7a11b908110bc810873af661c47c01455c6b6fdbca27cd12f9c38cd513329d3 post_configure() { # skip systemd unit diff --git a/srcpkgs/ncdns/template b/srcpkgs/ncdns/template index 5ed192285d..95da6d583d 100644 --- a/srcpkgs/ncdns/template +++ b/srcpkgs/ncdns/template @@ -1,7 +1,7 @@ # Template file for 'ncdns' pkgname=ncdns version=0.0.2 -revision=4 +revision=5 build_style=go hostmakedepends="git" makedepends="libcap-devel" diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index e4bc29281c..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=4 +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" 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} } 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 diff --git a/srcpkgs/neomutt/patches/fix-doc-build.patch b/srcpkgs/neomutt/patches/fix-doc-build.patch new file mode 100644 index 0000000000..cbfc86c5be --- /dev/null +++ b/srcpkgs/neomutt/patches/fix-doc-build.patch @@ -0,0 +1,37 @@ +From 0d8ca5bd48cdfeb0d8e67bd3aa9d48aac9c4cc64 Mon Sep 17 00:00:00 2001 +From: Zero King +Date: Sat, 3 Jun 2017 14:28:31 +0000 +Subject: [PATCH] build: allow xsltproc and w3m calls to fail + +--- + doc/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git doc/Makefile.am doc/Makefile.am +index de614bbb2..663ca282e 100644 +--- doc/Makefile.am ++++ doc/Makefile.am +@@ -106,7 +106,7 @@ uninstall-local: + + check: + manual.txt: manual.html +- LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \ ++ -LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \ + LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ + LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ + +@@ -115,12 +115,12 @@ Muttrc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head + $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc + + manual.html: manual.xml $(srcdir)/html.xsl $(srcdir)/mutt.xsl $(srcdir)/mutt.css +- xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml ++ -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml + + $(CHUNKED_DOCFILES): index.html + + index.html: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl manual.xml $(srcdir)/mutt.css +- xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1 ++ -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1 + + validate: manual.xml + xmllint --noout --noblanks --postvalid $< diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 747e25ea0f..6f03f30ed3 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,6 +1,6 @@ # Template file for 'neomutt' pkgname=neomutt -version=20170428 +version=20170602 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure @@ -17,7 +17,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="http://www.neomutt.org" distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz" -checksum=c6100c6afb120b6eb2810e9acae6512fc4851ebd7fe711c5bc40b3ee29c0d306 +checksum=53762f867a8a6213ebbc65199058d476347467340bff6b56816de1b6d09ff0cf case "${XBPS_TARGET_MACHINE}" in x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";; 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 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" diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 0aa9b933c2..f173c5ed2e 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,10 +1,10 @@ # Template file for 'netpbm' pkgname=netpbm # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY -version=10.78.03 +version=10.78.04 revision=1 -_githash=d55db645b8f93b8f7f8c0cf92afcfef65454c020 -_githash_guide=2c074cfcc434e192acd0cdc2457f71b0bd7f33b4 +_githash=e8bfe183b5e504f0f30691484e9d73ea42113363 +_githash_guide=e59f4a1c8616d124898efe33eec5d0b7c1b837ca create_wrksrc=yes build_wrksrc="netpbm-mirror-${_githash}" hostmakedepends="pkg-config perl python flex" @@ -17,8 +17,8 @@ homepage="http://netpbm.sourceforge.net/" nocross=yes distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz" -checksum="e5d762798c534fdfe52bfdb52a10a03c5f2e7c50ce2f09dada5f14ed9d855f9e - 043705343ae1d6d0b3cb644dff7d92799793a28b4eedc54df656714b5524d75b" +checksum="ef8dac4d390128a53615935612265b0e6c435031dd644f7fa7fe6238d8921203 + 2edf9d639a1177e42fcc90c7a4a827f16624ba75b9c6c6fc88ca8eef01c37cf3" post_extract() { cd $build_wrksrc 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" 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 } diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template index 3e2601d2e1..3c57019949 100644 --- a/srcpkgs/nghttp2/template +++ b/srcpkgs/nghttp2/template @@ -1,6 +1,6 @@ # Template file for 'nghttp2' pkgname=nghttp2 -version=1.22.0 +version=1.23.1 revision=1 build_style=gnu-configure configure_args="--without-libxml2 --without-jemalloc --without-spdylay" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="https://nghttp2.org" distfiles="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.xz" -checksum=f14af22f14107901ea6077413f1a387948bf11cdaa4613ba361a0e3e8cacbbe7 +checksum=fb75e8c0d6cf9c4381fff242d2dc04cdcc2691af8dc125c6ca349efecf5ccc21 post_install() { rm -rf ${DESTDIR}/usr/share/man diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 73ae1c9ef4..5c871c0bbc 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,7 +1,7 @@ # Template build file for 'ngircd' pkgname=ngircd -version=23 -revision=4 +version=24 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes" hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ short_desc="Free, portable and lightweight Internet Relay Chat server" maintainer="Juan RP " license="GPL-2" distfiles="https://github.com/ngircd/ngircd/releases/download/rel-${version}/ngircd-${version}.tar.xz" -checksum=d431bdbc07401b29696b2119963dde2322052a7d8924188947fa3870a138fb6a +checksum=173fa0ea10788a8ba08ef2f7e64ea8951d7c88862e744128c8b87bae424b1008 post_configure() { echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h diff --git a/srcpkgs/ngircd/update b/srcpkgs/ngircd/update new file mode 100644 index 0000000000..7ca05c07b3 --- /dev/null +++ b/srcpkgs/ngircd/update @@ -0,0 +1,2 @@ +site="https://api.github.com/repos/ngircd/ngircd/tags" +pattern='"name"\s*:\s*"rel-\K[\d]+(?=")' 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 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 \ diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index 81e7678aa6..de97bf8ea5 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -1,7 +1,7 @@ # Template file for 'nncp' pkgname=nncp version=0.7 -revision=1 +revision=2 build_style=go short_desc="Node to Node copy, utilities for secure store-and-forward" maintainer="Leah Neukirchen " 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 diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 07c5ac09f8..c0a35335e2 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,10 +1,10 @@ # Template file for 'nodejs' pkgname=nodejs -version=7.9.0 +version=8.0.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" @@ -13,14 +13,14 @@ maintainer="Enno Boland " license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=5cc131bb16f7ca688c29634a18b3c6a7816609a431a509f31baedf7caf25d626 -# TODO: Fix cross compiling -nocross="https://api.travis-ci.org/jobs/208411830/log.txt?deansi=true" +checksum=28f2e0bd5f80ff83b244df670d577fe36c1e0f11561deee7d8bbdcbd4ead8fb2 -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" -build_options_default="libuv http_parser" +desc_option_icu="Enable shared icu" +build_options_default="libuv http_parser icu" +nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/3073/steps/shell_3/logs/stdio" replaces="iojs>=0" @@ -35,7 +35,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} diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index 4b757468b1..57cc8d2d11 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -1,6 +1,6 @@ # Template file for 'notmuch' pkgname=notmuch -version=0.24.1 +version=0.24.2 revision=1 hostmakedepends="pkg-config perl python-Sphinx" makedepends="xapian-core-devel gmime-devel talloc-devel bash-completion" @@ -9,7 +9,7 @@ maintainer="Jan S. " license="GPL-3" homepage="http://notmuchmail.org" distfiles="http://http.debian.net/debian/pool/main/n/notmuch/notmuch_${version}.orig.tar.gz" -checksum=fa117de2c6096dd896a333b9c770572a939e04a02abe6745b6b07f5363063ca3 +checksum=aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51 nocross="http://build.voidlinux.eu/builders/armv7l-musl_builder/builds/6341/steps/shell_3/logs/stdio" diff --git a/srcpkgs/npth/template b/srcpkgs/npth/template index 9aff9b5504..ed7cfac6a5 100644 --- a/srcpkgs/npth/template +++ b/srcpkgs/npth/template @@ -1,14 +1,14 @@ # Template file for 'npth' pkgname=npth -version=1.3 +version=1.5 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=294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2 npth-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/nvidia/files/kernel_4.10.patch b/srcpkgs/nvidia/files/kernel_4.10.patch deleted file mode 100644 index 07faaf947a..0000000000 --- a/srcpkgs/nvidia/files/kernel_4.10.patch +++ /dev/null @@ -1,359 +0,0 @@ ---- kernel/common/inc/nv-mm.h -+++ kernel/common/inc/nv-mm.h -@@ -46,6 +46,8 @@ - * 2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99 - */ - -+#include -+ - #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT) - #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS) - #define NV_GET_USER_PAGES get_user_pages -@@ -92,10 +94,13 @@ - pages, vmas, NULL); - - #else -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - return get_user_pages_remote(tsk, mm, start, nr_pages, flags, - pages, vmas); -- -+#else -+ return get_user_pages_remote(tsk, mm, start, nr_pages, flags, -+ pages, vmas, NULL); -+#endif - #endif - - } - ---- kernel/nvidia-drm/nvidia-drm-fence.c -+++ kernel/nvidia-drm/nvidia-drm-fence.c -@@ -31,7 +31,11 @@ - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) - struct nv_fence { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence base; -+#else -+ struct dma_fence base; -+#endif - spinlock_t lock; - - struct nvidia_drm_device *nv_dev; -@@ -51,7 +55,11 @@ nv_fence_ready_to_signal(struct nv_fence *nv_fence) - - static const char *nvidia_drm_gem_prime_fence_op_get_driver_name - ( -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence -+#else -+ struct dma_fence *fence -+#endif - ) - { - return "NVIDIA"; -@@ -59,7 +67,11 @@ static const char *nvidia_drm_gem_prime_fence_op_get_driver_name - - static const char *nvidia_drm_gem_prime_fence_op_get_timeline_name - ( -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence -+#else -+ struct dma_fence *fence -+#endif - ) - { - return "nvidia.prime"; -@@ -67,7 +79,11 @@ static const char *nvidia_drm_gem_prime_fence_op_get_timeline_name - - static bool nvidia_drm_gem_prime_fence_op_signaled - ( -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence -+#else -+ struct dma_fence *fence -+#endif - ) - { - struct nv_fence *nv_fence = container_of(fence, struct nv_fence, base); -@@ -99,7 +115,11 @@ unlock_struct_mutex: - - static bool nvidia_drm_gem_prime_fence_op_enable_signaling - ( -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence -+#else -+ struct dma_fence *fence -+#endif - ) - { - bool ret = true; -@@ -107,7 +127,11 @@ static bool nvidia_drm_gem_prime_fence_op_enable_signaling - struct nvidia_drm_gem_object *nv_gem = nv_fence->nv_gem; - struct nvidia_drm_device *nv_dev = nv_fence->nv_dev; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - if (fence_is_signaled(fence)) -+#else -+ if (dma_fence_is_signaled(fence)) -+#endif - { - return false; - } -@@ -136,7 +160,11 @@ static bool nvidia_drm_gem_prime_fence_op_enable_signaling - } - - nv_gem->fenceContext.softFence = fence; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - fence_get(fence); -+#else -+ dma_fence_get(fence); -+#endif - - unlock_struct_mutex: - mutex_unlock(&nv_dev->dev->struct_mutex); -@@ -146,7 +174,11 @@ unlock_struct_mutex: - - static void nvidia_drm_gem_prime_fence_op_release - ( -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence -+#else -+ struct dma_fence *fence -+#endif - ) - { - struct nv_fence *nv_fence = container_of(fence, struct nv_fence, base); -@@ -155,7 +187,11 @@ static void nvidia_drm_gem_prime_fence_op_release - - static signed long nvidia_drm_gem_prime_fence_op_wait - ( -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence, -+#else -+ struct dma_fence *fence, -+#endif - bool intr, - signed long timeout - ) -@@ -170,12 +206,20 @@ static signed long nvidia_drm_gem_prime_fence_op_wait - * that it should never get hit during normal operation, but not so long - * that the system becomes unresponsive. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - return fence_default_wait(fence, intr, -+#else -+ return dma_fence_default_wait(fence, intr, -+#endif - (timeout == MAX_SCHEDULE_TIMEOUT) ? - msecs_to_jiffies(96) : timeout); - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - static const struct fence_ops nvidia_drm_gem_prime_fence_ops = { -+#else -+static const struct dma_fence_ops nvidia_drm_gem_prime_fence_ops = { -+#endif - .get_driver_name = nvidia_drm_gem_prime_fence_op_get_driver_name, - .get_timeline_name = nvidia_drm_gem_prime_fence_op_get_timeline_name, - .signaled = nvidia_drm_gem_prime_fence_op_signaled, -@@ -285,7 +329,11 @@ static void nvidia_drm_gem_prime_fence_signal - bool force - ) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *fence = nv_gem->fenceContext.softFence; -+#else -+ struct dma_fence *fence = nv_gem->fenceContext.softFence; -+#endif - - WARN_ON(!mutex_is_locked(&nv_dev->dev->struct_mutex)); - -@@ -301,10 +349,18 @@ static void nvidia_drm_gem_prime_fence_signal - - if (force || nv_fence_ready_to_signal(nv_fence)) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - fence_signal(&nv_fence->base); -+#else -+ dma_fence_signal(&nv_fence->base); -+#endif - - nv_gem->fenceContext.softFence = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - fence_put(&nv_fence->base); -+#else -+ dma_fence_put(&nv_fence->base); -+#endif - - nvKms->disableChannelEvent(nv_dev->pDevice, - nv_gem->fenceContext.cb); -@@ -320,7 +376,11 @@ static void nvidia_drm_gem_prime_fence_signal - - nv_fence = container_of(fence, struct nv_fence, base); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - fence_signal(&nv_fence->base); -+#else -+ dma_fence_signal(&nv_fence->base); -+#endif - } - } - -@@ -513,7 +573,11 @@ int nvidia_drm_gem_prime_fence_init - * fence_context_alloc() cannot fail, so we do not need to check a return - * value. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - nv_gem->fenceContext.context = fence_context_alloc(1); -+#else -+ nv_gem->fenceContext.context = dma_fence_context_alloc(1); -+#endif - - ret = nvidia_drm_gem_prime_fence_import_semaphore( - nv_dev, nv_gem, p->index, -@@ -670,7 +734,11 @@ int nvidia_drm_gem_prime_fence_attach - nv_fence->nv_gem = nv_gem; - - spin_lock_init(&nv_fence->lock); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - fence_init(&nv_fence->base, &nvidia_drm_gem_prime_fence_ops, -+#else -+ dma_fence_init(&nv_fence->base, &nvidia_drm_gem_prime_fence_ops, -+#endif - &nv_fence->lock, nv_gem->fenceContext.context, - p->sem_thresh); - -@@ -680,7 +748,11 @@ int nvidia_drm_gem_prime_fence_attach - - reservation_object_add_excl_fence(&nv_gem->fenceContext.resv, - &nv_fence->base); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - fence_put(&nv_fence->base); /* Reservation object has reference */ -+#else -+ dma_fence_put(&nv_fence->base); -+#endif - - ret = 0; - ---- kernel/nvidia-drm/nvidia-drm-gem.h -+++ kernel/nvidia-drm/nvidia-drm-gem.h -@@ -29,6 +29,8 @@ - - #include "nvidia-drm-priv.h" - -+#include -+ - #include - #include "nvkms-kapi.h" - -@@ -98,7 +100,11 @@ struct nvidia_drm_gem_object - /* Software signaling structures */ - struct NvKmsKapiChannelEvent *cb; - struct nvidia_drm_gem_prime_soft_fence_event_args *cbArgs; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - struct fence *softFence; /* Fence for software signaling */ -+#else -+ struct dma_fence *softFence; -+#endif - } fenceContext; - #endif - }; - ---- kernel/nvidia-drm/nvidia-drm-priv.h -+++ kernel/nvidia-drm/nvidia-drm-priv.h -@@ -25,6 +25,8 @@ - - #include "conftest.h" /* NV_DRM_AVAILABLE */ - -+#include -+ - #if defined(NV_DRM_AVAILABLE) - - #include -@@ -34,7 +36,12 @@ - #endif - - #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - #include -+#else -+#include -+#endif -+ - #include - #endif - ---- kernel/nvidia/nv-pat.c -+++ kernel/nvidia/nv-pat.c -@@ -203,6 +203,7 @@ void nv_disable_pat_support(void) - } - - #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - static int - nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) - { -@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = { - .notifier_call = nvidia_cpu_callback, - .priority = 0 - }; -+#else -+static int nvidia_cpu_online(unsigned int hcpu) -+{ -+ unsigned int cpu = get_cpu(); -+ if (cpu == hcpu) -+ nv_setup_pat_entries(NULL); -+ else -+ NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1); -+ -+ put_cpu(); -+ -+ return 0; -+} -+ -+static int nvidia_cpu_down_prep(unsigned int hcpu) -+{ -+ unsigned int cpu = get_cpu(); -+ if (cpu == hcpu) -+ nv_restore_pat_entries(NULL); -+ else -+ NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 1); -+ -+ put_cpu(); -+ -+ return 0; -+} -+#endif -+ - #endif - - int nv_init_pat_support(nvidia_stack_t *sp) -@@ -255,7 +284,14 @@ int nv_init_pat_support(nvidia_stack_t *sp) - #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU) - if (nv_pat_mode == NV_PAT_MODE_BUILTIN) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0) -+#else -+ if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, -+ "gpu/nvidia:online", -+ nvidia_cpu_online, -+ nvidia_cpu_down_prep) != 0) -+#endif - { - nv_disable_pat_support(); - nv_printf(NV_DBG_ERRORS, -@@ -280,7 +316,11 @@ void nv_teardown_pat_support(void) - { - nv_disable_pat_support(); - #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - unregister_hotcpu_notifier(&nv_hotcpu_nfb); -+#else -+ cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN); -+#endif - #endif - } - } - diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 7315e19e7e..7cca8fbb4c 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers for linux (long-lived series)" pkgname=nvidia -version=378.13 -revision=4 +version=381.22 +revision=1 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -24,11 +24,11 @@ build_options_default="glvnd" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=05e62a6098aac7373438ee381072253a861d56522f74948c2b714e20e69a46b1 + checksum=7b7dd6ee1c871dc5367fc207bba65077c3820a683decbfe6126fc70c0d1b9d08 else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=a97a2ab047759a0b2c4abab5601e6f027230d355615ee745e24e738ee21cf5da + checksum=c2468130af124bfe748bdf2bc4c08952a81b35d2bdb87d1217717e6a576217e8 fi subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs" @@ -39,11 +39,6 @@ do_extract() { ./${_pkg}.run --extract-only rm -f ${_pkg}.run } -do_configure() { - cd ${_pkg} - # patches - patch -p0 < ${FILESDIR}/kernel_4.10.patch -} do_install() { cd ${_pkg} diff --git a/srcpkgs/nvidia340/files/linux-4.11.patch b/srcpkgs/nvidia340/files/linux-4.11.patch new file mode 100644 index 0000000000..f533f08e51 --- /dev/null +++ b/srcpkgs/nvidia340/files/linux-4.11.patch @@ -0,0 +1,108 @@ +--- kernel/nv-drm.c 2017-03-31 03:42:21.000000000 +0200 ++++ kernel/nv-drm.c 2017-04-06 23:53:14.273356795 +0200 +@@ -48,7 +48,11 @@ + return -ENODEV; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + static int nv_drm_unload( ++#else ++static void nv_drm_unload( ++#endif + struct drm_device *dev + ) + { +@@ -60,7 +60,11 @@ + { + BUG_ON(nvl->drm != dev); + nvl->drm = NULL; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + return 0; ++#else ++ return; ++#endif + } + } + +@@ -64,7 +64,11 @@ + } + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + return -ENODEV; ++#else ++ return; ++#endif + } + + static void nv_gem_free( +--- kernel/uvm/nvidia_uvm_linux.h 2017-03-31 03:42:21.000000000 +0200 ++++ kernel/uvm/nvidia_uvm_linux.h 2017-04-06 23:53:14.273356795 +0200 +@@ -124,6 +124,9 @@ + #include /* mdelay, udelay */ + + #include /* suser(), capable() replacement */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#include ++#endif + #include /* module_param() */ + #if !defined(NV_VMWARE) + #include /* flush_tlb(), flush_tlb_all() */ +@@ -362,17 +363,19 @@ + void address_space_init_once(struct address_space *mapping); + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + #if !defined(NV_FATAL_SIGNAL_PENDING_PRESENT) + static inline int __fatal_signal_pending(struct task_struct *p) + { + return unlikely(sigismember(&p->pending.signal, SIGKILL)); + } + + static inline int fatal_signal_pending(struct task_struct *p) + { + return signal_pending(p) && __fatal_signal_pending(p); + } + #endif ++#endif + + // + // Before the current->cred structure was introduced, current->euid, +--- kernel/uvm/nvidia_uvm_lite.c 2017-03-31 03:42:21.000000000 +0200 ++++ kernel/uvm/nvidia_uvm_lite.c 2017-04-06 23:53:14.273356795 +0200 +@@ -818,7 +818,11 @@ + } + + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++#else ++int _fault(struct vm_fault *vmf) ++#endif + { + unsigned long vaddr = (unsigned long)vmf->virtual_address; + struct page *page = NULL; +@@ -828,7 +828,11 @@ + struct page *page = NULL; + int retval; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + retval = _fault_common(vma, vaddr, &page, vmf->flags); ++#else ++ retval = _fault_common(NULL, vaddr, &page, vmf->flags); ++#endif + + vmf->page = page; + +@@ -866,7 +866,11 @@ + // it's dealing with anonymous mapping (see handle_pte_fault). + // + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++#else ++int _sigbus_fault(struct vm_fault *vmf) ++#endif + { + vmf->page = NULL; + return VM_FAULT_SIGBUS; diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index f0cb52bb88..b8c3089d2c 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" pkgname=nvidia340 version=340.102 -revision=3 +revision=4 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -42,6 +42,7 @@ do_configure() { cd ${_pkg} patch -p0 < ${FILESDIR}/patch_nv1.diff patch -p0 < ${FILESDIR}/4.10.0_kernel.patch + patch -p0 < ${FILESDIR}/linux-4.11.patch } do_install() { diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index eb2bfb2bce..a56b65717a 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=18.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=7945c184833ea8957d55ff81989fe693e5186d1ccfdf1d2f049412d85c456e10 +checksum=c7846e09f13061587d844588c538276aec6d498c8f9a4518fc3d8bb206776f01 obs-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template index bea2f2a884..fd6f7bac04 100644 --- a/srcpkgs/ocaml-findlib/template +++ b/srcpkgs/ocaml-findlib/template @@ -1,6 +1,6 @@ # Template file for 'ocaml-findlib' pkgname=ocaml-findlib -version=1.7.1 +version=1.7.2 revision=1 build_style=configure configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man" @@ -11,7 +11,7 @@ maintainer="John Regan " license="MIT" homepage="http://projects.camlcity.org/projects/findlib.html" distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz" -checksum=5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef +checksum=48e571d35390082d8d8a0611ae3b4e00cfcc4bf7c487b9af99302ceec1b58980 wrksrc="findlib-${version}" nocross="yes" nopie="yes" diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 8ef318be58..382fb991ff 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,7 +1,7 @@ # Template file for 'octave' pkgname=octave version=4.2.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="perl gcc-fortran pkg-config gnuplot" makedepends="pcre-devel lapack-devel readline-devel libSM-devel libltdl-devel @@ -13,8 +13,6 @@ homepage="https://gnu.org/software/octave/" distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz" checksum=80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b -export FFLAGS="-fPIC" - # Package build options # TODO: some options are still missing, such as java build_options=" @@ -74,3 +72,8 @@ makedepends+=" pre_build() { chmod +x build-aux/mk-opts.pl } +post_build() { + # Remove references to hardening -specs. + sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" \ + -i src/mkoctfile.cc libinterp/build-env.cc +} diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template index fd89e7d968..e6a5a018cc 100644 --- a/srcpkgs/offlineimap/template +++ b/srcpkgs/offlineimap/template @@ -1,6 +1,6 @@ # Template file for 'offlineimap' pkgname=offlineimap -version=7.0.14 +version=7.1.1 revision=1 noarch=yes build_style=python2-module @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://offlineimap.org/" license="GPL-2" distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz" -checksum=19494ecad4d7234ac69480abb7462d0cdcfcec444b55f5381651057d9fdfad44 +checksum=a624f8a77eae664dd458be47c5306c28911d4a1f788ff5641d7bb37e01ecb703 post_install() { make -C docs man diff --git a/srcpkgs/oniguruma/template b/srcpkgs/oniguruma/template index a05a1f9dce..3950a2bb4b 100644 --- a/srcpkgs/oniguruma/template +++ b/srcpkgs/oniguruma/template @@ -1,6 +1,6 @@ # Template build file for 'oniguruma' pkgname=oniguruma -version=6.2.0 +version=6.3.0 revision=1 build_style=gnu-configure short_desc="A multi-charset regular expressions library" @@ -8,7 +8,7 @@ maintainer="John Regan " license="2-clause-BSD" homepage="https://github.com/kkos/oniguruma" distfiles="https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz" -checksum=6561637f340c6cae468aa4df45c7a4d8525fad65495b0dcef72d749aa8733a4b +checksum=1fee95d51aa359e9a9498617358236a3c92d8213c8b3f4400a0873cf7c99e731 wrksrc="onig-${version}" post_install() { 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 + } +} diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template index 1de8625ea5..56cf4b9df1 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.51 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=27341c629637a1b6e024c405109582d476bcc7037128aa9b29a0713c5ee67e59 CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" if [ -n "$CROSS_BUILD" ]; then diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 9a599d1b1e..370afd28b9 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.15 +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=5db80981a3f87ad4a2a0c684884ad28f8c879570318dc79ba485b69e6fe77e73 pre_build() { # Replace -isystem with -I to avoid "#include_next " file not found 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}/ 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+' diff --git a/srcpkgs/openldap/patches/libressl.patch b/srcpkgs/openldap/patches/libressl.patch index 04ee8b60e1..aedba30201 100644 --- a/srcpkgs/openldap/patches/libressl.patch +++ b/srcpkgs/openldap/patches/libressl.patch @@ -1,6 +1,105 @@ ---- libraries/libldap/tls_o.c.orig 2014-07-15 18:08:35.841431410 +0200 -+++ libraries/libldap/tls_o.c 2014-07-15 18:09:10.681720371 +0200 -@@ -1128,10 +1128,11 @@ tlso_seed_PRNG( const char *randfile ) +--- libraries/libldap/tls_o.c.orig ++++ libraries/libldap/tls_o.c +@@ -47,7 +47,7 @@ + #include + #endif + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 + #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) + #endif + +@@ -62,7 +62,7 @@ static void tlso_info_cb( const SSL *ssl, int where, i + static int tlso_verify_cb( int ok, X509_STORE_CTX *ctx ); + static int tlso_verify_ok( int ok, X509_STORE_CTX *ctx ); + static int tlso_seed_PRNG( const char *randfile ); +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + /* + * OpenSSL 1.1 API and later has new locking code + */ +@@ -157,7 +157,7 @@ tlso_init( void ) + (void) tlso_seed_PRNG( lo->ldo_tls_randfile ); + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + SSL_load_error_strings(); + SSL_library_init(); + OpenSSL_add_all_digests(); +@@ -179,7 +179,7 @@ tlso_destroy( void ) + { + struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT(); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + EVP_cleanup(); + #if OPENSSL_VERSION_NUMBER < 0x10000000 + ERR_remove_state(0); +@@ -205,7 +205,7 @@ static void + tlso_ctx_ref( tls_ctx *ctx ) + { + tlso_ctx *c = (tlso_ctx *)ctx; +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX ) + #endif + SSL_CTX_up_ref( c ); +@@ -367,7 +367,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls + SSL_CTX_set_verify( ctx, i, + lo->ldo_tls_require_cert == LDAP_OPT_X_TLS_ALLOW ? + tlso_verify_ok : tlso_verify_cb ); +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + SSL_CTX_set_tmp_rsa_callback( ctx, tlso_tmp_rsa_cb ); + #endif + #ifdef HAVE_OPENSSL_CRL +@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, struct berval * + if (!x) return LDAP_INVALID_CREDENTIALS; + + xn = X509_get_subject_name(x); +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + der_dn->bv_len = i2d_X509_NAME( xn, NULL ); + der_dn->bv_val = xn->bytes->data; + #else +@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval + return LDAP_INVALID_CREDENTIALS; + + xn = X509_get_subject_name(x); +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + der_dn->bv_len = i2d_X509_NAME( xn, NULL ); + der_dn->bv_val = xn->bytes->data; + #else +@@ -721,7 +721,7 @@ struct tls_data { + Sockbuf_IO_Desc *sbiod; + }; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + #define BIO_set_init(b, x) b->init = x + #define BIO_set_data(b, x) b->ptr = x + #define BIO_clear_flags(b, x) b->flags &= ~(x) +@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str ) + return tlso_bio_write( b, str, strlen( str ) ); + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 + struct bio_method_st { + int type; + const char *name; +@@ -1138,7 +1138,7 @@ tlso_report_error( void ) + } + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 + static RSA * + tlso_tmp_rsa_cb( SSL *ssl, int is_export, int key_length ) + { +@@ -1186,10 +1186,11 @@ * The fact is that when $HOME is NULL, .rnd is used. */ randfile = RAND_file_name( buffer, sizeof( buffer ) ); diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template index 344141150d..ec6b7af14e 100644 --- a/srcpkgs/openldap/template +++ b/srcpkgs/openldap/template @@ -1,7 +1,7 @@ # Template file for 'libldap' pkgname=openldap -version=2.4.44 -revision=5 +version=2.4.45 +revision=1 build_style=gnu-configure configure_args="--prefix=/usr --libexecdir=/usr/libexec @@ -21,7 +21,7 @@ license="OpenLDAP License v2.8 - BSD alike" maintainer="Juan RP " homepage="http://www.openldap.org" distfiles="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz" -checksum=d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400 +checksum=cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 system_accounts="ldap" ldap_homedir="/var/lib/openldap" 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() { 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 } 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 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} diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template index f1b7b681f6..9a98a8174a 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.888 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=d66c46fac32ebef510f2dc8de753be50f209152ea6bb206a13079c39ac27c754 else _debarch=i386 - checksum=c483f6a671e33bee80ffb0d774bc73c7256d4e2914bc8a9ad40c108a82346e50 + checksum=336fd67bc95908b0f73b0e80f80b4f910eb1ff95f1b00baf6cef8bff7988f8dd fi distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_${_debarch}.deb" 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 diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template index 67105e2451..23d2eb065a 100644 --- a/srcpkgs/oracle-jdk/template +++ b/srcpkgs/oracle-jdk/template @@ -1,11 +1,11 @@ # Template file for 'oracle-jdk' pkgname=oracle-jdk -version=8u121 +version=8u131 revision=1 -_build=13 +_build=11 _longVersion=1.${version%u*}.0_${version#*u} -_tag=e9e7ea248e2c4826b92b3f075a80e441 +_tag=d54c1d3a095b4ff2b6607d096fa80163 short_desc="Java Development Kit (JDK)" maintainer="Enno Boland " @@ -23,22 +23,22 @@ case "${XBPS_TARGET_MACHINE}" in x86_64) _arch=amd64 _filename=jdk-${version}-linux-x64.tar.gz - checksum="97e30203f1aef324a07c94d9d078f5d19bb6c50e638e4492722debca588210bc" + checksum="62b215bdfb48bace523723cdbb2157c665e6a25429c73828a32f00e587301236" ;; i686) _arch=i386 _filename=jdk-${version}-linux-i586.tar.gz - checksum="f7d6cf1468c5e71ff097bec0189caccdd8e709a2a88a2c9849ad6200c0f33d4c" + checksum="0069a2b1b1cddbefa45f1ff12933fca3b114b6544d536ec0e2d4861a830d7154" ;; arm*) _arch=arm _filename=jdk-${version}-linux-arm32-vfp-hflt.tar.gz - checksum="134c73db663b1fb0f3d771a383dbea1a7cfeaa00e4d2872e0a6df94d242cf2f6" + checksum="4d2677261715e9f0e44972517cf22ae40c69ad4dd1e4c34c88127462b13d4949" ;; aarch64) _arch=aarch64 _filename=jdk-${version}-linux-arm64-vfp-hflt.tar.gz - checksum="acd84c59aa0c3fa8cfb2e3c51bbd9ebf979b4ed9b5f15b343821c31af2ce3573" + checksum="8f1d59e35cbea789219f9908d666027ab9015abd8f43999d28d21b43d84c77c2" ;; esac diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template index 23af7ab701..1f7542f631 100644 --- a/srcpkgs/oracle-jre/template +++ b/srcpkgs/oracle-jre/template @@ -1,11 +1,11 @@ # Template file for 'oracle-jre' pkgname=oracle-jre -version=8u121 +version=8u131 revision=1 _longVersion=1.${version%u*}.0_${version#*u} -_build=13 -_tag=e9e7ea248e2c4826b92b3f075a80e441 +_build=11 +_tag=d54c1d3a095b4ff2b6607d096fa80163 short_desc="Java Runtime Environment (JRE)" maintainer="Enno Boland " @@ -22,12 +22,12 @@ case "${XBPS_TARGET_MACHINE}" in x86_64) _arch=amd64 _filename=jre-${version}-linux-x64.tar.gz - checksum="30bf5fbac0cfbc9201cac1d6973dbc96e5f55043ab315eda8c7aeb23df4f2644" + checksum="355e5cdb066d4cada1f9f16f358b6fa6280ff5caf7470cf0d5cdd43083408d35" ;; i686) _arch=i386 _filename=jre-${version}-linux-i586.tar.gz - checksum="1b28662780c98b3233e8dacaa07c505a70c53463d3b00720baa59f955ab1e1bb" + checksum="a773f2fe17061ef637ed2094b06313a99c0b45ba3d3cb7f8f1ebf18448495aeb" ;; esac 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" diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 8fc4f7c8bc..805b4e4bbb 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 -revision=1 -wrksrc="${pkgname}" +version=1.75 +revision=3 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} diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index 6ccf4f88a1..09505004e5 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -1,6 +1,6 @@ # Template file for 'p11-kit' pkgname=p11-kit -version=0.23.2 +version=0.23.7 revision=1 build_style=gnu-configure configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths" @@ -9,13 +9,14 @@ makedepends="libtasn1-devel libffi-devel" conf_files="/etc/pkcs11/pkcs11.conf" short_desc="Provides a way to load and enumerate PKCS#11 modules" maintainer="Juan RP " -license="BSD" -homepage="http://p11-glue.freedesktop.org" -distfiles="$homepage/releases/$pkgname-$version.tar.gz" -checksum=ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 +license="3-clause-BSD" +homepage="https://github.com/p11-glue/p11-kit" +distfiles="${homepage}/releases/download/${version}/p11-kit-${version}.tar.gz" +checksum=988e7c86f2641b36702503481292ef0686e6b1c39d80b215699b6dbf1024be41 post_install() { mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf + vlicense COPYING } p11-kit-devel_package() { @@ -23,8 +24,8 @@ p11-kit-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.so" + vmove usr/lib/*.so vmove usr/lib/pkgconfig - vmove usr/share + vmove usr/share/gtk-doc } } 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() { diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template index 29f9093c73..a1a778faa8 100644 --- a/srcpkgs/packer/template +++ b/srcpkgs/packer/template @@ -1,7 +1,7 @@ # Template file for 'packer' pkgname=packer version=1.0.0 -revision=2 +revision=3 replaces="packer-bin>=0" short_desc="Create identical multiplatform machine images from a single source" maintainer="Andrea Brancaleoni " 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" diff --git a/srcpkgs/par2cmdline/template b/srcpkgs/par2cmdline/template index 645d5d1385..16834bbc7d 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.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=2fd831ba924d9f0ecd9242ca45551b6995ede1ed281af79aa30e7490d5596e7a +checksum=894e798eeffa4d96542aa437a8ca2b74406b7f831a56c6f7fd67d45e2548552c pre_configure() { autoreconf -fi 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 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/ 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 diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template index 1f13abcdcb..e29bc80965 100644 --- a/srcpkgs/peco/template +++ b/srcpkgs/peco/template @@ -1,7 +1,7 @@ # Template file for 'peco' pkgname=peco version=0.5.1 -revision=2 +revision=3 build_style=go go_import_path="github.com/peco/peco" go_package="${go_import_path}/cmd/peco" 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 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 diff --git a/srcpkgs/perl-Date-Manip/template b/srcpkgs/perl-Date-Manip/template index 22abdd6f18..aa29599ed3 100644 --- a/srcpkgs/perl-Date-Manip/template +++ b/srcpkgs/perl-Date-Manip/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Date-Manip'. pkgname=perl-Date-Manip -version=6.58 +version=6.59 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module @@ -13,4 +13,4 @@ maintainer="John Regan " license="Artistic, GPL-1" homepage="http://search.cpan.org/dist/${pkgname/perl-/}/" distfiles="${CPAN_SITE}/Date/${pkgname/perl-/}-${version}.tar.gz" -checksum=485eec6c00141c477941598de7081746f57365b9705d4a751fb1d164ded2b363 +checksum=50c71db870008dfd22f42e2e55a392a9a337a44ebbc86e98be5d209b5b0b8a12 diff --git a/srcpkgs/perl-DateTime-TimeZone/template b/srcpkgs/perl-DateTime-TimeZone/template index 10dee7181d..a134da8ed9 100644 --- a/srcpkgs/perl-DateTime-TimeZone/template +++ b/srcpkgs/perl-DateTime-TimeZone/template @@ -1,6 +1,6 @@ # Template file for 'perl-DateTime-TimeZone' pkgname=perl-DateTime-TimeZone -version=2.11 +version=2.13 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -13,4 +13,4 @@ maintainer="John Regan " homepage="http://search.cpan.org/dist/DateTime-TimeZone" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-$version.tar.gz" -checksum=a7c0b2581d2bf6d5cc535364099a67678a9f6ee608e5042dff9ef9c4c577ea6b +checksum=333d39ccd6b883460409b9113bec43be256c3e763beedfb97b9eb274c9d4e18c diff --git a/srcpkgs/perl-DateTime/template b/srcpkgs/perl-DateTime/template index 5b19ea7313..3f5a55f6b5 100644 --- a/srcpkgs/perl-DateTime/template +++ b/srcpkgs/perl-DateTime/template @@ -1,15 +1,15 @@ # Template build file for 'perl-DateTime'. pkgname=perl-DateTime -version=1.42 +version=1.43 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="${hostmakedepends}" depends="perl-DateTime-Locale perl-DateTime-TimeZone perl-Params-Validate perl-Try-Tiny" -short_desc="A date and tie object for perl" +short_desc="A date and time object for Perl" maintainer="John Regan " homepage="http://search.cpan.org/dist/DateTime" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-$version.tar.gz" -checksum=efa4badf07365d1b03ee5527fc79baaf7d8b449bf7baad13599f04177232416e +checksum=143beb1e358364a704a88e5a1f02cf6875e6c6274506f40c3147fd7f3466f975 diff --git a/srcpkgs/perl-Devel-CheckLib/template b/srcpkgs/perl-Devel-CheckLib/template index 7df54c59f6..4c2a630b13 100644 --- a/srcpkgs/perl-Devel-CheckLib/template +++ b/srcpkgs/perl-Devel-CheckLib/template @@ -1,6 +1,6 @@ # Template file for 'perl-Devel-CheckLib' pkgname=perl-Devel-CheckLib -version=1.10 +version=1.11 revision=1 noarch=yes build_style=perl-module @@ -13,4 +13,4 @@ maintainer="Sir_Boops " homepage="http://search.cpan.org/dist/Devel-CheckLib/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Devel/Devel-CheckLib-${version}.tar.gz" -checksum=1633f10bcbe86cf65721813d69264c4f3a426a9d741bc041647c0887bd41ad14 +checksum=bd6d1c187e80be6de1f0d37add441ba8f14950c7bc1f54e764770ed484b232c1 diff --git a/srcpkgs/perl-Devel-Symdump/template b/srcpkgs/perl-Devel-Symdump/template index 5039043dc5..62ec6c355c 100644 --- a/srcpkgs/perl-Devel-Symdump/template +++ b/srcpkgs/perl-Devel-Symdump/template @@ -1,15 +1,16 @@ # 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 hostmakedepends="perl" +makedepends="perl" depends="perl" short_desc='Devel::Symdump - Dump symbol names or the symbol table' 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 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 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 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 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 diff --git a/srcpkgs/perl-Glib-Object-Introspection/template b/srcpkgs/perl-Glib-Object-Introspection/template new file mode 100644 index 0000000000..4b23364371 --- /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="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" +checksum=0101aa45417a80a066fae198e37dc9814abf24afab454d72909070ab5c8293d9 diff --git a/srcpkgs/perl-IO-Socket-INET6/template b/srcpkgs/perl-IO-Socket-INET6/template new file mode 100644 index 0000000000..8d3fbd44ab --- /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=2 +wrksrc="${pkgname/perl-/}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends} perl-Socket6" +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 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 diff --git a/srcpkgs/perl-IPC-Run/template b/srcpkgs/perl-IPC-Run/template index 8c53e27915..b7048f946f 100644 --- a/srcpkgs/perl-IPC-Run/template +++ b/srcpkgs/perl-IPC-Run/template @@ -1,16 +1,16 @@ # Template build file for 'perl-IPC-Run'. pkgname=perl-IPC-Run -version=0.94 +version=0.96 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" makedepends="${hostmakedepends}" depends="${makedepends}" -noarch="yes" +noarch=yes short_desc="system() and background procs w/ piping, redirs, ptys" maintainer="Juan RP " homepage="http://search.cpan.org/dist/IPC-Run" license="Artistic, GPL-1" -distfiles="${CPAN_SITE}/IPC/IPC-Run-$version.tar.gz" -checksum=2eb336c91a2b7ea61f98e5b2282d91020d39a484f16041e2365ffd30f8a5605b +distfiles="${CPAN_SITE}/IPC/IPC-Run-${version}.tar.gz" +checksum=bbd24ff027e1c232b3dc027562c9f4386da72b76991d30f9f3d4119e87cf4640 diff --git a/srcpkgs/perl-JSON/template b/srcpkgs/perl-JSON/template index f026576e36..4b96e7475b 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.94 revision=1 distfiles="${CPAN_SITE}/JSON/JSON-${version}.tar.gz" -checksum="4ddbb3cb985a79f69a34e7c26cde1c81120d03487e87366f9a119f90f7bdfe88" +checksum=12271b5cee49943bbdde430eef58f1fe64ba6561980b22c69585e08fc977dc6d build_style="perl-module" hostmakedepends="perl" makedepends="${hostmakedepends}" 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 diff --git a/srcpkgs/perl-Module-Build/template b/srcpkgs/perl-Module-Build/template index a491ea6e1d..06056d15d5 100644 --- a/srcpkgs/perl-Module-Build/template +++ b/srcpkgs/perl-Module-Build/template @@ -1,6 +1,6 @@ # Template file for 'perl-Module-Build' pkgname=perl-Module-Build -version=0.4222 +version=0.4224 revision=1 noarch=yes wrksrc="${pkgname/perl-/}-${version}" @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " homepage="http://search.cpan.org/dist/Module-Build/" license="Artistic, GPL-1" distfiles="${CPAN_SITE}/Module/${pkgname/perl-/}-${version}.tar.gz" -checksum=e74b45d9a74736472b74830599cec0d1123f992760f9cd97104f94bee800b160 +checksum=a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782 pre_configure() { unset XBPS_CROSS_BASE 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 diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template index fc9d2798ef..1d97e87acb 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.16 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=70c45b6aaf3e9fb1ce30a1fc3cf828cfaee45c5c0bd147b2f617efade1765e78 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 diff --git a/srcpkgs/perl-Socket6/template b/srcpkgs/perl-Socket6/template new file mode 100644 index 0000000000..215d8a3e43 --- /dev/null +++ b/srcpkgs/perl-Socket6/template @@ -0,0 +1,25 @@ +# Template build file for 'perl-Socket6'. +pkgname=perl-Socket6 +version=0.28 +revision=2 +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 + +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 +} diff --git a/srcpkgs/perl-Test-Script/template b/srcpkgs/perl-Test-Script/template index 984ff3aa2d..9edf017b01 100644 --- a/srcpkgs/perl-Test-Script/template +++ b/srcpkgs/perl-Test-Script/template @@ -1,6 +1,6 @@ # Template build file for 'perl-Test-Script'. pkgname=perl-Test-Script -version=1.16 +version=1.18 revision=1 wrksrc="${pkgname#*-}-${version}" build_style=perl-module @@ -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" 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" 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 diff --git a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch new file mode 100644 index 0000000000..434ea3d22d --- /dev/null +++ b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch @@ -0,0 +1,13 @@ +https://bugs.archlinux.org/task/52683 + +--- 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 diff --git a/srcpkgs/pgpdump/template b/srcpkgs/pgpdump/template index 29b16ddbbd..8c51349368 100644 --- a/srcpkgs/pgpdump/template +++ b/srcpkgs/pgpdump/template @@ -1,14 +1,14 @@ # Template file for 'pgpdump' pkgname=pgpdump -version=0.31 +version=0.32 revision=1 build_style=gnu-configure short_desc="A PGP packet visualizer" maintainer="Nicklaus McClendon " -license="BSD" +license="3-cause-BSD" homepage="https://github.com/kazu-yamamoto/${pkgname}" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=7abf04a530c902cfb1f1a81c6b5fb88bd2c12b5f3c37dceb1245bfe28f2a7c0b +checksum=b5cad57a07ba221049b168dd3baae54b03c6fdedcb4e9ce32e48f88cab01c305 post_install() { vlicense COPYRIGHT 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; }; 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 diff --git a/srcpkgs/php/template b/srcpkgs/php/template index e71a1c5bb8..6c2bb1acc5 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ # Template build file for 'php' pkgname=php -version=7.1.4 +version=7.1.5 revision=1 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " @@ -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" 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 diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index 0ed383a302..7a1c752ff8 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.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=0da226f5d2fa9432d1b007e7a33168e46b7505b9cbf40c620abe35d97e3abab8 +checksum=0c624678e8a8b027b532830b01c6d99542c3f967b28ccff9933b52a8a1009677 wrksrc="$pkgname-$pkgname-$version" pre_configure() { diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template index be9222663e..00178600d8 100644 --- a/srcpkgs/playonlinux/template +++ b/srcpkgs/playonlinux/template @@ -1,7 +1,7 @@ # Template file for 'playonlinux' pkgname=playonlinux -version=4.2.10 -revision=2 +version=4.2.11 +revision=1 noarch=yes wrksrc="$pkgname" depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.playonlinux.com" distfiles="http://www.playonlinux.com/script_files/PlayOnLinux/${version/.0/}/PlayOnLinux_${version/.0/}.tar.gz" -checksum=f524905912ae2b17c8544968a8554d635f8fc4cd3b220c0ae15c49d51f244973 +checksum=a55e2f07240baa8f152032997c6aad203e1cfbf8ba086fd0744f1ee1868408d2 [ "${CROSS_BUILD}" ] && broken="Dependency wxPython can't be cross compiled" do_install() { 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 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 } diff --git a/srcpkgs/pnmixer/template b/srcpkgs/pnmixer/template index e03acc0cbd..33c30764ba 100644 --- a/srcpkgs/pnmixer/template +++ b/srcpkgs/pnmixer/template @@ -1,8 +1,8 @@ # Template file for 'pnmixer' pkgname=pnmixer -version=0.7 +version=0.7.1 revision=1 -build_style=gnu-configure +build_style=cmake hostmakedepends="pkg-config intltool automake glib-devel" makedepends="alsa-lib-devel libnotify-devel gtk+3-devel" short_desc="Volume mixer for the system tray" @@ -10,9 +10,4 @@ maintainer="Diogo Leal " license="GPL-3" homepage="https://github.com/nicklan/pnmixer" distfiles="https://github.com/nicklan/pnmixer/archive/v${version}.tar.gz" -checksum=398caf24abd04012c397aa3925a511a6468ec06408c35e38c20ed6789e2798ca - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh - sed -i 's#/usr/local#/usr#g' configure -} +checksum=3214b3bb54a245b8f38a5b28ebe853df8648edfbdaebec14128e4ffe3f1f4bc2 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" 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 + } +} 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..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=2 +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,9 @@ 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" post_install() { vlicense COPYING 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..9cc75eafbc 100644 --- a/srcpkgs/polyml/template +++ b/srcpkgs/polyml/template @@ -1,22 +1,27 @@ # 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) + # 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+=" --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. 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 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.* 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.* 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" 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" 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 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 diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template index 2ed31913f9..168964fad3 100644 --- a/srcpkgs/prometheus/template +++ b/srcpkgs/prometheus/template @@ -1,7 +1,7 @@ # Template file for 'prometheus' pkgname=prometheus version=1.6.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/prometheus/prometheus" go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool" 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" 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)); diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 9200e9f25c..62f56c1cb5 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=3 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" diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template index 1dd70280fd..5083adb458 100644 --- a/srcpkgs/pup/template +++ b/srcpkgs/pup/template @@ -1,11 +1,11 @@ # Template file for 'pup' pkgname=pup version=0.4.0 -revision=4 +revision=5 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" 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" 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 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 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 \ 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() { diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template index 17c7f1ad51..ba569b9238 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.2 revision=1 noarch=yes wrksrc="Django-${version}" @@ -11,9 +11,9 @@ depends="python-setuptools python-pytz" short_desc="High-level Python2 Web framework" maintainer="Eivind Uggedal " license="3-clause-BSD" -homepage="http://www.djangoproject.com/" +homepage="https://www.djangoproject.com/" distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz" -checksum=b6f3b864944276b4fd1d099952112696558f78b77b39188ac92b6c5e80152c30 +checksum=3c5b070482df4f9e5750539dc1824d353729ee423fd410c579b8cd3dea5b0617 alternatives="django:django-admin:/usr/bin/django-admin2" post_install() { 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() { 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 diff --git a/srcpkgs/python-PyOpenGL-accelerate/update b/srcpkgs/python-PyOpenGL-accelerate/update new file mode 100644 index 0000000000..e957dc4305 --- /dev/null +++ b/srcpkgs/python-PyOpenGL-accelerate/update @@ -0,0 +1 @@ +ignore="*a* *b*" diff --git a/srcpkgs/python-PyOpenGL/update b/srcpkgs/python-PyOpenGL/update new file mode 100644 index 0000000000..e957dc4305 --- /dev/null +++ b/srcpkgs/python-PyOpenGL/update @@ -0,0 +1 @@ +ignore="*a* *b*" diff --git a/srcpkgs/python-Pyro4/template b/srcpkgs/python-Pyro4/template index 5676275d66..545ed3f5ca 100644 --- a/srcpkgs/python-Pyro4/template +++ b/srcpkgs/python-Pyro4/template @@ -1,6 +1,6 @@ # Template file for 'python-Pyro4' pkgname=python-Pyro4 -version=4.59 +version=4.60 revision=1 wrksrc="${pkgname#*-}-${version}" noarch=yes @@ -13,7 +13,7 @@ maintainer="pulux " license="MIT" homepage="https://pythonhosted.org/Pyro4/" distfiles="${PYPI_SITE}/P/Pyro4/Pyro4-${version}.tar.gz" -checksum=6a39dadbd2a83b6fd5ab7f5402f8a4befd467b5c0404b8610a8797f748b72a38 +checksum=52fa5fe8173d234f57b6ca3214df3f34e88356c94081685db6249bff8f0b4f7f alternatives=" pyro4:pyro4-check-config:/usr/bin/pyro4-check-config2 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 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 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() { 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 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 diff --git a/srcpkgs/python-astroid/template b/srcpkgs/python-astroid/template index 000bcd5277..3429313887 100644 --- a/srcpkgs/python-astroid/template +++ b/srcpkgs/python-astroid/template @@ -1,6 +1,6 @@ # Template file for 'python-astroid' pkgname=python-astroid -version=1.5.2 +version=1.5.3 revision=1 noarch=yes wrksrc="astroid-${version}" @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/PyCQA/astroid" license="GPL-2, LGPL-2.1" distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz" -checksum=271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed +checksum=492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35 post_install() { # no tests 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 diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template index df3a4ce5dd..9e8105a6d1 100644 --- a/srcpkgs/python-attrs/template +++ b/srcpkgs/python-attrs/template @@ -1,18 +1,19 @@ # Template file for 'python-attrs' pkgname=python-attrs -version=16.3.0 +version=17.2.0 revision=1 noarch=yes wrksrc="attrs-${version}" build_style=python-module -pycompile_module="attrs" +pycompile_module="attr" hostmakedepends="python-setuptools python3-setuptools" -short_desc="Python2 attributes without boilerplate" -maintainer="Michael Gehring " +depends="python" +short_desc="Attributes without boilerplate (Python2)" +maintainer="Juan RP " license="MIT" -homepage="https://attrs.readthedocs.org/" +homepage="https://attrs.readthedocs.io/" distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz" -checksum=80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc +checksum=5d4d1b99f94d69338f485984127e4473b3ab9e20f43821b0e546cc3b2302fd11 post_install() { vlicense LICENSE @@ -20,7 +21,8 @@ post_install() { python3-attrs_package() { noarch=yes - pycompile_module="attrs" + depends="python3" + pycompile_module="attr" replaces="python3.4-attrs>=0" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-axolotl-curve25519/template b/srcpkgs/python-axolotl-curve25519/template new file mode 100644 index 0000000000..87c0818723 --- /dev/null +++ b/srcpkgs/python-axolotl-curve25519/template @@ -0,0 +1,22 @@ +# Template file for 'python-axolotl-curve25519' +pkgname=python-axolotl-curve25519 +version=0.1 +revision=1 +build_style=python-module +hostmakedepends="python-setuptools python3-setuptools" +makedepends="python-devel python3-devel" +depends="python" +short_desc="Python2 curve25519 with ed25519 signatures, used by libaxolotl" +maintainer="Lon Willett " +license="GPL-3" +homepage="https://pypi.python.org/pypi/python-axolotl-curve25519" +distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" +checksum="c559f6a5bf51e869325b36bd83c14cccd7dec1c6e7599e797f9ba27a72d339c0" + +python3-axolotl-curve25519_package() { + depends="python3" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} diff --git a/srcpkgs/python-axolotl/template b/srcpkgs/python-axolotl/template new file mode 100644 index 0000000000..e283a745be --- /dev/null +++ b/srcpkgs/python-axolotl/template @@ -0,0 +1,25 @@ +# Template file for 'python-axolotl' +pkgname=python-axolotl +version=0.1.39 +revision=1 +noarch=yes +build_style=python-module +hostmakedepends="python-setuptools python3-setuptools" +depends="python-axolotl-curve25519 python-crypto python-protobuf" +pycompile_module="axolotl" +short_desc="Python2 port of libaxolotl-android written by Moxie Marlinspike" +maintainer="Lon Willett " +license="GPL-3" +homepage="https://pypi.python.org/pypi/python-axolotl" +distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" +checksum="9af9c937d0d05ebea414f1be79ecc7517cc3541a77101941e6a2a71bdd2b6e25" + +python3-axolotl_package() { + noarch=yes + depends="python3-axolotl-curve25519 python3-crypto python3-protobuf" + pycompile_module="axolotl" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + } +} 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 \ 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/python-cairo/template b/srcpkgs/python-cairo/template index 7e43664267..7e21cc2588 100644 --- a/srcpkgs/python-cairo/template +++ b/srcpkgs/python-cairo/template @@ -1,39 +1,23 @@ # Template file for 'python-cairo' pkgname=python-cairo -version=1.10.0 -revision=5 -lib32disabled=yes -wrksrc="py2cairo-${version}" -build_style=gnu-configure -configure_args="PYTHON=python" -hostmakedepends="automake libtool pkg-config python-devel" +version=1.13.3 +revision=1 +wrksrc="pycairo-${version}" +build_style=python2-module +hostmakedepends="pkg-config python" makedepends="cairo-devel python-devel" -depends="python>=2.7" -replaces="pycairo<1.10 py2cairo>=0" -pycompile_module="cairo" short_desc="Python2 bindings for the cairo graphics library" -homepage="http://cairographics.org/pycairo/" -license="LGPL-3" +homepage="https://pycairo.readthedocs.io/" +license="LGPL-2.1, MPL-1.1" maintainer="Juan RP " -distfiles="http://cairographics.org/releases/py2cairo-${version}.tar.bz2" -checksum=d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 - -pre_configure() { - touch ChangeLog - NOCONFIGURE=1 autoreconf -fi - if [ "$CROSS_BUILD" ]; then - ln -s ${XBPS_WRAPPERDIR}/python-config ${wrksrc} - fi -} +distfiles="https://github.com/pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz" +checksum=2f2ae1acdc7197e4df58e458a0279de206f989972edfe06d54e99d9e5b839938 python-cairo-devel_package() { - lib32disabled=yes - replaces="pycairo-devel<1.10 py2cairo-devel>=0" - depends="python-devel ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - diff --git a/srcpkgs/python-cairo/update b/srcpkgs/python-cairo/update deleted file mode 100644 index f3659f4748..0000000000 --- a/srcpkgs/python-cairo/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=py2cairo 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() { diff --git a/srcpkgs/python-chess/template b/srcpkgs/python-chess/template index 53f184498f..4b7dfdafbf 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.2 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=d50d18ade3126e7af596ff7506aa5940c692da1a1b6d546f439bc76d26920593 python3-chess_package() { noarch=yes 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 diff --git a/srcpkgs/python-cryptography/patches/fix-libressl-2.5.3.patch b/srcpkgs/python-cryptography/patches/fix-libressl-2.5.3.patch deleted file mode 100644 index 66fe89c4b9..0000000000 --- a/srcpkgs/python-cryptography/patches/fix-libressl-2.5.3.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/_cffi_src/openssl/x509_vfy.py.orig 2017-04-11 19:49:14.765073278 +0200 -+++ src/_cffi_src/openssl/x509_vfy.py 2017-04-11 19:48:51.541130712 +0200 -@@ -221,10 +221,12 @@ static const long X509_V_ERR_SUITE_B_INV - static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0; - static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0; - static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0; -+#if LIBRESSL_VERSION_NUMBER < 0x2050300fL - static const long X509_V_ERR_HOSTNAME_MISMATCH = 0; - static const long X509_V_ERR_EMAIL_MISMATCH = 0; - static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0; - #endif -+#endif - - /* OpenSSL 1.0.2beta2+ verification parameters */ - #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \ diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index ad0bb6303a..7ba3c6c162 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -1,34 +1,29 @@ # Template file for 'python-cryptography' pkgname=python-cryptography -version=1.8.1 -revision=3 +version=1.9 +revision=1 wrksrc="cryptography-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools libressl-devel python-enum34 python-ipaddress python-six python3-six python-asn1crypto python3-asn1crypto python-cffi python3-cffi python-idna python3-idna" makedepends="libressl-devel python-devel python3-devel" -depends="python-setuptools python-cffi python-asn1crypto python-six - python-enum34 python-idna python-ipaddress" +depends="python-cffi python-asn1crypto python-six python-enum34 + python-idna python-ipaddress" pycompile_module="cryptography" short_desc="Python2 library that provides cryptographic recipes and primitives" maintainer="Alessio Sergi " homepage="https://github.com/pyca/cryptography" license="3-clause-BSD, Apache-2.0" distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" -checksum=323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190 +checksum=5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882 -pre_build() { - sed -i '/packaging/d' setup.py - sed -i 's/packaging.version/pkg_resources.extern.\0/' src/cryptography/utils.py -} post_install() { vlicense LICENSE } python3-cryptography_package() { - depends="python3-setuptools python3-cffi python3-asn1crypto - python3-six python3-idna" + depends="python3-cffi python3-asn1crypto python3-six python3-idna" pycompile_module="cryptography" replaces="python3.4-cryptography>=0" short_desc="${short_desc/Python2/Python3}" diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template index 637ec166da..51820d2bbd 100644 --- a/srcpkgs/python-dbus/template +++ b/srcpkgs/python-dbus/template @@ -1,7 +1,7 @@ # Template file for 'python-dbus' pkgname=python-dbus -version=1.2.0 -revision=8 +version=1.2.4 +revision=1 lib32disabled=yes wrksrc="dbus-python-${version}" build_style=gnu-configure @@ -12,9 +12,9 @@ pycompile_module="dbus" short_desc="D-Bus Python2 bindings" maintainer="Juan RP " license="GPL-2, LGPL-2.1" -homepage="http://www.freedesktop.org/wiki/Software/DBusBindings" -distfiles="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz" -checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df +homepage="https://www.freedesktop.org/wiki/Software/DBusBindings" +distfiles="https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz" +checksum=e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc pre_configure() { mkdir -p dbus-${py2_ver} @@ -25,13 +25,16 @@ do_configure() { for pyver in $py2_ver $py3_ver; do if [ "$pyver" != "$py2_ver" ]; then pyinc="$py3_inc" + pyabi="m" else pyinc="$py2_inc" fi cd ${wrksrc}/dbus-${pyver} - sed -i "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${pyinc},g" configure - env PYTHON=python${pyver} ./configure ${configure_args} + export PYTHON_INCLUDES="-I${XBPS_CROSS_BASE}/${pyinc}" + export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${pyabi}" + export PYTHON="python${pyver}" + ./configure ${configure_args} done } do_build() { 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 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" diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template index f3901fd864..089e9eb2f8 100644 --- a/srcpkgs/python-gitlab/template +++ b/srcpkgs/python-gitlab/template @@ -1,6 +1,6 @@ # Template file for 'python-gitlab' pkgname=python-gitlab -version=0.20 +version=0.21.1 revision=1 noarch=yes build_style=python-module @@ -12,7 +12,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/gpocentek/python-gitlab" license="LGPL-3" distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz" -checksum=028cb3f13c968f93315159686bf3cc2f693cd84585c9f0f807d0869a579fefbf +checksum=111db1649ba933de925ec5fb03823f5c1eb37c451356b3dc92af023100e3950b alternatives="python-gitlab:gitlab:/usr/bin/gitlab2" python3-gitlab_package() { diff --git a/srcpkgs/python-gogs-client/template b/srcpkgs/python-gogs-client/template index ee4047c98e..c9e72dbaa8 100644 --- a/srcpkgs/python-gogs-client/template +++ b/srcpkgs/python-gogs-client/template @@ -1,6 +1,6 @@ # Template file for 'python-gogs-client' pkgname=python-gogs-client -version=1.0.4 +version=1.0.5 revision=1 noarch=yes wrksrc="gogs_client-${version}" @@ -13,7 +13,7 @@ maintainer="Joseph LaFreniere " homepage="https://github.com/unfoldingWord-dev/python-gogs-client" license="MIT" distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz" -checksum=4e76ac6193e662efe6f4c09777880569bd31e0f9b62088765b669a684452bcd2 +checksum=73c2859f9a2e98686d5bf06ce288547f5916d85073311709383aebc3706c4483 post_install() { # License not currently in PyPI: https://github.com/unfoldingWord-dev/python-gogs-client/issues/5 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 diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template index 9b40a4e55c..6967263cb5 100644 --- a/srcpkgs/python-incremental/template +++ b/srcpkgs/python-incremental/template @@ -1,6 +1,6 @@ # Template file for 'python-incremental' pkgname=python-incremental -version=16.10.1 +version=17.5.0 revision=1 noarch=yes wrksrc="incremental-${version}" @@ -10,10 +10,10 @@ hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Small library that versions your Python projects (Python2)" maintainer="Juan RP " -homepage="https://github.com/hawkowl/incremental" +homepage="https://github.com/twisted/incremental" license="MIT" distfiles="${PYPI_SITE}/i/incremental/incremental-${version}.tar.gz" -checksum=14ad6b720ec47aad6c9caa83e47db1843e2b9b98742da5dda08e16a99f400342 +checksum=7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-isort/template b/srcpkgs/python-isort/template index 76babc2c9a..620320b33c 100644 --- a/srcpkgs/python-isort/template +++ b/srcpkgs/python-isort/template @@ -1,6 +1,6 @@ # Template file for 'python-isort' pkgname=python-isort -version=4.2.5 +version=4.2.13 revision=1 noarch=yes wrksrc="isort-${version}" @@ -13,11 +13,10 @@ maintainer="Alessio Sergi " homepage="https://github.com/timothycrosley/isort" license="MIT" distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz" -checksum=56b20044f43cf6e6783fe95d054e754acca52dd43fbe9277c1bdff835537ea5c +checksum=3b742309aecd7dc8d7a87917098c25e5c3871ba2a5c46820b6b8f4eeaa85f122 alternatives="isort:isort:/usr/bin/isort2" post_install() { - sed -n '/Copyright/,/SOFTWARE\./p' isort/__init__.py >LICENSE vlicense LICENSE } diff --git a/srcpkgs/python-jupyter_nbconvert/template b/srcpkgs/python-jupyter_nbconvert/template index f854ac4aa1..09f7d279ac 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.2.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=9ed68ec7fe90a8672b43795b29ea91cc75ea355c83debc83ebd12171521ec274 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}" 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 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 diff --git a/srcpkgs/python-ldap/template b/srcpkgs/python-ldap/template index 99fe99911f..6589e869e0 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.39 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=3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3 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/ diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template index bd15c98caf..f68d19f896 100644 --- a/srcpkgs/python-lxml/template +++ b/srcpkgs/python-lxml/template @@ -1,6 +1,6 @@ # Template file for 'python-lxml' pkgname=python-lxml -version=3.7.2 +version=3.8.0 revision=1 wrksrc="lxml-lxml-${version}" build_style=python-module @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://lxml.de/" license="3-clause-BSD, ElementTree, GPL-2, ZPL-2.0" distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=83390ce416b835e3a1760bcf2f4991b3041cdd55a9a0c16b4e112d71f05ff1d3 +checksum=46ae9975e235f5f45d40c79b7084bf789204a0c5de0e075306a043b2161189e9 post_install() { vlicense LICENSES.txt LICENSES diff --git a/srcpkgs/python-lz4/template b/srcpkgs/python-lz4/template index 7ce7a6c98b..abc756bb53 100644 --- a/srcpkgs/python-lz4/template +++ b/srcpkgs/python-lz4/template @@ -1,9 +1,10 @@ # Template file for 'python-lz4' pkgname=python-lz4 -version=0.9.0 +version=0.9.4 revision=1 wrksrc=lz4-${version} build_style=python-module +pycompile_module="lz4" hostmakedepends="pkg-config python-setuptools python3-setuptools" makedepends="python-devel python3-devel lz4-devel" short_desc="LZ4 bindings for Python2" @@ -11,7 +12,7 @@ maintainer="Oliver Kiddle " license="3-clause-BSD" homepage="https://github.com/python-lz4/python-lz4" distfiles="${PYPI_SITE}/l/lz4/lz4-${version}.tar.gz" -checksum=93c2b83aa9c74c024062823f96515488c510fa5a4b3826579d0916049d28c205 +checksum=60c5edf044159d86e8c04ec6f56c7994beb02235ab871855dc5f417607b53e65 pre_build() { sed -i setup.py \ @@ -26,6 +27,7 @@ post_install() { } python3-lz4_package() { + pycompile_module="lz4" replaces="python3.4-lz4>=0" short_desc="${short_desc/Python2/Python3}" pkg_install() { diff --git a/srcpkgs/python-marisa-trie/template b/srcpkgs/python-marisa-trie/template index cb62c0fe64..932d9c6b18 100644 --- a/srcpkgs/python-marisa-trie/template +++ b/srcpkgs/python-marisa-trie/template @@ -1,7 +1,7 @@ # Template file for 'python-marisa-trie' pkgname=python-marisa-trie -version=0.7.2 -revision=2 +version=0.7.4 +revision=1 wrksrc="marisa-trie-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" @@ -10,8 +10,8 @@ short_desc="Static memory-efficient Trie-like structures (Python2)" maintainer="bra1nwave " license="MIT" homepage="https://github.com/kmike/marisa-trie" -distfiles="https://github.com/kmike/marisa-trie/archive/${version}.tar.gz" -checksum=5a5ca6a032fe924097f87439130f013dfb2682e597f4d5414bb87cfe49bc715e +distfiles="${PYPI_SITE}/m/marisa-trie/marisa-trie-${version}.tar.gz" +checksum=2a2258eacca9966325f9019378fc4621891f2482bc63e6441f70599595ed97d8 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-matplotlib/template b/srcpkgs/python-matplotlib/template index 5de79f6a37..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.0 +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=36cf0985829c1ab2b8b1dae5e2272e53ae681bf33ab8bedceed4f0565af5f813 +checksum=0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 export XDG_RUNTIME_DIR=/tmp diff --git a/srcpkgs/python-munkres/template b/srcpkgs/python-munkres/template index c824b7819c..5232671f22 100644 --- a/srcpkgs/python-munkres/template +++ b/srcpkgs/python-munkres/template @@ -1,19 +1,19 @@ # Template file for 'python-munkres' pkgname=python-munkres -version=1.0.8 -revision=2 +version=1.0.10 +revision=1 noarch=yes wrksrc="munkres-${version}" build_style="python-module" pycompile_module="munkres.py" -hostmakedepends="python-devel python3-devel" +hostmakedepends="python-setuptools python3-setuptools" depends="python" short_desc="Algorithm for the Assignment Problem (Python2)" maintainer="Juan RP " homepage="https://github.com/bmc/munkres" license="Apache-2.0" distfiles="${PYPI_SITE}/m/munkres/munkres-${version}.tar.gz" -checksum=185f1a9c4d2c31f2f19afa48bc2ec726c11e945eded4784d272da2fd49bf7a55 +checksum=eb41e68e93be08ad8cb80fd470f8282f21cd2bac87b07da645e27cf9c6b014db python3-munkres_package() { noarch=yes diff --git a/srcpkgs/python-netifaces/template b/srcpkgs/python-netifaces/template index 185806a3b0..ce82eda8fb 100644 --- a/srcpkgs/python-netifaces/template +++ b/srcpkgs/python-netifaces/template @@ -1,7 +1,7 @@ # Template file for 'python-netifaces' pkgname=python-netifaces -version=0.10.5 -revision=2 +version=0.10.6 +revision=1 wrksrc="netifaces-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Alessio Sergi " homepage="https://bitbucket.org/al45tair/netifaces" license="MIT" distfiles="${PYPI_SITE}/n/netifaces/netifaces-${version}.tar.gz" -checksum=59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b +checksum=0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 python3-netifaces_package() { replaces="python3.4-netifaces>=0" 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 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 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/python-parse/template b/srcpkgs/python-parse/template index cd09e65e94..828389d100 100644 --- a/srcpkgs/python-parse/template +++ b/srcpkgs/python-parse/template @@ -1,6 +1,6 @@ # Template file for 'python-parse' pkgname=python-parse -version=1.8.0 +version=1.8.2 revision=1 noarch=yes wrksrc="parse-${version}" @@ -13,7 +13,12 @@ maintainer="Eivind Uggedal " license="MIT" homepage="https://github.com/r1chardj0n3s/parse" distfiles="${PYPI_SITE}/p/parse/parse-${version}.tar.gz" -checksum=8b4f28bbe7c0f24981669ea92b2ba704ee63b5346027e82be30118bb5788ff10 +checksum=8048dde3f5ca07ad7ac7350460952d83b63eaacecdac1b37f45fd74870d849d2 + +post_install() { + sed -n '/Copyright/,/SOFTWARE\./p' parse.py >LICENSE + vlicense LICENSE +} python3-parse_package() { noarch=yes @@ -23,6 +28,7 @@ python3-parse_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense LICENSE } } python3.4-parse_package() { 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() { diff --git a/srcpkgs/python-protobuf/template b/srcpkgs/python-protobuf/template index b2c24ca203..683f0961ca 100644 --- a/srcpkgs/python-protobuf/template +++ b/srcpkgs/python-protobuf/template @@ -1,26 +1,32 @@ # Template file for 'python-protobuf' pkgname=python-protobuf -version=3.1.0.post1 -revision=1 +version=3.3.0 +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=" -1a2e989ff8820ef2eaf56b07cd40ad764ec505a0f0b52b69f7fa9e0d5afbddb7 -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/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template index 8bf1ac2ed4..33c376dd78 100644 --- a/srcpkgs/python-pyasn1-modules/template +++ b/srcpkgs/python-pyasn1-modules/template @@ -1,19 +1,19 @@ # Template file for 'python-pyasn1-modules' pkgname=python-pyasn1-modules -version=0.0.8 -revision=2 +version=0.0.9 +revision=1 noarch=yes wrksrc="${pkgname#*-}-${version}" build_style=python-module pycompile_module="pyasn1_modules" hostmakedepends="python-setuptools python3-setuptools" depends="python-pyasn1" -short_desc="A collection of ASN.1-based protocols modules (Python2)" +short_desc="Collection of ASN.1-based protocols modules (Python2)" maintainer="Peter Bui " license="2-clause-BSD" -homepage="https://pypi.python.org/pypi/pyasn1-modules" +homepage="https://github.com/etingof/pyasn1-modules" distfiles="${PYPI_SITE}/p/pyasn1-modules/pyasn1-modules-${version}.tar.gz" -checksum=10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 +checksum=be0e4157e4a53551279d6c6e366b080527f5fd068616835b4abf32c14f657f5f post_install() { vlicense LICENSE.txt LICENSE 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 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 } } diff --git a/srcpkgs/python-pygame/patches/pygame-config.patch b/srcpkgs/python-pygame/patches/pygame-config.patch deleted file mode 100644 index d677776229..0000000000 --- a/srcpkgs/python-pygame/patches/pygame-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: config_unix.py -=================================================================== ---- config_unix.py (revision 2567) -+++ config_unix.py (working copy) -@@ -174,7 +174,7 @@ - - for d in DEPS[1:]: - if not d.found: -- if not confirm(""" -+ if "-auto" not in sys.argv and not confirm(""" - Warning, some of the pygame dependencies were not found. Pygame can still - compile and install, but games that depend on those missing dependencies - will not run. Would you like to continue the configuration?"""): -Index: config_msys.py -=================================================================== ---- config_msys.py (revision 2567) -+++ config_msys.py (working copy) -@@ -283,7 +283,7 @@ - - for d in DEPS[1:]: - if not d.found: -- if not confirm(""" -+ if "-auto" not in sys.argv and not confirm(""" - Warning, some of the pygame dependencies were not found. Pygame can still - compile and install, but games that depend on those missing dependencies - will not run. Would you like to continue the configuration?"""): \ No newline at end of file diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python-pygame/template index c1f61d4723..468efba646 100644 --- a/srcpkgs/python-pygame/template +++ b/srcpkgs/python-pygame/template @@ -1,21 +1,28 @@ # Template file for 'python-pygame' pkgname=python-pygame -version=1.9.1 +version=1.9.3 revision=1 -wrksrc="pygame-${version}release" -build_style=python2-module -short_desc="Collection of python modules for writing games" +wrksrc="pygame-${version}" +build_style=python-module +pycompile_module="pygame" +hostmakedepends="python-setuptools python3-setuptools SDL_mixer-devel + SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel" +makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel + SDL_ttf-devel libjpeg-turbo-devel portmidi-devel" +short_desc="Collection of Python modules for writing games (Python2)" maintainer="Archaeme " license="LGPL-2.1" -homepage="http://www.pygame.org/" -distfiles="http://www.pygame.org/ftp/pygame-${version}release.tar.gz" -checksum="a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433" -hostmakedepends="python-devel smpeg-devel" -makedepends="python-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel smpeg-devel v4l-utils-devel" +homepage="https://www.pygame.org/" +distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz" +checksum=751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2 -do_configure() { - python2 config.py -auto -} -post_configure() { - sed -i 's/linux\/videodev.h/libv4l1-videodev.h/g' src/camera.h +export PORTMIDI_INC_PORTTIME=1 + +python3-pygame_package() { + pycompile_module="pygame" + short_desc="${short_desc/Python2/Python3}" + pkg_install() { + vmove usr/lib/python3* + vmove usr/include/python3* + } } 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" 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 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 diff --git a/srcpkgs/python-selectors2/template b/srcpkgs/python-selectors2/template index 54155a985b..4b4edf6180 100644 --- a/srcpkgs/python-selectors2/template +++ b/srcpkgs/python-selectors2/template @@ -1,6 +1,6 @@ # Template file for 'python-selectors2' pkgname=python-selectors2 -version=1.1.1 +version=2.0.0 revision=1 noarch=yes wrksrc="selectors2-${version}" @@ -12,8 +12,8 @@ maintainer="pulux " license="MIT" homepage="https://github.com/SethMichaelLarson/selectors2" distfiles="${PYPI_SITE}/s/selectors2/selectors2-${version}.tar.gz" -checksum=ef1eb63968155bc3bfb5bedf291374d058c3b0839b3b16604c6bdfd370e0c474 +checksum=d27feb6b093c6488e95f51e11680ef17535e5e97381bd42cc329a7d2b470f0ec post_install() { - vlicense LICENSE.txt + vlicense LICENSE } diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template index 506a11a53c..7df0ec621a 100644 --- a/srcpkgs/python-service_identity/template +++ b/srcpkgs/python-service_identity/template @@ -1,19 +1,19 @@ # Template file for 'python-service_identity' pkgname=python-service_identity -version=16.0.0 -revision=3 +version=17.0.0 +revision=1 noarch=yes wrksrc="service_identity-${version}" build_style=python-module pycompile_module="service_identity" hostmakedepends="python-setuptools python3-setuptools" -depends="python-attrs python-idna python-pyasn1-modules" +depends="python-attrs python-pyasn1-modules python-openssl" short_desc="Service identity verification for pyOpenSSL (Python2)" -maintainer="Michael Gehring " +maintainer="Juan RP " license="MIT" homepage="https://service-identity.readthedocs.org/" distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz" -checksum=0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 +checksum=4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab post_install() { vlicense LICENSE @@ -21,7 +21,7 @@ post_install() { python3-service_identity_package() { noarch=yes - depends="python3-attrs python3-idna python3-pyasn1-modules" + depends="python3-attrs python3-pyasn1-modules python3-openssl" pycompile_module="service_identity" replaces="python3.4-service_identity>=0" short_desc="${short_desc/Python2/Python3}" diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template index 68ff949fda..4ff780c164 100644 --- a/srcpkgs/python-setuptools/template +++ b/srcpkgs/python-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python-setuptools' pkgname=python-setuptools -version=33.1.1 +version=36.0.1 revision=1 noarch=yes wrksrc="setuptools-${version}" @@ -15,7 +15,7 @@ maintainer="Alessio Sergi " homepage="https://github.com/pypa/setuptools" license="MIT" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip" -checksum=6b20352ed60ba08c43b3611bdb502286f7a869fbfcf472f40d7279f1e77de145 +checksum=e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a alternatives="setuptools:easy_install:/usr/bin/easy_install2" export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 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" diff --git a/srcpkgs/python-stevedore/template b/srcpkgs/python-stevedore/template index ac1f64107c..b5789ba22b 100644 --- a/srcpkgs/python-stevedore/template +++ b/srcpkgs/python-stevedore/template @@ -1,6 +1,6 @@ # Template file for 'python-stevedore' pkgname=python-stevedore -version=1.21.0 +version=1.22.0 revision=1 noarch=yes wrksrc="stevedore-${version}" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " homepage="https://git.openstack.org/cgit/openstack/stevedore" license="Apache-2.0" distfiles="${PYPI_SITE}/s/stevedore/stevedore-${version}.tar.gz" -checksum=aa0e64490e9eef9f0ae96a3b226f963ebf54bb6a38176472d76253d015424f8b +checksum=4632c01486269c61117eefd624b12e6d2081d886402b9072273a4ffc39a501e2 pre_build() { # remove dependency on pbr; it's not a runtime dependency 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..2e05030761 --- /dev/null +++ b/srcpkgs/python-testpath/template @@ -0,0 +1,34 @@ +# Template file for 'python-testpath' +pkgname=python-testpath +version=0.3.1 +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=acd1e9ae3582e03b806ebcc40fbb2c660032d3f3ad991e5460e6856d69e6ba12 + +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/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 diff --git a/srcpkgs/python-ttystatus/template b/srcpkgs/python-ttystatus/template index 2575f58e9a..850f8f4ff9 100644 --- a/srcpkgs/python-ttystatus/template +++ b/srcpkgs/python-ttystatus/template @@ -1,6 +1,6 @@ # Template file for 'python-ttystatus' pkgname=python-ttystatus -version=0.34 +version=0.35 revision=1 noarch=yes build_style=python2-module @@ -13,4 +13,4 @@ maintainer="Eivind Uggedal " homepage="http://liw.fi/ttystatus/" license="GPL-3" distfiles="http://code.liw.fi/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.xz" -checksum=151717480ecdef067e6a7a432b882129c5a2f5fe83faf7f20dd6b085535c90f8 +checksum=317120cbee8c45b459d32f9c887aee51cd0fe1a26732c87a97ae904a1af005fc 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 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 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() { diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template index 694292766f..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.3.3 +version=4.4.1 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=350e3615d70a96678c3170eb5c96d4f72b8e7738861afbf030967d52c05722fe 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 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 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 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 diff --git a/srcpkgs/python3-axolotl b/srcpkgs/python3-axolotl new file mode 120000 index 0000000000..3850e59544 --- /dev/null +++ b/srcpkgs/python3-axolotl @@ -0,0 +1 @@ +python-axolotl \ No newline at end of file diff --git a/srcpkgs/python3-axolotl-curve25519 b/srcpkgs/python3-axolotl-curve25519 new file mode 120000 index 0000000000..ff6dbaa529 --- /dev/null +++ b/srcpkgs/python3-axolotl-curve25519 @@ -0,0 +1 @@ +python-axolotl-curve25519 \ No newline at end of file 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 diff --git a/srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_4.patch b/srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_4.patch deleted file mode 100644 index 29a4d8b6a1..0000000000 --- a/srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/waflib/Tools/python.py.orig -+++ b/waflib/Tools/python.py -@@ -169,7 +169,7 @@ - conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False) - includes=[] - if conf.env.PYTHON_CONFIG: -- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split(): -+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split(): - if(incstr.startswith('-I')or incstr.startswith('/I')): - incstr=incstr[2:] - if incstr not in includes: diff --git a/srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_5.patch b/srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_5.patch deleted file mode 100644 index 48d38ee806..0000000000 --- a/srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_5.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/waflib/Build.py.orig -+++ b/waflib/Build.py -@@ -151,6 +151,7 @@ class BuildContext(Context.Context): - f.close() - self.init_dirs() - def store(self): -+ return - data={} - for x in SAVED_ATTRS: - data[x]=getattr(self,x) diff --git a/srcpkgs/python3-cairo/template b/srcpkgs/python3-cairo/template index 5ced40885a..fb80d2f2c0 100644 --- a/srcpkgs/python3-cairo/template +++ b/srcpkgs/python3-cairo/template @@ -1,32 +1,22 @@ # Template file for 'python3-cairo' pkgname=python3-cairo -version=1.10.0 -revision=8 -nocross=yes +version=1.13.3 +revision=1 wrksrc="pycairo-${version}" -build_style=waf3 +build_style=python3-module +replaces="python3.4-cairo>=0" hostmakedepends="pkg-config python3" makedepends="cairo-devel python3-devel" short_desc="Python3 bindings for the cairo graphics library" -homepage="http://cairographics.org/pycairo/" -license="LGPL-3" +homepage="https://pycairo.readthedocs.io/" +license="LGPL-2.1, MPL-1.1" maintainer="Juan RP " -distfiles="http://cairographics.org/releases/pycairo-${version}.tar.bz2" -checksum=9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be -replaces="python3.4-cairo>=0" - -post_extract() { - # We need to call waf to extract waflib before patching files - python3 waf --version 1>&2 > /dev/null - ln -s .waf3-* waf3 - cd waf3 - patch -Np1 -i ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch - patch -Np1 -i ${FILESDIR}/pycairo-1.10.0-waf-py3_5.patch -} +distfiles="https://github.com/pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz" +checksum=2f2ae1acdc7197e4df58e458a0279de206f989972edfe06d54e99d9e5b839938 python3-cairo-devel_package() { replaces="python3.4-cairo-devel>=0" - depends="python3-devel ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/python3-cairo/update b/srcpkgs/python3-cairo/update deleted file mode 100644 index c909e11c36..0000000000 --- a/srcpkgs/python3-cairo/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=pycairo 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 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 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 diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame new file mode 120000 index 0000000000..48ee583d7d --- /dev/null +++ b/srcpkgs/python3-pygame @@ -0,0 +1 @@ +python-pygame \ No newline at end of file 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 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 diff --git a/srcpkgs/qbittorrent/patches/musl-execinfo.patch b/srcpkgs/qbittorrent/patches/musl-execinfo.patch index b9a3c68237..3b7132b983 100644 --- a/srcpkgs/qbittorrent/patches/musl-execinfo.patch +++ b/srcpkgs/qbittorrent/patches/musl-execinfo.patch @@ -11,10 +11,10 @@ #endif // Q_OS_UNIX #ifdef STACKTRACE_WIN -@@ -347,7 +349,9 @@ - write(STDERR_FILENO, str1, strlen(str1)); - write(STDERR_FILENO, sigName, strlen(sigName)); - write(STDERR_FILENO, str2, strlen(str2)); +@@ -395,7 +395,9 @@ + reportToUser(str1); + reportToUser(sigName); + reportToUser(str2); +#if defined(__GLIBC__) print_stacktrace(); // unsafe +#endif diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index a26783ee35..8054c53efd 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,7 +1,7 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=3.3.12 -revision=2 +version=3.3.13 +revision=1 build_style=qmake hostmakedepends="automake libtool pkg-config qt5-qmake qt5-tools qt5-host-tools qt5-declarative-devel" @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.qbittorrent.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f +checksum=84317b5127def320cb17fedc2ba78807660216b6ee44650d94eb75e2c8ce468d nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1349/steps/shell_3/logs/stdio build_options="gui webui" 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" 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 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} 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 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 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); + } + }; + 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/" diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index f1389d7039..962dc70ab4 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,6 +1,6 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=4.2.2 +version=4.3.0 revision=1 wrksrc=qt-creator-opensource-src-${version} build_style=qmake @@ -14,7 +14,7 @@ maintainer="Jürgen Buchmüller " license="LGPL-2.1" homepage="http://wiki.qt.io/Category:Tools::QtCreator" distfiles="http://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.gz" -checksum=0402f0e33bf3c8ee7f89c673f25fcf75fef03ba4262e077d9d9f42454d1e799b +checksum=b7ee67d93e14287f14e2c1b376516e843c82520384fbe764ef3d5e77ff4d9646 do_build() { # Note: A simple "make ${makejobs}" fails after libs because @@ -32,11 +32,17 @@ post_install() { # Install the desktop file vinstall ${FILESDIR}/qtcreator.desktop \ 644 usr/share/applications - # Install shared-mime-info files for qmake and cmake projects - vinstall ${wrksrc}/src/plugins/qmakeprojectmanager/QmakeProjectManager.mimetypes.xml \ - 644 usr/share/mime/packages - vinstall ${wrksrc}/src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml \ - 644 usr/share/mime/packages + # Extract and install shared-mime-info files for qmake and cmake projects + cat src/plugins/qmakeprojectmanager/QmakeProjectManager.json | \ + awk '/ "$/{found=0} {if (found) print} /"Mimetypes"/{found=1}' | \ + sed -e's;^ ;;' \ + > QmakeProjectManager.mimetypes.xml + vinstall QmakeProjectManager.mimetypes.xml 644 usr/share/mime/packages + cat src/plugins/cmakeprojectmanager/CMakeProjectManager.json | \ + awk '/ "$/{found=0} {if (found) print} /"Mimetypes"/{found=1}' | \ + sed -e's;^ ;;' \ + > CMakeProjectManager.mimetypes.xml + vinstall CMakeProjectManager.mimetypes.xml 644 usr/share/mime/packages } qtcreator-full_package() { 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" 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} 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}" diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index 3ccfd1b17a..dc9a022f1b 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -1,19 +1,21 @@ # Template file for 'qv4l2' pkgname=qv4l2 -version=1.12.3 +version=1.12.5 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=0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d + +nocross="detects X11/GL support incorrectly" if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" diff --git a/srcpkgs/racer/template b/srcpkgs/racer/template index 1d1c663e57..fc9766cf5b 100644 --- a/srcpkgs/racer/template +++ b/srcpkgs/racer/template @@ -1,6 +1,6 @@ # Template file for 'racer' pkgname=racer -version=2.0.6 +version=2.0.8 revision=1 hostmakedepends="rust cargo" short_desc="Utility intended to provide Rust code completion for editors and IDEs" @@ -8,7 +8,7 @@ maintainer="Michael Gehring " license="MIT" homepage="https://github.com/phildawes/racer" distfiles="https://github.com/phildawes/racer/archive/${version}.tar.gz" -checksum=a9704478f72037e76d4d3702fe39b3c50597bde35dac1a11bf8034de87bbdc70 +checksum=b6a1d3033fe5ca27674afceee936cf6d04b6fc11709513e230a039a2200f8797 nocross=yes do_build() { diff --git a/srcpkgs/racer/update b/srcpkgs/racer/update new file mode 100644 index 0000000000..d340157694 --- /dev/null +++ b/srcpkgs/racer/update @@ -0,0 +1 @@ +ignore="2.07" diff --git a/srcpkgs/radare2/patches/musl.patch b/srcpkgs/radare2/patches/musl.patch new file mode 100644 index 0000000000..b60521c700 --- /dev/null +++ b/srcpkgs/radare2/patches/musl.patch @@ -0,0 +1,11 @@ +--- libr/util/thread_lock.c.orig 2017-05-30 18:46:34.000000000 +0200 ++++ libr/util/thread_lock.c 2017-05-30 19:30:50.261893137 +0200 +@@ -13,7 +13,7 @@ + if (recursive) { + pthread_mutexattr_t attr; + pthread_mutexattr_init (&attr); +-#if !__linux__ || __USE_UNIX98__ ++#if !defined(__GLIBC__) || __USE_UNIX98__ + pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); + #else + pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 331dada909..a1609907ce 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -1,6 +1,6 @@ # Template file for 'radare2' pkgname=radare2 -version=1.4.0 +version=1.5.0 revision=1 build_style=gnu-configure configure_args="--with-syscapstone" @@ -11,4 +11,4 @@ maintainer="Juan RP " license="LGPL-3" homepage="http://www.radare.org" distfiles="https://github.com/radare/radare2/archive/${version}.tar.gz" -checksum=fb58417a6d35af4096da9130a041e1d36f900b17e2c2594b405a9b88ce33c7a8 +checksum=a54a1988527b63299affef0e08b221ef13d6f4a75280231786d554e2bad78085 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" 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 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 diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template index 5e404926e8..6a6c51604b 100644 --- a/srcpkgs/rclone/template +++ b/srcpkgs/rclone/template @@ -1,7 +1,7 @@ # Template file for 'rclone' pkgname=rclone version=1.36 -revision=2 +revision=3 build_style=go go_import_path="github.com/ncw/rclone" short_desc="A rsync for cloud storage" 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 +} 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 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" 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" diff --git a/srcpkgs/retroshare/patches/musl.patch b/srcpkgs/retroshare/patches/musl.patch index d0acb38696..eb76a83232 100644 --- a/srcpkgs/retroshare/patches/musl.patch +++ b/srcpkgs/retroshare/patches/musl.patch @@ -25,3 +25,17 @@ +#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,10 @@ + #include + #endif + ++#ifndef __GLIBC__ ++#define canonicalize_file_name(p) realpath(p, NULL) ++#endif ++ + /**** + * #define RSDIR_DEBUG 1 + ****/ + diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index b3569a4114..d04ec9ad42 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=2 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'` +} 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() { 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 new file mode 100644 index 0000000000..397198dd20 --- /dev/null +++ b/srcpkgs/rix/template @@ -0,0 +1,18 @@ +# 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 + +do_install() { + vbin rixc + vbin clr.sh + vbin comp.sh +} diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template index ae2f8bde53..91ebbded65 100644 --- a/srcpkgs/rkt/template +++ b/srcpkgs/rkt/template @@ -1,7 +1,7 @@ # Template file for 'rkt' pkgname=rkt -version=1.25.0 -revision=1 +version=1.26.0 +revision=2 build_style=gnu-configure hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go" makedepends="acl-devel zlib-devel libressl-devel" @@ -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 diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index 87c6045010..7a7bbdba72 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -1,6 +1,6 @@ # Template file for 'rmlint' pkgname=rmlint -version=2.4.6 +version=2.6.0 revision=1 build_style=scons hostmakedepends="scons pkg-config python3-Sphinx glib-devel" @@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://rmlint.rtfd.org/" distfiles="https://github.com/sahib/$pkgname/archive/v$version.tar.gz" -checksum=1ec614c38dbeb0a5d181286111ed4e37707fcd10e2c3569db0a41ef1765c5415 +checksum=f6810bdca1eb09fabf51dc8d9c4ba9cad70b1072b9965c0343a1747bedfc9415 if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then broken="http://build.voidlinux.eu/builders/armv6l_builder/builds/18864/steps/shell_3/logs/stdio" 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 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" 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}" 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 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 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 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" + } +} 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 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 9b1ea1f732..adeb1056fa 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,6 +1,6 @@ # Template file for 'rust' pkgname=rust -version=1.16.0 +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/ @@ -11,46 +11,47 @@ 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/" 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) + 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 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 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 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 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" diff --git a/srcpkgs/samba/patches/CVE-2017-7494.patch b/srcpkgs/samba/patches/CVE-2017-7494.patch new file mode 100644 index 0000000000..e02093a1ed --- /dev/null +++ b/srcpkgs/samba/patches/CVE-2017-7494.patch @@ -0,0 +1,32 @@ +From c12670f75b6403aa0b7d7c02bd7af0d4f1160b9e Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Mon, 8 May 2017 21:40:40 +0200 +Subject: [PATCH 1/1] CVE-2017-7494: Refuse to open pipe names with / inside + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=12780 + +Signed-off-by: Volker Lendecke +Reviewed-by: Andreas Schneider +--- + source3/rpc_server/srv_pipe.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 251f899..7126865 100644 +--- source3/rpc_server/srv_pipe.c ++++ source3/rpc_server/srv_pipe.c +@@ -473,6 +473,11 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax) + pipename += 1; + } + ++ if (strchr(pipename, '/')) { ++ DEBUG(1,("Refusing open on pipe %s\n", pipename)); ++ return false; ++ } ++ + if (lp_disable_spoolss() && strequal(pipename, "spoolss")) { + DEBUG(10, ("refusing spoolss access\n")); + return false; +2.9.3 + + diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index fdef95399f..d6afd9e0a0 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ -# Template file for 'samba' +# Template file for 'samba' pkgname=samba version=3.6.25 -revision=12 +revision=13 build_wrksrc=source3 build_style=gnu-configure configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap diff --git a/srcpkgs/sane/patches/musl-sigset_t.patch b/srcpkgs/sane/patches/musl-sigset_t.patch deleted file mode 100644 index 1976ff7a2a..0000000000 --- a/srcpkgs/sane/patches/musl-sigset_t.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- include/sane/sanei_backend.h -+++ include/sane/sanei_backend.h -@@ -68,9 +68,11 @@ - - /* Just enough backwards compatibility that we get by in the backends - without making handstands. */ -+#if 0 - # ifdef sigset_t - # undef sigset_t - # endif -+#endif - # ifdef sigemptyset - # undef sigemptyset - # endif -@@ -96,7 +98,9 @@ - # undef SIG_SETMASK - # endif - -+#if 0 - # define sigset_t int -+#endif - # define sigemptyset(set) do { *(set) = 0; } while (0) - # define sigfillset(set) do { *(set) = ~0; } while (0) - # define sigaddset(set,signal) do { *(set) |= sigmask (signal); } while (0) diff --git a/srcpkgs/sane/patches/musl-sys_types_h.patch b/srcpkgs/sane/patches/musl-sys_types_h.patch deleted file mode 100644 index 5866a4130f..0000000000 --- a/srcpkgs/sane/patches/musl-sys_types_h.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- include/sane/sanei_udp.h -+++ include/sane/sanei_udp.h -@@ -27,6 +27,9 @@ - #include - #include - #endif -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp); - extern SANE_Status sanei_udp_open_broadcast(int *fdp); ---- backend/kvs20xx_cmd.h -+++ backend/kvs20xx_cmd.h -@@ -9,6 +9,10 @@ - Panasonic KV-S20xx USB-SCSI scanners. - */ - -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif -+ - #define COMMAND_BLOCK 1 - #define DATA_BLOCK 2 - #define RESPONSE_BLOCK 3 ---- backend/kvs40xx.h -+++ backend/kvs40xx.h -@@ -10,6 +10,9 @@ - - #include "../include/sane/config.h" - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #undef BACKEND_NAME - #define BACKEND_NAME kvs40xx ---- backend/hp5400.c -+++ backend/hp5400.c -@@ -67,6 +67,9 @@ - #include /* malloc, free */ - #include /* memcpy */ - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - - #define HP5400_CONFIG_FILE "hp5400.conf" ---- backend/hp5590.c -+++ backend/hp5590.c -@@ -48,6 +48,9 @@ - #include - #include - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #include "../include/sane/sane.h" - #define BACKEND_NAME hp5590 ---- backend/epsonds-io.c -+++ backend/epsonds-io.c -@@ -16,6 +16,9 @@ - #include "sane/config.h" - #include - #include /* sleep */ -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #include "epsonds.h" - #include "epsonds-io.h" diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index 3c2c6dd404..b9a362b094 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -1,26 +1,24 @@ # Template file for 'sane' pkgname=sane -version=1.0.25 -revision=2 +version=1.0.27 +revision=1 wrksrc="sane-backends-${version}" build_style=gnu-configure build_options="snmp" -configure_args="--disable-locking --enable-avahi --disable-latex --enable-ipv6 - --with-docdir=/usr/share/doc/sane --enable-libusb_1_0 --enable-pthread - ac_cv_func_mmap_fixed_mapped=yes +configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread + --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes $(vopt_with snmp)" hostmakedepends="pkg-config" makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel libressl-devel $(vopt_if snmp net-snmp-devel)" depends="$(vopt_if snmp net-snmp)" -replaces="sane-udev-rules>=0" conf_files="/etc/sane.d/*.conf" short_desc="Scanner Access Now Easy" maintainer="Juan RP " homepage="http://www.sane-project.org/" license="GPL-2" -distfiles="http://ftp.lfs-matrix.net/pub/blfs/conglomeration/sane-backends/sane-backends-${version}.tar.gz" -checksum=a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c +distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz" +checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9 post_install() { # fix hp officejets diff --git a/srcpkgs/sbcl/patches/musl-fixes.patch b/srcpkgs/sbcl/patches/musl-fixes.patch index cfd18746a4..f0d179720b 100644 --- a/srcpkgs/sbcl/patches/musl-fixes.patch +++ b/srcpkgs/sbcl/patches/musl-fixes.patch @@ -74,17 +74,6 @@ #ifndef LISP_FEATURE_WIN32 #include ---- src/runtime/GNUmakefile 2016-11-30 08:07:36.000000000 +1100 -+++ src/runtime/GNUmakefile 2016-12-17 16:41:46.823387383 +1100 -@@ -24,7 +24,7 @@ - - include ../../output/prefix.def - --CFLAGS = -g -Wall -Wsign-compare -O3 -+CFLAGS = -g -Wall -Wsign-compare -O3 -D_GNU_SOURCE=1 - ASFLAGS = $(CFLAGS) - CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\" - --- contrib/sb-bsd-sockets/constants.lisp.orig +++ contrib/sb-bsd-sockets/constants.lisp @@ -93,8 +93,8 @@ diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index e4f1dbdce9..3ff3a076c2 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=1.3.17 +version=1.3.18 revision=1 only_for_archs="x86_64 x86_64-musl armv7l aarch64" hostmakedepends="iana-etc" @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="custom" homepage="http://www.sbcl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=94b9f576328de3a5d9ced452fdaa4d2f55437af8838fbbfb4f226c86591a0daf +checksum=fb2d622cba55ac441b7eb1be3c7343cd5e80f0c194bc648341aa0bb08f61398e nocross=yes nopie=yes @@ -19,7 +19,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" d782a1b6f0666b26c9e7c2487bbb1c542c5c597627f1ead3d6692970df369987" + checksum+=" eb44d9efb4389f71c05af0327bab7cd18f8bb221fb13a6e458477a9194853958" ;; i686) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.7-x86-linux-binary.tar.bz2" diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template index b54bd9981d..18cd15918d 100644 --- a/srcpkgs/scaleway-cli/template +++ b/srcpkgs/scaleway-cli/template @@ -1,6 +1,6 @@ # Template file for 'scaleway-cli' pkgname=scaleway-cli -version=1.12 +version=1.13 revision=2 build_style="go" go_import_path="github.com/scaleway/scaleway-cli" @@ -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 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 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" diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index 7dd9ff4ffc..b4ac40bc2f 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,6 +1,6 @@ # Template file for 'scite' pkgname=scite -version=3.7.4 +version=3.7.5 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://www.scintilla.org/SciTEDownload.html" distfiles="http://www.scintilla.org/scite${version//./}.tgz" -checksum=197372e80db2c16c86d9677a56a430209dc2f2adfdf9b7bda73b62dd19eb1e20 +checksum=51e6861284077268d4929bb2ff9c516e2ca8914b2bd0ac315d177befe24aef86 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile diff --git a/srcpkgs/scite/update b/srcpkgs/scite/update index a9daa60e50..4f680b4542 100644 --- a/srcpkgs/scite/update +++ b/srcpkgs/scite/update @@ -1 +1 @@ -ignore="370 371 372 373 374" +ignore="370 371 372 373 374 375" 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 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 diff --git a/srcpkgs/sct/template b/srcpkgs/sct/template new file mode 100644 index 0000000000..f70d83a0de --- /dev/null +++ b/srcpkgs/sct/template @@ -0,0 +1,17 @@ +# Template file for 'sct' +pkgname=sct +version=0.4 +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=9b36ea3342eaad3077077176ac43105dfc8260d940fbeeb8827d5f1467faa764 + +do_install() { + vbin sct + vman sct.1 +} 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 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 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 diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template index 5b6087a01e..439cc3d5db 100644 --- a/srcpkgs/shfmt/template +++ b/srcpkgs/shfmt/template @@ -1,7 +1,7 @@ # Template file for 'shfmt' pkgname=shfmt -version=1.3.0 -revision=1 +version=1.3.1 +revision=2 build_style=go go_import_path="github.com/mvdan/sh" go_package="${go_import_path}/cmd/shfmt" @@ -11,7 +11,7 @@ maintainer="Michael Gehring " license="BSD" homepage="https://github.com/mvdan/sh" distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz" -checksum=e1c2ad59e18e9a0af4bfb3f75c9b1c783877f2bcf839784b5bf488bb36b80bf7 +checksum=322768c53a2e83f84b69e9f85dd9865d60d3001244c4a6b6a15ff779c6bd8b4a post_install() { vlicense LICENSE diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 8effd41dbe..665ba24a1f 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,6 +1,6 @@ # Template file for 'shotwell' pkgname=shotwell -version=0.26.1 +version=0.26.2 revision=1 lib32disabled=yes nocross=yes @@ -18,4 +18,4 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="https://wiki.gnome.org/Apps/Shotwell" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0a60cc8a132fd962ed8c73f82b3f8ad7cbf1014bb93e89eee83e5c9a8c0b5375 +checksum=4f65283d54772ef6344b8e8acb242f06b7f5b3f8e42ccb292b02c06a8dc2323b diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template index 8bb857fae7..ee5ed9c938 100644 --- a/srcpkgs/sift/template +++ b/srcpkgs/sift/template @@ -1,7 +1,7 @@ # Template file for 'sift' pkgname=sift version=0.9.0 -revision=4 +revision=5 build_style=go hostmakedepends="git-perl" short_desc="A fast and powerful open source alternative to grep" 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" diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index 0d9b080f90..8d1c9543d9 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.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=38408ff6d0aec581010ecf9e49703ec5f4c8887bbe68717ec087634a7ade849c +checksum=aa387f11a01751b37fd32603fdf9328a979f74f97f0172def1b0ad73b7e8d51d CFLAGS="-D_DEFAULT_SOURCE" diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template index 0938f33d6c..7012fa0057 100644 --- a/srcpkgs/slit/template +++ b/srcpkgs/slit/template @@ -1,7 +1,7 @@ # Template file for 'slit' pkgname=slit -version=1.1.3 -revision=1 +version=1.1.5 +revision=2 build_style=go go_import_path="github.com/tigrawap/slit" short_desc="A modern PAGER for viewing logs" @@ -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=8bc3bf6da6dd94a0b873eef91c94f6d74d7f9acf0925450823ff0443b62aa2ea post_install() { vlicense LICENSE diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template index fd12e11aa7..01951421fb 100644 --- a/srcpkgs/slop/template +++ b/srcpkgs/slop/template @@ -1,16 +1,16 @@ # Template file for 'slop' pkgname=slop -version=5.3.37 +version=6.3.41 revision=1 build_style=cmake hostmakedepends="pkg-config" -makedepends="imlib2-devel glew-devel libXext-devel libXrender-devel glm" +makedepends="libXext-devel libXrender-devel MesaLib-devel glm" short_desc="Utility to query for a selection and print the region to stdout" maintainer="Juan RP " license="GPL-3" homepage="https://github.com/naelstrof/slop" distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz" -checksum=3a1656f8ccc53ab5a2c6ffe095893b05cf50a3ba5d33857ecf48ce3f448051dc +checksum=ebe24c34f22d1cd0efd3c71f3af4a10766baee139d37c01babeb9f1fa6023bfa pre_configure() { sed -i -e '$a\set_target_properties(slopy PROPERTIES VERSION 0.1.0)' CMakeLists.txt diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index 44858d3756..e11080db06 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.6.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=2f9f3cdb2cc9825ade75cb1db762b7f99ea0264fe51a239d4c273f0d8a9df94d pre_build() { export QMAKE_OPTS="QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CFLAGS=\"${CFLAGS}\" \ diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template index 81c9e2da7b..3bde2dd787 100644 --- a/srcpkgs/smtube/template +++ b/srcpkgs/smtube/template @@ -1,8 +1,13 @@ # Template file for 'smtube' pkgname=smtube -version=17.1.0 -revision=1 -build_style=gnu-makefile +version=17.5.0 +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" @@ -11,11 +16,12 @@ 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}\"" +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} } diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 51ae3c3618..f0d774ef6a 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,6 +1,6 @@ # Template file for 'snapper' pkgname=snapper -version=0.4.1 +version=0.5.0 revision=2 lib32disabled=yes build_style=gnu-configure @@ -9,12 +9,13 @@ 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" 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 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" diff --git a/srcpkgs/snapraid/template b/srcpkgs/snapraid/template index 8b93f21189..3cc2bc789f 100644 --- a/srcpkgs/snapraid/template +++ b/srcpkgs/snapraid/template @@ -1,6 +1,6 @@ # Template file for 'snapraid' pkgname=snapraid -version=11.0 +version=11.1 revision=1 build_style=gnu-configure depends="smartmontools" @@ -10,7 +10,7 @@ maintainer="Evan Deaubl " license="GPL-3" homepage="http://www.snapraid.it" distfiles="https://github.com/amadvance/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" -checksum=30a72b8853ea750128c96784b73bb55f7faa4b16367b2e03f40c1f78515c5771 +checksum=b9acafeb6cece61fd426f08362b596ba89eea0564231955b82156fd09c0e6884 post_install() { vsconf snapraid.conf.example 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" 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 diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template index 850962ade6..7440aa035d 100644 --- a/srcpkgs/spotify/template +++ b/srcpkgs/spotify/template @@ -1,6 +1,6 @@ # Template build file for 'spotify'. pkgname=spotify -version=1.0.53 +version=1.0.55 revision=1 short_desc="Proprietary music streaming client" maintainer="Stefan Mühlinghaus " @@ -13,11 +13,11 @@ build_style=fetch depends="binutils gtk+ nss GConf libXScrnSaver xz" if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then - _sversion=".758.gde3fc4b2-33_amd64" - _schecksum="6fac209d35828bc9a8bc5449320b92310462a2f78201e3ea620e743fc45e06ea" + _sversion=".487.g256699aa-16_amd64" + _schecksum="20073ba6fdf7d960361d4cb2afa6453e7a2108bd84df8f9cdf2cdf7225a83027" else - _sversion=".758.gde3fc4b2-34_i386" - _schecksum="1c559e776481ae8b03d966bd931f788030d41ad9cd751c43fe99616494a7d84a" + _sversion=".487.g256699aa-16_i386" + _schecksum="183f87b930b75d85ecb34cef2b26b0355a3a18ffa38e0e0a476bfb190972b74d" fi do_install() { diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 1daa72bad4..899dfa662f 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.2 +revision=1 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ }) wrksrc="sqlite-autoconf-${_amalgamationver}" build_style=gnu-configure @@ -9,15 +9,15 @@ configure_args="--enable-threadsafe --enable-readline --enable-dynamic-extension makedepends="libedit-devel" short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " -homepage="http://www.sqlite.org" +homepage="https://sqlite.org/" license="Public Domain" -distfiles="http://sqlite.org/2017/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=3757612463976e7d08c5e9f0af3021613fc24bbcfe1c51197d6776b9ece9ac5c +distfiles="${homepage}/2017/sqlite-autoconf-${_amalgamationver}.tar.gz" +checksum=ca5361fb01cc3ad63d6fd4eb2cb0b6398e629595896d3558f7e121d37dac2ffc CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \ - -DSQLITE_ENABLE_FTS3_TOKENIZER=1 " + -DSQLITE_ENABLE_FTS3_TOKENIZER=1" # explicitly enable fdatasync CFLAGS+=" -DHAVE_FDATASYNC" disable_parallel_build=yes 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 new file mode 100644 index 0000000000..fc0748a4f6 --- /dev/null +++ b/srcpkgs/srw/template @@ -0,0 +1,17 @@ +# 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 + +pre_build() { + sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk + sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk +} 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 } 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)' 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= ;; 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 } diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template index d2c47222d3..475600f618 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.034 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=757bb45db1128227dad66f99cc1cdcef2a591401abaaecb56eb9cf8a0b89038f diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 1b9a7b3592..259d602fd2 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.20p2 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=bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 post_configure() { case "$XBPS_TARGET_MACHINE" in 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 +} diff --git a/srcpkgs/sunwait/update b/srcpkgs/sunwait/update new file mode 100644 index 0000000000..050add5a2b --- /dev/null +++ b/srcpkgs/sunwait/update @@ -0,0 +1 @@ +ignore="20041208" 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" + } +} + 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 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 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 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" diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index 54e806c335..72748541c4 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.29 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=99002701279abedace88283b1381ff7850b6c20df62ae119b271ffd89716fcfd pre_build() { GOARCH= go run script/genassets.go gui > ./lib/auto/gui.files.go 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" 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 +} 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 diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template index 0e9ce25173..61dbd987bc 100644 --- a/srcpkgs/tag/template +++ b/srcpkgs/tag/template @@ -1,7 +1,7 @@ # Template file for 'tag' pkgname=tag version=1.3.0 -revision=4 +revision=5 build_style=go hostmakedepends="git mercurial" go_import_path="github.com/aykamko/${pkgname}" 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" 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 " diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index 4e31f0408e..8ec8f53389 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,7 +1,7 @@ # Template file for 'terraform' pkgname=terraform -version=0.9.4 -revision=1 +version=0.9.6 +revision=2 build_style=go short_desc="A tool for building, changing, and combining infrastructure" maintainer="Andrea Brancaleoni " @@ -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=2af004ee5a155317e6df0158a5d9121d15aa349202ca7d7dd8321f2d9af2218c case "${XBPS_TARGET_MACHINE}" in arm*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/1032/steps/shell_3/logs/stdio" ;; diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template index 3f041b8fd5..2ba5c9cb30 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 +version=3.05.01 +revision=1 wrksrc=tesseract-${version} _tessdata_ver=8bf2e7ad08db9ca174ae2b0b3a7498c9f1f71d40 build_style=gnu-configure @@ -16,7 +16,7 @@ distfiles=" https://github.com/tesseract-ocr/tesseract/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz https://github.com/tesseract-ocr/tessdata/archive/${_tessdata_ver}.tar.gz>tessdata-${_tessdata_ver}.tar.gz" checksum=" - 3fe83e06d0f73b39f6e92ed9fc7ccba3ef734877b76aa5ddaaa778fac095d996 + 05898f93c5d057fada49b9a116fc86ad9310ff1726a0f499c3e5211b3af47ec1 fd5cfdcada2a83aea8c855fbf916e1b34882659f796c10449c78d1385264d5a2" # Create a package for one specific language $1 diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template index dd387fc6f7..41137de007 100644 --- a/srcpkgs/tgt/template +++ b/srcpkgs/tgt/template @@ -1,6 +1,6 @@ # Template file for 'tgt' pkgname=tgt -version=1.0.69 +version=1.0.70 revision=1 build_style=gnu-makefile make_install_args="sbindir=/usr/bin" @@ -9,17 +9,18 @@ make_dirs="/etc/tgt/conf.d 0755 root root" hostmakedepends="libxslt docbook-xsl" depends="perl-Config-General" short_desc="Linux SCSI target framework" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-3" homepage="http://stgt.sourceforge.net/" distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz" -checksum=08287df2547aa7df26e81b53f9d76bad0f080b59e42d013c46985d7a6d8e242d +checksum=921304808b31ac1592e071683799b9ff0f46db8e0eb79a7bff02e0081776b4ba post_extract() { sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS)/g' usr/Makefile sed -i '/^LDFLAGS/d; /CC.*-o/s/$/ $(LDFLAGS)/' usr/Makefile sed -i '1i#include ' usr/tgtd.h usr/util.h sed -i '1i#include ' usr/libssc.c + sed -i '1i#include ' usr/bs_sg.c sed -i 's/__always_inline/inline/g' usr/util.h } 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 diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index 1650ea6c0a..33774c31cf 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,6 +1,6 @@ # Template file for 'thefuck' pkgname=thefuck -version=3.15 +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=30d0c1e2c2540396c9719316f2f0d14fa1820ee8c71d6f160bc4d50283d0aaef +checksum=c6175c45ac82b1abe552f28a05b9b369f864a763d4d60178c1fde584209e5bf7 post_install() { vlicense LICENSE.md 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"} + diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index e3bc119d4c..a04725832a 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=1 +version=52.1.1 +revision=2 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 @@ -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) 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 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 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() { 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" 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 diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template index c0c78f6331..c7f0164c86 100644 --- a/srcpkgs/tinycron/template +++ b/srcpkgs/tinycron/template @@ -1,7 +1,7 @@ # Template file for 'tinycron' pkgname=tinycron version=0.4 -revision=4 +revision=5 build_style=go go_import_path="github.com/bcicen/tinycron" hostmakedepends="git" 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 " diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template index 318e63b58f..e5f5eab15c 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -1,6 +1,6 @@ # Template file for 'tmux' pkgname=tmux -version=2.4 +version=2.5 revision=1 build_style=gnu-configure makedepends="ncurses-devel libevent-devel" @@ -9,7 +9,7 @@ maintainer="Juan RP " homepage="http://tmux.github.io" license="ISC" distfiles="https://github.com/tmux/tmux/releases/download/${version}/tmux-${version}.tar.gz" -checksum=757d6b13231d0d9dd48404968fc114ac09e005d475705ad0cd4b7166f799b349 +checksum=ae135ec37c1bf6b7750a84e3a35e93d91033a806943e034521c8af51b12d95df post_install() { vlicense COPYING 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 +} 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";; 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" diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template index 22f92953fa..dbc4e91954 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,15 @@ 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 + +post_extract() { + sed -i '1i#include ' trace-listen.c +} kernelshark_package() { depends="${sourcepkg}>=${version}_${revision}" 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' diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template index 904b4e91cd..0dfa769a22 100644 --- a/srcpkgs/tracebox/template +++ b/srcpkgs/tracebox/template @@ -1,10 +1,10 @@ # Template file for 'tracebox' pkgname=tracebox -version=0.3.1 -revision=3 +version=0.4.1 +revision=1 _click_ver=2.0.1 -_crafter_git=fed3a35e146a20ac2f02e876ccf5953b8fef422d -_crafter_ver=0.3.1git +_crafter_git=25e2d7bbe23692b320dd3c9165c3bce06d6e999d +_crafter_ver=0.3.2git build_style=gnu-configure only_for_archs="i686 x86_64" hostmakedepends="automake pkg-config libtool unzip" @@ -19,9 +19,9 @@ https://github.com/tracebox/tracebox/archive/v${version}.tar.gz>tracebox-${versi https://github.com/bhesmans/click/archive/v${_click_ver}.tar.gz>click-${_click_ver}.tar.gz https://github.com/pellegre/libcrafter/archive/${_crafter_git}.zip>libcrafter-${_crafter_ver}.zip" checksum=" -bd5b4faf83b9a8a092208a676c50064604ca7004f8ff747f663c7918ead0cc87 +568cadad69074b7906c87b0020d1e5ec05d201ee8f579ce5ecbd4844c10dc817 4e48591cb385000ee8daedf3cc18d4b00a9c5a142cc001e0780f0c7ebd713764 -4254d83c986e6e5fcc989d82b021b6ad340aa221dd52a99c8560acc6c6906116" +d1daa2add6892a301054d39175f725e9f7bfb34e154437703c9db269cde23684" CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1" 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 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])" diff --git a/srcpkgs/twemoji/template b/srcpkgs/twemoji/template index 83214b34d6..c67a29538e 100644 --- a/srcpkgs/twemoji/template +++ b/srcpkgs/twemoji/template @@ -1,6 +1,6 @@ # Template build file for 'twemoji'. pkgname=twemoji -version=1.1 +version=1.2 revision=1 depends="font-util" font_dirs="/usr/share/fonts/twemoji" @@ -9,7 +9,7 @@ maintainer="Sir_Boops " license="CC-BY-4, MIT" homepage="https://github.com/eosrei/twemoji-color-font" distfiles="https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz" -checksum=1e63ba00d54120c88505af76a91f0e1180701dfe6034257f2e3c1eedf5b8367b +checksum=1de6443c6ca0923e503e3350d1c42c2413235868665d0ca9e58690cb447e5f35 wrksrc="TwitterColorEmoji-SVGinOT-Linux-${version}" noarch="yes" 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!" ;; 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 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" 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 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 diff --git a/srcpkgs/util-linux/patches/fix-musl-2.patch b/srcpkgs/util-linux/patches/fix-musl-2.patch deleted file mode 100644 index 2786f617c4..0000000000 --- a/srcpkgs/util-linux/patches/fix-musl-2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fixes rendering issue with chsh - ---- login-utils/chsh.c.orig 2015-08-01 23:56:41.281133707 +0200 -+++ login-utils/chsh.c 2015-08-01 23:56:52.116132896 +0200 -@@ -179,6 +179,7 @@ static char *ask_new_shell(char *questio - if (!oldshell) - oldshell = ""; - printf("%s [%s]: ", question, oldshell); -+ fflush(stdout); - sz = getline(&ans, &dummy, stdin); - if (sz == -1) - return NULL; - diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index b1cd9c5f89..dfeba50b84 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,25 +1,20 @@ # Template file for 'util-linux' pkgname=util-linux -version=2.29.2 +version=2.30 revision=1 short_desc="Miscellaneous linux utilities" maintainer="Juan RP " homepage="https://www.kernel.org/pub/linux/utils/util-linux/" license="GPL-2" -distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.*}/${pkgname}-${version}.tar.xz" -checksum=accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 +distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version}/${pkgname}-${version}.tar.xz" +checksum=c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d -hostmakedepends="automake gettext-devel libtool pkg-config" +hostmakedepends="automake gettext-devel libtool pkg-config bison" makedepends="zlib-devel readline-devel pam-devel libcap-ng-devel" # Create uuidd system account for uuidd. system_accounts="uuidd" uuidd_homedir="/run/uuidd" -conf_files=" - /etc/pam.d/chfn - /etc/pam.d/chsh - /etc/pam.d/su - /etc/pam.d/su-l - /etc/pam.d/login" +conf_files="/etc/pam.d/*" provides="eject-${version}_1" # XXX musl needs this for switch_root(8). 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" diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index 42d8674465..a84de2b02c 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.5 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=0618162ddb0b57fe7c45407d4d66ed79e3a134cdbc9e72598d34e61d3359e20d case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template index cf73b40bc9..9371d0116e 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.5 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=69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a 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 } @@ -41,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 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" 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" 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 diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index 30f4972469..25ba861685 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 +version=3.2.0 +revision=2 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=a1b1042c90e9e0cc7dd2e3c436c273bbf417248788154d4b35d030e67b4720ab pre_configure() { sed -i "s/pypi/arch/" vidcutter/__init__.py 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() { 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 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 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" diff --git a/srcpkgs/vlc/files/vlc-2.2.4-gcc6_fixes-1.patch b/srcpkgs/vlc/files/vlc-2.2.4-gcc6_fixes-1.patch deleted file mode 100644 index 68229a0963..0000000000 --- a/srcpkgs/vlc/files/vlc-2.2.4-gcc6_fixes-1.patch +++ /dev/null @@ -1,395 +0,0 @@ -Submitted By: Bruce dubbs -Date: 2016-07-27 -Initial Package Version: 2.2.7 -Upstream Status: Unknown -Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/vlc-gcc6-buildfixes.patch -Description: Fixes building against gcc6 - ---- vlc-2.2.3.orig/include/vlc_atomic.h -+++ vlc-2.2.3/include/vlc_atomic.h -@@ -26,13 +26,20 @@ - * Atomic operations do not require locking, but they are not very powerful. - */ - --# if !defined (__cplusplus) && (__STDC_VERSION__ >= 201112L) \ -- && !defined (__STDC_NO_ATOMICS__) -+/* Clang older versions support atomics but lacks the stdatomic.h header */ -+#if defined(__clang__) -+# if !defined(__has_include) || !__has_include() -+# define __STDC_NO_ATOMICS__ 1 -+# endif -+#endif - -+# ifndef __cplusplus -+# if (__STDC_VERSION__ >= 201112L) && !defined (__STDC_NO_ATOMICS__) - /*** Native C11 atomics ***/ --# include -+# include - --# else -+# else -+/*** Intel/GCC atomics ***/ - - # define ATOMIC_FLAG_INIT false - -@@ -53,22 +60,6 @@ - # define atomic_is_lock_free(obj) \ - false - --/* In principles, __sync_*() only supports int, long and long long and their -- * unsigned equivalents, i.e. 4-bytes and 8-bytes types, although GCC also -- * supports 1 and 2-bytes types. Some non-x86 architectures do not support -- * 8-byte atomic types (or not efficiently). */ --# if defined (_MSC_VER) --/* Some atomic operations of the Interlocked API are only -- available for desktop apps. Thus we define the atomic types to -- be at least 32 bits wide. */ --typedef int_least32_t atomic_flag; --typedef int_least32_t atomic_bool; --typedef int_least32_t atomic_char; --typedef int_least32_t atomic_schar; --typedef uint_least32_t atomic_uchar; --typedef int_least32_t atomic_short; --typedef uint_least32_t atomic_ushort; --# else - typedef bool atomic_flag; - typedef bool atomic_bool; - typedef char atomic_char; -@@ -76,7 +67,6 @@ typedef signed char atomic_schar; - typedef unsigned char atomic_uchar; - typedef short atomic_short; - typedef unsigned short atomic_ushort; --# endif - typedef int atomic_int; - typedef unsigned int atomic_uint; - typedef long atomic_long; -@@ -109,10 +99,6 @@ typedef ptrdiff_t atomic_ptrdiff - typedef intmax_t atomic_intmax_t; - typedef uintmax_t atomic_uintmax_t; - --# if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || (defined (__clang__) && (defined (__x86_64__) || defined (__i386__))) -- --/*** Intel/GCC atomics ***/ -- - # define atomic_store(object,desired) \ - do { \ - *(object) = (desired); \ -@@ -203,204 +189,7 @@ typedef uintmax_t atomic_uintmax - # define atomic_flag_clear_explicit(object,order) \ - atomic_flag_clear(object) - --# elif defined (__GNUC__) -- --/*** No atomics ***/ -- --# define atomic_store(object,desired) \ -- do { \ -- typeof (object) _obj = (object); \ -- typeof (*object) _des = (desired); \ -- vlc_global_lock(VLC_ATOMIC_MUTEX); \ -- *_obj = _des; \ -- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ -- } while (0) --# define atomic_store_explicit(object,desired,order) \ -- atomic_store(object,desired) -- --# define atomic_load(object) \ --({ \ -- typeof (object) _obj = (object); \ -- typeof (*object) _old; \ -- vlc_global_lock(VLC_ATOMIC_MUTEX); \ -- _old = *_obj; \ -- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ -- _old; \ --}) --# define atomic_load_explicit(object,order) \ -- atomic_load(object) -- --# define atomic_exchange(object,desired) \ --({ \ -- typeof (object) _obj = (object); \ -- typeof (*object) _des = (desired); \ -- typeof (*object) _old; \ -- vlc_global_lock(VLC_ATOMIC_MUTEX); \ -- _old = *_obj; \ -- *_obj = _des; \ -- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ -- _old; \ --}) --# define atomic_exchange_explicit(object,desired,order) \ -- atomic_exchange(object,desired) -- --# define atomic_compare_exchange_strong(object,expected,desired) \ --({ \ -- typeof (object) _obj = (object); \ -- typeof (object) _exp = (expected); \ -- typeof (*object) _des = (desired); \ -- bool ret; \ -- vlc_global_lock(VLC_ATOMIC_MUTEX); \ -- ret = *_obj == *_exp; \ -- if (ret) \ -- *_obj = _des; \ -- else \ -- *_exp = *_obj; \ -- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ -- ret; \ --}) --# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ -- atomic_compare_exchange_strong(object, expected, desired) --# define atomic_compare_exchange_weak(object,expected,desired) \ -- atomic_compare_exchange_strong(object, expected, desired) --# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ -- atomic_compare_exchange_weak(object, expected, desired) -- --# define atomic_fetch_OP(object,desired,op) \ --({ \ -- typeof (object) _obj = (object); \ -- typeof (*object) _des = (desired); \ -- typeof (*object) _old; \ -- vlc_global_lock(VLC_ATOMIC_MUTEX); \ -- _old = *_obj; \ -- *_obj = (*_obj) op (_des); \ -- vlc_global_unlock(VLC_ATOMIC_MUTEX); \ -- _old; \ --}) -- --# define atomic_fetch_add(object,operand) \ -- atomic_fetch_OP(object,operand,+) --# define atomic_fetch_add_explicit(object,operand,order) \ -- atomic_fetch_add(object,operand) -- --# define atomic_fetch_sub(object,operand) \ -- atomic_fetch_OP(object,operand,-) --# define atomic_fetch_sub_explicit(object,operand,order) \ -- atomic_fetch_sub(object,operand) -- --# define atomic_fetch_or(object,operand) \ -- atomic_fetch_OP(object,operand,|) --# define atomic_fetch_or_explicit(object,operand,order) \ -- atomic_fetch_or(object,operand) -- --# define atomic_fetch_xor(object,operand) \ -- atomic_fetch_OP(object,operand,^) --# define atomic_fetch_xor_explicit(object,operand,order) \ -- atomic_fetch_sub(object,operand) -- --# define atomic_fetch_and(object,operand) \ -- atomic_fetch_OP(object,operand,&) --# define atomic_fetch_and_explicit(object,operand,order) \ -- atomic_fetch_and(object,operand) -- --# define atomic_flag_test_and_set(object) \ -- atomic_exchange(object, true) -- --# define atomic_flag_test_and_set_explicit(object,order) \ -- atomic_flag_test_and_set(object) -- --# define atomic_flag_clear(object) \ -- atomic_store(object, false) -- --# define atomic_flag_clear_explicit(object,order) \ -- atomic_flag_clear(object) -- --# elif defined (_MSC_VER) -- --# include -- --/*** Use the Interlocked API. ***/ -- --/* Define macros in order to dispatch to the correct function depending on the type. -- Several ranges are need because some operations are not implemented for all types. */ --# define atomic_type_dispatch_32_64(operation, object, ...) \ -- (sizeof(*object) == 4 ? operation((LONG *)object, __VA_ARGS__) : \ -- sizeof(*object) == 8 ? operation##64((LONGLONG *)object, __VA_ARGS__) : \ -- (abort(), 0)) -- --# define atomic_type_dispatch_16_64(operation, object, ...) \ -- (sizeof(*object) == 2 ? operation##16((short *)object, __VA_ARGS__) : \ -- atomic_type_dispatch_32_64(operation, object, __VA_ARGS__)) -- --# define atomic_type_dispatch_8_64(operation, object, ...) \ -- (sizeof(*object) == 1 ? operation##8((char *)object, __VA_ARGS__) : \ -- atomic_type_dispatch_16_64(operation, object, __VA_ARGS__)) -- --# define atomic_store(object,desired) \ -- atomic_type_dispatch_16_64(InterlockedExchange, object, desired) --# define atomic_store_explicit(object,desired,order) \ -- atomic_store(object, desired) -- --# define atomic_load(object) \ -- atomic_type_dispatch_16_64(InterlockedCompareExchange, object, 0, 0) --# define atomic_load_explicit(object,order) \ -- atomic_load(object) -- --# define atomic_exchange(object,desired) \ -- atomic_type_dispatch_16_64(InterlockedExchange, object, desired) --# define atomic_exchange_explicit(object,desired,order) \ -- atomic_exchange(object, desired) -- --# define atomic_compare_exchange_strong(object,expected,desired) \ -- atomic_type_dispatch_16_64(InterlockedCompareExchange, object, *expected, desired) == *expected --# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ -- atomic_compare_exchange_strong(object, expected, desired) --# define atomic_compare_exchange_weak(object,expected,desired) \ -- atomic_compare_exchange_strong(object, expected, desired) --# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ -- atomic_compare_exchange_weak(object, expected, desired) -- --# define atomic_fetch_add(object,operand) \ -- atomic_type_dispatch_32_64(InterlockedExchangeAdd, object, operand) --# define atomic_fetch_add_explicit(object,operand,order) \ -- atomic_fetch_add(object, operand) -- --# define atomic_fetch_sub(object,operand) \ -- atomic_type_dispatch_32_64(InterlockedExchangeAdd, object, -(LONGLONG)operand) --# define atomic_fetch_sub_explicit(object,operand,order) \ -- atomic_fetch_sub(object, operand) -- --# define atomic_fetch_or(object,operand) \ -- atomic_type_dispatch_8_64(InterlockedOr, object, operand) --# define atomic_fetch_or_explicit(object,operand,order) \ -- atomic_fetch_or(object, operand) -- --# define atomic_fetch_xor(object,operand) \ -- atomic_type_dispatch_8_64(InterlockedXor, object, operand) --# define atomic_fetch_xor_explicit(object,operand,order) \ -- atomic_fetch_sub(object, operand) -- --# define atomic_fetch_and(object,operand) \ -- atomic_type_dispatch_8_64(InterlockedAnd, object, operand) --# define atomic_fetch_and_explicit(object,operand,order) \ -- atomic_fetch_and(object, operand) -- --# define atomic_flag_test_and_set(object) \ -- atomic_exchange(object, true) -- --# define atomic_flag_test_and_set_explicit(object,order) \ -- atomic_flag_test_and_set(object) -- --# define atomic_flag_clear(object) \ -- atomic_store(object, false) -- --# define atomic_flag_clear_explicit(object,order) \ -- atomic_flag_clear(object) -- --# else --# error FIXME: implement atomic operations for this compiler. --# endif --# endif -+# endif /* !C11 */ - - typedef atomic_uint_least32_t vlc_atomic_float; - -@@ -427,4 +216,9 @@ static inline void vlc_atomic_store_floa - atomic_store(atom, u.i); - } - -+# else /* C++ */ -+/*** Native C++11 atomics ***/ -+# include -+# endif /* C++ */ -+ - #endif -Index: vlc-2.2.3/include/vlc_spu.h -=================================================================== ---- vlc-2.2.3.orig/include/vlc_spu.h -+++ vlc-2.2.3/include/vlc_spu.h -@@ -45,9 +45,6 @@ extern "C" { - - typedef struct spu_private_t spu_private_t; - --/* Default subpicture channel ID */ --#define SPU_DEFAULT_CHANNEL (1) -- - /** - * Subpicture unit descriptor - */ -Index: vlc-2.2.3/include/vlc_vout_osd.h -=================================================================== ---- vlc-2.2.3.orig/include/vlc_vout_osd.h -+++ vlc-2.2.3/include/vlc_vout_osd.h -@@ -26,12 +26,13 @@ - #ifndef VLC_VOUT_OSD_H - #define VLC_VOUT_OSD_H 1 - --#include -- - #ifdef __cplusplus - extern "C" { - #endif - -+//* Default subpicture channel ID */ -+#define SPU_DEFAULT_CHANNEL (1) -+ - /** - * OSD menu position and picture type defines - */ -Index: vlc-2.2.3/src/video_output/video_output.c -=================================================================== ---- vlc-2.2.3.orig/src/video_output/video_output.c -+++ vlc-2.2.3/src/video_output/video_output.c -@@ -43,6 +43,7 @@ - #include - - #include -+#include - #include - #include - -Index: vlc-2.2.3/modules/gui/qt4/dialogs/messages.hpp -=================================================================== ---- vlc-2.2.3.orig/modules/gui/qt4/dialogs/messages.hpp -+++ vlc-2.2.3/modules/gui/qt4/dialogs/messages.hpp -@@ -28,8 +28,8 @@ - #include "util/singleton.hpp" - #include "ui/messages_panel.h" - #include --#include - #include -+#include - - class QTabWidget; - class QPushButton; -@@ -55,7 +55,7 @@ private: - void sinkMessage( const MsgEvent * ); - bool matchFilter( const QString& ); - -- atomic_uint verbosity; -+ QAtomicInt verbosity; - static void MsgCallback( void *, int, const vlc_log_t *, const char *, - va_list ); - -Index: vlc-2.2.3/modules/gui/qt4/dialogs/messages.cpp -=================================================================== ---- vlc-2.2.3.orig/modules/gui/qt4/dialogs/messages.cpp -+++ vlc-2.2.3/modules/gui/qt4/dialogs/messages.cpp -@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog() - - void MessagesDialog::changeVerbosity( int i_verbosity ) - { -- atomic_store( &this->verbosity, i_verbosity ); -+ verbosity = i_verbosity; - } - - void MessagesDialog::updateConfig() -@@ -337,7 +337,7 @@ void MessagesDialog::MsgCallback( void * - { - MessagesDialog *dialog = (MessagesDialog *)self; - char *str; -- int verbosity = atomic_load( &dialog->verbosity ); -+ int verbosity = dialog->verbosity; - - if( verbosity < 0 || verbosity < (type - VLC_MSG_ERR) - || unlikely(vasprintf( &str, format, ap ) == -1) ) - ---- vlc-2.2.4.orig/modules/video_filter/atmo/atmo.cpp 2016-05-31 18:11:08.000000000 +0200 -+++ vlc-2.2.4/modules/video_filter/atmo/atmo.cpp 2016-09-13 21:15:07.930984954 +0200 -@@ -696,7 +696,7 @@ - { - filter_t *p_filter; - vlc_thread_t thread; -- atomic_bool abort; -+ std::atomic_bool abort; - - /* tell the thread which color should be the target of fading */ - uint8_t ui_red; diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 24d376ad82..8d28fd10e2 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc -version=2.2.4 -revision=9 +version=2.2.6 +revision=1 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-live555 --disable-fluidsynth --enable-dvdread @@ -11,14 +11,14 @@ configure_args="--disable-gme --disable-libtar --enable-jack $(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau)" short_desc="A cross-platform multimedia player" maintainer="Juan RP " -homepage="http://www.videolan.org/vlc/" +homepage="https://www.videolan.org/vlc/" license="GPL-2, LGPL-2.1" -distfiles="http://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" -checksum=1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be +distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" +checksum=c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 lib32disabled=yes -# XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2). +# XXX Add missing deps: gme, telepathy, live555, libtar (for skins2). hostmakedepends="automake libtool pkg-config libgcrypt-devel $(vopt_if lua lua52)" makedepends="videoproto eudev-libudev-devel libpng-devel libupnp-devel ncurses-devel libvorbis-devel x264-devel ffmpeg-devel @@ -71,11 +71,6 @@ pre_configure() { sed -i -e "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \ -e 's,freetype/ftsynth.h,freetype2/ftsynth.h,' \ modules/text_renderer/freetype.c - if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Apply the gcc6 patches - patch -p1 < ${FILESDIR}/vlc-2.2.4-gcc6_fixes-1.patch - fi - } pre_build() { # -O[34] causes an internal compiler error with musl/gcc-4.9.2: diff --git a/srcpkgs/void-artwork/files/void-transparent.png b/srcpkgs/void-artwork/files/void-transparent.png new file mode 100644 index 0000000000..c3fc2a6f01 Binary files /dev/null and b/srcpkgs/void-artwork/files/void-transparent.png differ 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 } 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=" 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" diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template index f5ba9f436f..853cbdf3bf 100644 --- a/srcpkgs/webcat/template +++ b/srcpkgs/webcat/template @@ -1,7 +1,7 @@ # Template file for 'webcat' pkgname=webcat version=1.0 -revision=7 +revision=8 go_import_path="github.com/thypon/webcat" build_style=go hostmakedepends="git-perl" 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 diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index abe7d1db9e..87e4ebc1d8 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,6 +1,6 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.16.1 +version=2.16.3 revision=1 wrksrc="webkitgtk-$version" build_style=cmake @@ -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=204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 # ETOOHUGE nodebug=1 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 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) 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 diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template index 465a0e00f9..23b5056f4a 100644 --- a/srcpkgs/wego/template +++ b/srcpkgs/wego/template @@ -1,7 +1,7 @@ # Template file for 'wego' pkgname=wego version=2.0 -revision=5 +revision=6 hostmakedepends="git-perl" build_style=go go_import_path=github.com/schachmat/wego diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 7ee5dcf570..f03d019ed5 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,6 +1,6 @@ # Template file for 'wine' pkgname=wine -version=2.6 +version=2.9 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=ac46f7bbbbc1dc135c95e4f98d28bf6e3d7a78fb7f9ba6caa7354a3e8786545f 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+=" cde0895142c0ca0be5b532560ec0546d6e4f655615572d80cfcce663f92c57f6" fi post_extract() { 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 diff --git a/srcpkgs/wiredtiger/patches/musl-execinfo.patch b/srcpkgs/wiredtiger/patches/musl-execinfo.patch new file mode 100644 index 0000000000..a1f3f9df3d --- /dev/null +++ b/srcpkgs/wiredtiger/patches/musl-execinfo.patch @@ -0,0 +1,28 @@ +--- ext/test/fail_fs/fail_fs.c 2017-05-26 20:37:54.000000000 +0200 ++++ ext/test/fail_fs/fail_fs.c 2017-05-27 23:53:50.203903712 +0200 +@@ -35,7 +35,9 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include ++#endif + + #include + #include "queue.h" +@@ -697,6 +699,7 @@ + (void)wtext->msg_printf(wtext, session, + "fail_fs: %s: simulated failure after %" PRId64 + " %s operations", fail_fh->iface.name, nops, opkind); ++#ifdef __GLIBC__ + #ifdef __FreeBSD__ + btret = backtrace(bt, sizeof(bt) / sizeof(bt[0])); + #else +@@ -708,6 +711,7 @@ + btstr[i]); + free(btstr); + } ++#endif + } + return (EIO); + } diff --git a/srcpkgs/wiredtiger/template b/srcpkgs/wiredtiger/template index 0622255d56..52c7c533cd 100644 --- a/srcpkgs/wiredtiger/template +++ b/srcpkgs/wiredtiger/template @@ -1,7 +1,7 @@ # Template file for 'wiredtiger' pkgname=wiredtiger -version=2.9.1 -revision=1 +version=2.9.2 +revision=2 build_style=gnu-configure configure_args="--enable-zlib --enable-lz4 --enable-snappy" makedepends="zlib-devel lz4-devel snappy-devel" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-3" homepage="http://source.wiredtiger.com/" distfiles="https://github.com/wiredtiger/wiredtiger/releases/download/$version/wiredtiger-$version.tar.bz2" -checksum=2995acab3422f1667b50e487106c6c88b8666d3cf239d8ecffa2dbffb17dfdcf +checksum=22d66a134abb568ccd49017f6a43aa7d095079c3144434b8b1ca329726a418d9 case "$XBPS_TARGET_MACHINE" in aarch64*) CFLAGS+=" -march=armv8-a+crc" diff --git a/srcpkgs/wireguard/template b/srcpkgs/wireguard/template index 652a71566b..3638b8345c 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.20170531 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=2eb7d9aaf11dcb35e5066837bb1c768398ad3655744fdeb656bd7e7c7ad7cacc triggers="dkms" dkms_modules="wireguard ${version}" diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 2450f36e2e..52eb05144a 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,6 +1,6 @@ # Template file for 'wireshark' pkgname=wireshark -version=2.2.6 +version=2.2.7 revision=1 build_style=gnu-configure configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua @@ -12,12 +12,12 @@ makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel depends="libcap-progs" short_desc="A network protocol analyzer" maintainer="Enno Boland " -homepage="http://www.wireshark.org" +homepage="https://www.wireshark.org" license="GPL-2" # XXX ovh is blocked (repo4.voidlinux.eu can't download this). -distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" +distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2" #distfiles="https://sources.voidlinux.eu/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" -checksum=f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 +checksum=689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 system_groups="wireshark" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" 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 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)' 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..d80ed145c7 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,19 +1,19 @@ # Template file for 'wxWidgets' pkgname=wxWidgets -version=3.0.2 -revision=6 +version=3.0.3.1 +revision=1 build_style=gnu-configure configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify" 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="${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=3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4 # Cross compiling works, but then wx-config is wrong for native builds # on target. 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" 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 diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template index 08c035653a..f666c079c7 100644 --- a/srcpkgs/xarchiver/template +++ b/srcpkgs/xarchiver/template @@ -1,9 +1,9 @@ # 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}" +configure_args="--disable-doc" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel" depends="xdg-utils desktop-file-utils hicolor-icon-theme" @@ -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 diff --git a/srcpkgs/xbanish/template b/srcpkgs/xbanish/template index 0506e5920f..964fe8b210 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,13 +9,13 @@ 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" } -do_install(){ +do_install() { vbin xbanish vman xbanish.1 head -27 xbanish.c > LICENSE 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" 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..4eb83e45bb --- /dev/null +++ b/srcpkgs/xca/template @@ -0,0 +1,22 @@ +# Template file for 'xca' +pkgname=xca +version=1.3.2 +revision=2 +build_style=gnu-configure +make_build_target="all" +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 + +pre_install() { + export destdir="${DESTDIR}" +} + +post_install() { + vlicense COPYRIGHT +} 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" 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" 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 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 } - diff --git a/srcpkgs/xe/template b/srcpkgs/xe/template index 4030565cf3..41790b2ea4 100644 --- a/srcpkgs/xe/template +++ b/srcpkgs/xe/template @@ -1,6 +1,6 @@ # Template file for 'xe' pkgname=xe -version=0.7.0 +version=0.8 revision=1 build_style=gnu-makefile short_desc="Execute for every... (a better xargs/apply)" @@ -8,4 +8,4 @@ maintainer="Leah Neukirchen " license="Public Domain" homepage="https://github.com/chneukirchen/xe" distfiles="https://github.com/chneukirchen/${pkgname}/archive/v${version}.tar.gz" -checksum=32af920a2d27ed0bb8bcb69339fcc805110888e872c92a372d3888df52b300f8 +checksum=13a81e32e5e9740c14fbba10c1bd473771f0809b32b928349f4da5d09ec219c2 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" 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 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 " 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 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 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 diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index a6da8b5422..d58443fcef 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" @@ -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" -checksum=c5c1163b30e7a43d56ff92a25193bf9f29ce60e6cf43e5988530df79c84cfdc8 +distfiles="http://archive.xfce.org/src/apps/${pkgname}/0.8/${pkgname}-${version}.tar.bz2" +checksum=8a34568f78abf669957984602c54cd938f19c9343ee2691c2b787446629be064 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} 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} \ 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 +} 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 diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index 0d54604923..6662d4b724 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -1,6 +1,6 @@ # Template build file for 'xkeyboard-config'. pkgname=xkeyboard-config -version=2.20 +version=2.21 revision=1 noarch=yes build_style=gnu-configure @@ -10,10 +10,10 @@ makedepends="libX11-devel" depends="xkbcomp" short_desc="X Keyboard Configuration Database" maintainer="Juan RP " -homepage="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" +homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" license="MIT" distfiles="${XORG_SITE}/data/$pkgname/$pkgname-$version.tar.bz2" -checksum=d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134 +checksum=30c17049fae129fc14875656da9aa3099e3031d6ce0ee1d77aae190fd9edcec5 post_install() { vlicense COPYING 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" diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template index 1a5e1cee59..89b9aa0be1 100644 --- a/srcpkgs/xlockmore/template +++ b/srcpkgs/xlockmore/template @@ -1,6 +1,6 @@ # Template file for 'xlockmore' pkgname=xlockmore -version=5.53 +version=5.54 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="BSD" homepage="http://sillycycle.com/xlockmore.html" distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz" -checksum=4973659c3b1d9747e79e29f3e5a5d04f3a0cb36f35ba88507c69be2e04db4967 +checksum=9f4facb9721cc01450db0c11ffecd26a739b046e425e02628831a66080a0af55 CFLAGS="-D_DEFAULT_SOURCE" pre_configure() { diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template index 41cbd5dd55..58357bae81 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -1,6 +1,6 @@ # Template file for 'xterm' pkgname=xterm -version=327 +version=328 revision=1 build_style=gnu-configure configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc @@ -19,7 +19,7 @@ maintainer="Juan RP " homepage="http://invisible-island.net/xterm/" license="MIT" distfiles="ftp://invisible-island.net/xterm/$pkgname-$version.tgz" -checksum=66fb2f6c35b342148f549c276b12a3aa3fb408e27ab6360ddec513e14376150b +checksum=b38a7ab2e9f6ab51784ab82a312ca9950e0039da846d37715db4c1ddd47b1d52 post_install() { for f in {u,}xterm.desktop; do 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 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..e0bef7e3f2 --- /dev/null +++ b/srcpkgs/yara/patches/libressl.patch @@ -0,0 +1,58 @@ +--- 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 yr_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(&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)); +@@ -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 + #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..2d6d984a45 --- /dev/null +++ b/srcpkgs/yara/template @@ -0,0 +1,43 @@ +# Template file for 'yara' +pkgname=yara +version=3.6.0 +revision=1 +build_style=gnu-configure +configure_args="--enable-magic --enable-cuckoo" +hostmakedepends="automake libtool" +makedepends="libressl-devel file-devel jansson-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=fb27784b3989db509871652aae26063d87e9cc6330929abed1ab824c5bd600e0 + +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() { + for f in docs/*.rst docs/modules/*.rst; do + vdoc $f + done + vlicense COPYING +} 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" 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";; diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 46dc146ee1..dd6043329f 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.29 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=3da77e06c4e01d5cffb953c867c391af1655dc5e782e6c764ca3730e0904f087 alternatives="youtube-dl:youtube-dl:/usr/bin/youtube-dl2" post_install() { diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template new file mode 100644 index 0000000000..955ddf343e --- /dev/null +++ b/srcpkgs/youtube-viewer/template @@ -0,0 +1,13 @@ +# Template file for 'youtube-viewer' +pkgname=youtube-viewer +version=3.2.8 +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-viewer" +distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz" +checksum=50e26c4f9548f0211cb0dd35ade192939ec12c5aab9d0d55692223390dbb9039 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 " 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" 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/template b/srcpkgs/zbar/template new file mode 100644 index 0000000000..f798888a1d --- /dev/null +++ b/srcpkgs/zbar/template @@ -0,0 +1,40 @@ +# Template file for 'zbar' +pkgname=zbar +version=0.10 +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" +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" + +pre_configure() { + export PYTHON_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" + autoreconf -fi +} + +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" + } +} 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 } 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 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 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" 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 diff --git a/xbps-src b/xbps-src index 4d1d0a5bbf..782b49773f 100755 --- a/xbps-src +++ b/xbps-src @@ -418,7 +418,7 @@ XBPS_OPTIONS= XBPS_OPTSTRING="a:CEfgGhH:Ij:Lm:No:qr: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 @@ -428,12 +428,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";; q) export XBPS_CHECK_PKGS=0; XBPS_OPTIONS+=" -q";;