From 3d99d28843a824db5bf113609702c1bf710a6a47 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 8 Oct 2017 23:50:38 +0100 Subject: [PATCH] packages: adapt for Python2 --- .../Adafruit_Python_ADS1x15/package.mk | 2 +- .../Adafruit_Python_ADXL345/package.mk | 2 +- .../Adafruit_Python_BMP/package.mk | 2 +- .../Adafruit_Python_CharLCD/package.mk | 2 +- .../Adafruit_Python_DHT/package.mk | 2 +- .../Adafruit_Python_GPIO/package.mk | 2 +- .../Adafruit_Python_LED_Backpack/package.mk | 2 +- .../Adafruit_Python_LSM303/package.mk | 2 +- .../Adafruit_Python_MCP3008/package.mk | 2 +- .../Adafruit_Python_MCP4725/package.mk | 2 +- .../Adafruit_Python_PCA9685/package.mk | 2 +- .../Adafruit_Python_PureIO/package.mk | 2 +- .../Adafruit_Python_SI1145/package.mk | 2 +- .../Adafruit_Python_SSD1306/package.mk | 2 +- .../Adafruit_Python_TCS34725/package.mk | 2 +- .../Adafruit_Python_VCNL40xx/package.mk | 2 +- .../Adafruit_Python_WS2801/package.mk | 2 +- packages/addons/addon-depends/enum34/package.mk | 2 +- .../librespot-depends/pyalsaaudio/package.mk | 2 +- packages/addons/addon-depends/ninja/package.mk | 1 + .../addons/addon-depends/python-libusb1/package.mk | 2 +- .../rpi-tools-depends/RPi.GPIO/package.mk | 4 ++-- .../rpi-tools-depends/picamera/package.mk | 2 +- .../system-tools-depends/dstat/package.mk | 2 +- .../system-tools-depends/i2c-tools/package.mk | 4 ++-- packages/addons/driver/steamcontroller/package.mk | 4 ++-- packages/addons/service/hyperion/package.mk | 2 +- packages/addons/service/librespot/package.mk | 2 +- packages/addons/service/tvheadend42/package.mk | 2 +- packages/devel/boost/package.mk | 2 +- packages/devel/glib/package.mk | 2 +- packages/devel/heimdal/package.mk | 2 +- packages/devel/libcec/package.mk | 5 +++-- packages/graphics/mesa/package.mk | 4 ++-- packages/mediacenter/LibreELEC-settings/package.mk | 12 +++++++----- packages/mediacenter/kodi/package.mk | 6 +++--- packages/network/samba/package.mk | 2 +- packages/python/devel/distutilscross/package.mk | 2 +- packages/python/devel/pygobject/package.mk | 2 +- packages/python/devel/setuptools/package.mk | 2 +- packages/python/graphics/Pillow/package.mk | 2 +- packages/python/security/pycryptodome/package.mk | 4 ++-- packages/python/system/dbus-python/package.mk | 3 ++- packages/python/system/simplejson/package.mk | 2 +- packages/sysutils/lirc/package.mk | 2 ++ packages/tools/qemu/package.mk | 2 +- packages/x11/lib/libxcb/package.mk | 6 +++--- packages/x11/proto/xcb-proto/package.mk | 2 +- 48 files changed, 67 insertions(+), 60 deletions(-) diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk index 01e6a41f9b..360e10fd20 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python ADS1x15 Library" PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi or BeagleBone black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk index e7a9b110ec..d4ac033bd1 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python ADXL345 Library" PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi or BeagleBone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk index 53bd936a03..da8527d48a 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python BMP Library" PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi or Beaglebone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk index 66f62647f6..f3f7f48571 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python CharLCD Library" PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi or BeagleBone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk index 7c31f1b0d8..32d17a6241 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python DHT Library" PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi or Beaglebone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk index 726e6f5dcc..4c8216d0ba 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python GPIO Library" PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi and Beaglebone Black using the RPi.GPIO and Adafruit_BBIO librarie" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk index 9e1f23d1b7..25ffdd7bb2 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Python library for controlling LED backpack displays." PKG_LONGDESC="Python library for controlling LED backpack displays such as 8x8 matrices, bar graphs, and 7/14-segment displays on a Raspberry Pi or BeagleBone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk index cd31471332..bb196ef45d 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python LSM303 Library" PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi & BeagleBone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk index 0d7aa48584..cac7e35db0 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python MCP3008 Library" PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi or BeagleBone black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk index 7e632a2f42..c86e6b1e71 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python MCP4725 Library" PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi or BeagleBone black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk index 5628c9b100..854c4c2ce3 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python PCA9685 Library" PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi or BeagleBone black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk index b2e4588baa..dc937d1b01 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Pure python access to Linux IO including I2C and SPI." PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI. Drop in replacement for smbus and spidev modules." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk index c4d8f414ae..4de7bfa145 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="MIT" PKG_SITE="https://github.com/THP-JOE/Python_SI1145" PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="Python_SI1145-$PKG_VERSION*" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Python library for the SI1145" PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk index 6568e83335..61ed7f7ea1 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python SSD1306 Library" PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk index 116a7b28ba..a7cbc1efd5 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python TCS34725 Library" PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi & BeagleBone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk index e88efd2b10..36a2efa766 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python VCNL40xx Library" PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi & BeagleBone Black." diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk index 704a7bef95..695e9cddf5 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="Adafruit Python WS2801 Library" PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi & BeagleBone Black." diff --git a/packages/addons/addon-depends/enum34/package.mk b/packages/addons/addon-depends/enum34/package.mk index 80c5015a9f..7bd5412551 100644 --- a/packages/addons/addon-depends/enum34/package.mk +++ b/packages/addons/addon-depends/enum34/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="BSD" PKG_SITE="https://bitbucket.org/stoneleaf/enum34" PKG_URL="https://bitbucket.org/stoneleaf/$PKG_NAME/get/$PKG_VERSION.tar.bz2" PKG_SOURCE_DIR="stoneleaf-enum34-*" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_PRIORITY="optional" PKG_SECTION="python" PKG_SHORTDESC="Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" diff --git a/packages/addons/addon-depends/librespot-depends/pyalsaaudio/package.mk b/packages/addons/addon-depends/librespot-depends/pyalsaaudio/package.mk index 77fd93bab6..b10730defe 100644 --- a/packages/addons/addon-depends/librespot-depends/pyalsaaudio/package.mk +++ b/packages/addons/addon-depends/librespot-depends/pyalsaaudio/package.mk @@ -22,7 +22,7 @@ PKG_SHA256="84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085" PKG_LICENSE="PSF" PKG_SITE="http://larsimmisch.github.io/pyalsaaudio/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host alsa-lib" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host alsa-lib" PKG_LONGDESC="ALSA bindings" make_target() { diff --git a/packages/addons/addon-depends/ninja/package.mk b/packages/addons/addon-depends/ninja/package.mk index 8fca6372e6..ebdfb4854d 100644 --- a/packages/addons/addon-depends/ninja/package.mk +++ b/packages/addons/addon-depends/ninja/package.mk @@ -23,6 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="Apache" PKG_SITE="http://martine.github.io/ninja/" PKG_URL="https://github.com/ninja-build/ninja/archive/v$PKG_VERSION.tar.gz" +PKG_DEPENDS_HOST="toolchain Python2:host" PKG_SECTION="devel" PKG_SHORTDESC="Small build system with a focus on speed" PKG_LONGDESC="Small build system with a focus on speed" diff --git a/packages/addons/addon-depends/python-libusb1/package.mk b/packages/addons/addon-depends/python-libusb1/package.mk index be0c459205..05494a0699 100644 --- a/packages/addons/addon-depends/python-libusb1/package.mk +++ b/packages/addons/addon-depends/python-libusb1/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/vpelletier/python-libusb1" PKG_URL="https://github.com/vpelletier/$PKG_NAME/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_PRIORITY="optional" PKG_SECTION="python" PKG_SHORTDESC="Pure-python wrapper for libusb-1.0" diff --git a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk index 87ace6a6eb..c403523ee3 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="arm" PKG_LICENSE="MIT" PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python" PKG_SHORTDESC="A module to control Raspberry Pi GPIO channels" PKG_LONGDESC="A module to control Raspberry Pi GPIO channels" @@ -32,7 +32,7 @@ PKG_AUTORECONF="no" pre_configure_target() { export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" export LDSHARED="$CC -shared" - export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/python2.7" + export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" } make_target() { diff --git a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk index c70d5f267c..6180f8926a 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/picamera/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="arm" PKG_LICENSE="BSD" PKG_SITE="https://github.com/waveform80/picamera" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host bcm2835-driver" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host bcm2835-driver" PKG_SECTION="python" PKG_SHORTDESC="A python and shell interface for the Raspberry Pi camera module" PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module" diff --git a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk index e46ffb0d72..8e66a68eb9 100644 --- a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://dag.wiee.rs/home-made/dstat" PKG_URL="https://github.com/dagwieers/dstat/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python" +PKG_DEPENDS_TARGET="toolchain Python2" PKG_SECTION="tools" PKG_SHORTDESC="Versatile resource statistics tool" PKG_LONGDESC="Versatile resource statistics tool" diff --git a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk index 2c101fe852..7e28ae322f 100644 --- a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lm-sensors.org/wiki/I2CTools" PKG_URL="http://fossies.org/linux/misc/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="debug/tools" PKG_SHORTDESC="i2c-tools: bus probing tool, eeprom decoding/programming and SMBus python interface" PKG_LONGDESC="The i2c-tools package contains a heterogeneous set of I2C tools for Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers, EEPROM decoding scripts, EEPROM programming tools, and a python module for SMBus access." @@ -39,7 +39,7 @@ make_target() { CC="$CC" \ AR="$TARGET_AR" \ CFLAGS="$TARGET_CFLAGS" \ - CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/python2.7" + CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" } makeinstall_target() { diff --git a/packages/addons/driver/steamcontroller/package.mk b/packages/addons/driver/steamcontroller/package.mk index c104a771a8..be43ac11e1 100644 --- a/packages/addons/driver/steamcontroller/package.mk +++ b/packages/addons/driver/steamcontroller/package.mk @@ -24,7 +24,7 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ynsta/steamcontroller" PKG_URL="https://github.com/ynsta/steamcontroller/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host python-libusb1 enum34 linux:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host python-libusb1 enum34 linux:host" PKG_SECTION="driver" PKG_SHORTDESC="A standalone userland driver for the steam controller to be used where steam client can't be installed." PKG_LONGDESC="A standalone userland driver for the steam controller to be used where steam client can't be installed." @@ -62,6 +62,6 @@ addon() { fi cp $(get_build_dir linux)/usr/include/linux/input.h $ADDON_BUILD/$PKG_ADDON_ID/include/linux/ - python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $ADDON_BUILD/$PKG_ADDON_ID/lib/ -f 1>/dev/null + $TOOLCHAIN/bin/python -Wi -t -B $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/compileall.py $ADDON_BUILD/$PKG_ADDON_ID/lib/ -f 1>/dev/null find $ADDON_BUILD/$PKG_ADDON_ID/lib/ -name '*.py' -exec rm {} \; } diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index bcb7708e23..86c4d9a5c6 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -23,7 +23,7 @@ PKG_REV="106" PKG_LICENSE="GPL" PKG_SITE="https://github.com/hyperion-project/hyperion" PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python libusb qtbase protobuf rpi_ws281x" +PKG_DEPENDS_TARGET="toolchain Python2 libusb qtbase protobuf rpi_ws281x" PKG_SECTION="service" PKG_SHORTDESC="Hyperion: an AmbiLight controller" PKG_LONGDESC="Hyperion($PKG_VERSION) is an modern opensource AmbiLight implementation." diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 953c2cd78b..2b68e62c84 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -55,7 +55,7 @@ makeinstall_target() { addon() { mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID" - cp "$(get_build_dir pyalsaaudio)/.install_pkg/usr/lib/python2.7/site-packages/alsaaudio.so" \ + cp "$(get_build_dir pyalsaaudio)/.install_pkg/usr/lib/$PKG_PYTHON_VERSION/site-packages/alsaaudio.so" \ "$ADDON_BUILD/$PKG_ADDON_ID" mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index b45f9eff2a..b6031b367c 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="tvheadend-${PKG_VERSION}*" -PKG_DEPENDS_TARGET="toolchain curl dvb-tools libdvbcsa libiconv openssl pngquant:host Python:host yasm" +PKG_DEPENDS_TARGET="toolchain curl dvb-tools libdvbcsa libiconv openssl pngquant:host Python2:host yasm" PKG_SECTION="service" PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux" PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T" diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk index 45fd9fb19a..121b2a5d68 100644 --- a/packages/devel/boost/package.mk +++ b/packages/devel/boost/package.mk @@ -25,7 +25,7 @@ PKG_SITE="http://www.boost.org/" PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.61.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2" PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}" PKG_DEPENDS_HOST="" -PKG_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2" +PKG_DEPENDS_TARGET="toolchain boost:host Python2:host zlib bzip2" PKG_SECTION="devel" PKG_SHORTDESC="boost: Peer-reviewed STL style libraries for C++" PKG_LONGDESC="Boost provides free peer-reviewed portable C++ source libraries. The emphasis is on libraries which work well with the C++ Standard Library. One goal is to establish existing practice and provide reference implementations so that the Boost libraries are suitable for eventual standardization. Some of the libraries have already been proposed for inclusion in the C++ Standards Committee's upcoming C++ Standard Library Technical Report." diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index b18f278171..bcdc6daed5 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -24,7 +24,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain zlib libffi Python:host util-linux" +PKG_DEPENDS_TARGET="toolchain zlib libffi Python2:host util-linux" PKG_DEPENDS_HOST="libffi:host pcre:host" PKG_SECTION="devel" PKG_SHORTDESC="glib: C support library" diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk index 23fb2b14d2..06d534bcd6 100644 --- a/packages/devel/heimdal/package.mk +++ b/packages/devel/heimdal/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="BSD-3c" PKG_SITE="http://www.h5l.org/" PKG_URL="https://github.com/heimdal/heimdal/archive/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="$PKG_NAME-$PKG_NAME-$PKG_VERSION" -PKG_DEPENDS_HOST="toolchain e2fsprogs:host" +PKG_DEPENDS_HOST="toolchain e2fsprogs:host Python2:host" PKG_SECTION="devel" PKG_SHORTDESC="heimdal: Kerberos 5, PKIX, CMS, GSS-API, SPNEGO, NTLM, Digest-MD5 and, SASL implementation." PKG_LONGDESC="Heimdal is an implementation of Kerberos 5 (and some more stuff) largely written in Sweden (which was important when we started writing it, less so now). It is freely available under a three clause BSD style license. " diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index 6d0a37825c..711c9cfdfe 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -68,7 +68,8 @@ pre_configure_target() { } post_makeinstall_target() { - if [ -d $INSTALL/usr/lib/python2.7/dist-packages ]; then - mv $INSTALL/usr/lib/python2.7/dist-packages $INSTALL/usr/lib/python2.7/site-packages + PYTHON_DIR=$INSTALL/usr/lib/$PKG_PYTHON_VERSION + if [ -d $PYTHON_DIR/dist-packages ]; then + mv $PYTHON_DIR/dist-packages $PYTHON_DIR/site-packages fi } diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 029d5d3a0c..30962fe375 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -31,7 +31,7 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="yes" if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence openssl" + PKG_DEPENDS_TARGET="toolchain Python2:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence openssl" export DRI_DRIVER_INSTALL_DIR=$XORG_PATH_DRI export DRI_DRIVER_SEARCH_DIR=$XORG_PATH_DRI @@ -40,7 +40,7 @@ if [ "$DISPLAYSERVER" = "x11" ]; then MESA_GLX="--enable-glx --enable-driglx-direct --enable-glx-tls" MESA_EGL_PLATFORMS="--with-platforms=x11,drm" else - PKG_DEPENDS_TARGET="toolchain Python:host expat libdrm" + PKG_DEPENDS_TARGET="toolchain Python2:host expat libdrm" MESA_DRI="--enable-dri --disable-dri3" MESA_GLX="--disable-glx --disable-driglx-direct --disable-glx-tls" MESA_EGL_PLATFORMS="--with-platforms=drm" diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index 0cb9b0b1e0..d3cb923988 100644 --- a/packages/mediacenter/LibreELEC-settings/package.mk +++ b/packages/mediacenter/LibreELEC-settings/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="prop." PKG_SITE="https://libreelec.tv" PKG_URL="https://github.com/LibreELEC/service.libreelec.settings/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="service.libreelec.settings-$PKG_VERSION*" -PKG_DEPENDS_TARGET="toolchain Python connman pygobject dbus-python" +PKG_DEPENDS_TARGET="toolchain Python2 connman pygobject dbus-python" PKG_SECTION="" PKG_SHORTDESC="LibreELEC-settings: Settings dialog for LibreELEC" PKG_LONGDESC="LibreELEC-settings: is a settings dialog for LibreELEC" @@ -49,11 +49,13 @@ post_makeinstall_target() { # rm -f resources/lib/modules/bluetooth.py # fi - python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.libreelec.settings/resources/lib/ -f - rm -rf `find $INSTALL/usr/share/kodi/addons/service.libreelec.settings/resources/lib/ -name "*.py"` + ADDON_INSTALL_DIR=$INSTALL/usr/share/kodi/addons/service.libreelec.settings - python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.libreelec.settings/oe.py -f - rm -rf $INSTALL/usr/share/kodi/addons/service.libreelec.settings/oe.py + $TOOLCHAIN/bin/python -Wi -t -B $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/compileall.py $ADDON_INSTALL_DIR/resources/lib/ -f + rm -rf $(find $ADDON_INSTALL_DIR/resources/lib/ -name "*.py") + + $TOOLCHAIN/bin/python -Wi -t -B $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/compileall.py $ADDON_INSTALL_DIR/oe.py -f + rm -rf $ADDON_INSTALL_DIR/oe.py } post_install() { diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index efa80c96ca..8728baa1c1 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="xbmc-$PKG_VERSION*" -PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python zlib systemd pciutils lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt" +PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2 zlib systemd pciutils lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt" PKG_SECTION="mediacenter" PKG_SHORTDESC="kodi: Kodi Mediacenter" PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." @@ -208,8 +208,8 @@ KODI_LIBDVD="$KODI_DVDCSS \ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \ -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \ -DDEPENDS_PATH=$PKG_BUILD/depends \ - -DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/python2.7 \ - -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/python2.7 \ + -DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/$PKG_PYTHON_VERSION \ + -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION \ -DGIT_VERSION=$PKG_VERSION \ -DWITH_FFMPEG=$(get_build_dir ffmpeg) \ -DENABLE_INTERNAL_FFMPEG=OFF \ diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index fbbbdd35f2..3d13e8af74 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain heimdal:host e2fsprogs Python zlib readline popt libaio connman" +PKG_DEPENDS_TARGET="toolchain heimdal:host e2fsprogs Python2 zlib readline popt libaio connman" PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)" PKG_SECTION="network" PKG_SHORTDESC="samba: The free SMB / CIFS fileserver and client" diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk index 8e583da602..a05033b89f 100644 --- a/packages/python/devel/distutilscross/package.mk +++ b/packages/python/devel/distutilscross/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://bitbucket.org/lambacck/distutilscross/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="Python:host setuptools:host" +PKG_DEPENDS_HOST="Python2:host setuptools:host" PKG_SECTION="python/devel" PKG_SHORTDESC="distutilscross: Cross Compile Python Extensions" PKG_LONGDESC="distutilscross enhances distutils to support Cross Compile of Python extensions" diff --git a/packages/python/devel/pygobject/package.mk b/packages/python/devel/pygobject/package.mk index 8180ad163c..49d36868ac 100644 --- a/packages/python/devel/pygobject/package.mk +++ b/packages/python/devel/pygobject/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.pygtk.org/" PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain Python glib libffi" +PKG_DEPENDS_TARGET="toolchain Python2 glib libffi" PKG_SECTION="python/devel" PKG_SHORTDESC="pygobject: The Python bindings for GObject" PKG_LONGDESC="PyGObject provides a convenient wrapper for the GObject+ library for use in Python programs, and takes care of many of the boring details such as managing memory and type casting. When combined with PyGTK, PyORBit and gnome-python, it can be used to write full featured Gnome applications." diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk index eae1bd92e6..26bbc617a9 100644 --- a/packages/python/devel/setuptools/package.mk +++ b/packages/python/devel/setuptools/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://pypi.python.org/pypi/setuptools" PKG_URL="https://github.com/pypa/setuptools/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="Python:host" +PKG_DEPENDS_HOST="Python2:host" PKG_SECTION="python/devel" PKG_SHORTDESC="setuptools: A collection of enhancements to the Python distutils" PKG_LONGDESC="Distribute is intended to replace Setuptools as the standard method for working with Python module distributions. Packages built and distributed using distribute look to the user like ordinary Python packages based on the distutils. Your users don't need to install or even know about setuptools in order to use them, and you don't have to include the entire setuptools package in your distributions. By including just a single bootstrap module (a 7K .py file), your package will automatically download and install setuptools if the user is building your package from source and doesn't have a suitable version already installed." diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index 73f2574604..a36877c5e3 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.pythonware.com/products/pil/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host zlib freetype libjpeg-turbo tiff" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host zlib freetype libjpeg-turbo tiff" PKG_SECTION="python" PKG_SHORTDESC="pil: Imaging handling/processing for Python" PKG_LONGDESC="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library supports many file formats, and provides powerful image processing and graphics capabilities." diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk index ec217fb73e..3f9ce79ef3 100644 --- a/packages/python/security/pycryptodome/package.mk +++ b/packages/python/security/pycryptodome/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="https://pypi.python.org/pypi/pycryptodome" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python/security" PKG_SHORTDESC="Cryptographic library for Python" PKG_LONGDESC="PyCryptodome is a self-contained Python package of low-level cryptographic primitives." @@ -51,7 +51,7 @@ makeinstall_target() { find $INSTALL -name SOURCES.txt -exec sed -i "/\/SelfTest\//d;" "{}" \; # Create Cryptodome as an alternative namespace to Crypto (Kodi addons may use either) - ln -sf /usr/lib/python2.7/site-packages/Crypto $INSTALL/usr/lib/python2.7/site-packages/Cryptodome + ln -sf /usr/lib/$PKG_PYTHON_VERSION/site-packages/Crypto $INSTALL/usr/lib/$PKG_PYTHON_VERSION/site-packages/Cryptodome } post_makeinstall_target() { diff --git a/packages/python/system/dbus-python/package.mk b/packages/python/system/dbus-python/package.mk index 46ba49709c..afb35259a6 100644 --- a/packages/python/system/dbus-python/package.mk +++ b/packages/python/system/dbus-python/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://freedesktop.org/wiki/Software/dbus" PKG_URL="https://dbus.freedesktop.org/releases/dbus-python/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python dbus dbus-glib" +PKG_DEPENDS_TARGET="toolchain Python2 dbus dbus-glib" PKG_SECTION="python/system" PKG_SHORTDESC="dbus-python: A message bus system" PKG_LONGDESC="D-BUS is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in terms of complexity. D-BUS supports broadcast messages, asynchronous messages (thus decreasing latency), authentication, and more. It is designed to be low-overhead; messages are sent using a binary protocol, not using XML. D-BUS also supports a method call mapping for its messages, but it is not required; this makes using the system quite simple." @@ -32,6 +32,7 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" pre_configure_target() { + export PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python2-config" export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python2-config --includes)" export PYTHON_LIBS="$($SYSROOT_PREFIX/usr/bin/python2-config --ldflags)" } diff --git a/packages/python/system/simplejson/package.mk b/packages/python/system/simplejson/package.mk index 1217cad28f..163d7c86af 100644 --- a/packages/python/system/simplejson/package.mk +++ b/packages/python/system/simplejson/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://pypi.python.org/pypi/simplejson" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python distutilscross:host" +PKG_DEPENDS_TARGET="toolchain Python2 distutilscross:host" PKG_SECTION="python/system" PKG_SHORTDESC="simplejson: a simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+." PKG_LONGDESC="simplejson is a simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+. It is pure Python code with no dependencies, but includes an optional C extension for a serious speed boost." diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk index 72d1261390..050cc0d2d4 100644 --- a/packages/sysutils/lirc/package.mk +++ b/packages/sysutils/lirc/package.mk @@ -30,6 +30,7 @@ PKG_LONGDESC="LIRC is a package that allows you to decode and send infra-red sig PKG_IS_ADDON="no" PKG_AUTORECONF="yes" +PKG_PYTHON_WANTED=Python2 PKG_CONFIGURE_OPTS_TARGET="--enable-devinput \ --localstatedir=/ \ @@ -40,6 +41,7 @@ pre_configure_target() { export HAVE_WORKING_POLL=yes export HAVE_UINPUT=yes export PYTHON=: + export PYTHON_VERSION=${PKG_PYTHON_VERSION#python} if [ -e ${SYSROOT_PREFIX}/usr/include/linux/input-event-codes.h ] ; then export DEVINPUT_HEADER=${SYSROOT_PREFIX}/usr/include/linux/input-event-codes.h else diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk index 278a82f4b5..71adde28a7 100644 --- a/packages/tools/qemu/package.mk +++ b/packages/tools/qemu/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://wiki.qemu.org" PKG_URL="http://wiki.qemu-project.org/download/qemu-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_HOST="toolchain Python:host zlib:host glib:host" +PKG_DEPENDS_HOST="toolchain Python2:host zlib:host glib:host" PKG_SECTION="tools" PKG_SHORTDESC="QEMU is a generic and open source machine emulator and virtualizer." PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer." diff --git a/packages/x11/lib/libxcb/package.mk b/packages/x11/lib/libxcb/package.mk index e7e241e4f1..26fc053025 100644 --- a/packages/x11/lib/libxcb/package.mk +++ b/packages/x11/lib/libxcb/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://xcb.freedesktop.org" PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros Python:host xcb-proto libpthread-stubs libXau" +PKG_DEPENDS_TARGET="toolchain util-macros Python2:host xcb-proto libpthread-stubs libXau" PKG_SECTION="x11/lib" PKG_SHORTDESC="libxcb: X C-language Bindings library" PKG_LONGDESC="X C-language Bindings library." @@ -38,8 +38,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \ --disable-xvmc" pre_configure_target() { - PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`" - PYTHON_TOOLCHAIN_PATH=`ls -d $PYTHON_LIBDIR/site-packages` + PYTHON_LIBDIR=$SYSROOT_PREFIX/usr/lib/$PKG_PYTHON_VERSION + PYTHON_TOOLCHAIN_PATH=$PYTHON_LIBDIR/site-packages PKG_CONFIG="$PKG_CONFIG --define-variable=pythondir=$PYTHON_TOOLCHAIN_PATH" PKG_CONFIG="$PKG_CONFIG --define-variable=xcbincludedir=$SYSROOT_PREFIX/usr/share/xcb" diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk index 57b902778a..d8b48be7af 100644 --- a/packages/x11/proto/xcb-proto/package.mk +++ b/packages/x11/proto/xcb-proto/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain util-macros Python:host" +PKG_DEPENDS_TARGET="toolchain util-macros Python2:host" PKG_SECTION="x11/proto" PKG_SHORTDESC="xcb-proto: X C-language Bindings protocol headers" PKG_LONGDESC="X C-language Bindings protocol headers."