diff --git a/packages/3rdparty/system/pcsc-lite/meta b/packages/3rdparty/system/pcsc-lite/meta index 82d7c84868..e12d846649 100644 --- a/packages/3rdparty/system/pcsc-lite/meta +++ b/packages/3rdparty/system/pcsc-lite/meta @@ -20,12 +20,12 @@ ################################################################################ PKG_NAME="pcsc-lite" -PKG_VERSION="1.8.6" +PKG_VERSION="1.8.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html" -PKG_URL="https://alioth.debian.org/frs/download.php/3757/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_URL="https://alioth.debian.org/frs/download.php/3842/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain libusb" PKG_PRIORITY="optional" diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon index 5c1d47b448..ef0234a005 100755 --- a/packages/addons/service/softcam/oscam/addon +++ b/packages/addons/service/softcam/oscam/addon @@ -28,6 +28,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt index 8811f7cd37..66e4bc3f01 100644 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ b/packages/addons/service/softcam/oscam/changelog.txt @@ -1,3 +1,7 @@ +3.0.4 +- update to oscam-8030 +- update to pcsc-lite-1.8.7 + 3.0.3 - update to oscam-7968 diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index be82bf471b..d7ba589cac 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="7968" -PKG_REV="3" +PKG_VERSION="8030" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.streamboard.tv/oscam/wiki" diff --git a/packages/addons/service/system/pcscd-addon/changelog.txt b/packages/addons/service/system/pcscd-addon/changelog.txt index ed1f19b107..96e36e410a 100644 --- a/packages/addons/service/system/pcscd-addon/changelog.txt +++ b/packages/addons/service/system/pcscd-addon/changelog.txt @@ -1,3 +1,6 @@ +3.0.3 +- update to pcsc-lite-1.8.7 + 3.0.2 - update to pcsc-lite-1.8.6 - update to ccid-1.4.8 diff --git a/packages/addons/service/system/pcscd-addon/meta b/packages/addons/service/system/pcscd-addon/meta index 062a3a53a0..5bb9ea8152 100755 --- a/packages/addons/service/system/pcscd-addon/meta +++ b/packages/addons/service/system/pcscd-addon/meta @@ -21,7 +21,7 @@ PKG_NAME="pcscd-addon" PKG_VERSION="3.0" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" diff --git a/packages/devel/libcec/build b/packages/devel/libcec/build index abe5dea462..d842bf6e55 100755 --- a/packages/devel/libcec/build +++ b/packages/devel/libcec/build @@ -32,6 +32,13 @@ else LIBCEC_RPI="--disable-rpi" fi +if [ "$OPENGLES" = "marvell-libgfx" ]; then + LIBCEC_TDA995X="--enable-cubox --with-tda995x-toolkit-path=$(kernel_path)/drivers/video/dovefb/nxp_hdmi" +else + LIBCEC_TDA995X="--disable-cubox" +fi + + # dont use some optimizations because of build problems LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` @@ -42,7 +49,8 @@ cd $PKG_BUILD --sysconfdir=/etc \ --disable-static \ --enable-shared \ - $LIBCEC_RPI + $LIBCEC_RPI \ + $LIBCEC_TDA995X make diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init index 16974a5ee0..cffdf48c69 100755 --- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init +++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init @@ -41,6 +41,11 @@ NBD_DEVS="0" /bin/busybox mount -t proc none /proc /bin/busybox mount -t sysfs none /sys +# load any configuration + if [ -f "/etc/initramfs.conf" ]; then + . /etc/initramfs.conf + fi + # hide kernel log messages on console echo '1 4 1 7' > /proc/sys/kernel/printk @@ -351,7 +356,9 @@ NBD_DEVS="0" if [ -e /dev/fb0 -a ! "$SPLASH" = "no" ]; then # set framebuffer to a default resolution (1024x768-32) - fbset -g 1024 768 1024 768 32 + if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then + fbset -g 1024 768 1024 768 32 + fi # load splash if [ -f /flash/oemsplash.png ]; then @@ -464,10 +471,6 @@ NBD_DEVS="0" INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'` SYSTEM_TORAM_LIMIT=1024000 - if [ -f "/etc/initramfs.conf" ]; then - . /etc/initramfs.conf - fi - if [ "$SYSTEM_TORAM" = "no" -o "$INSTALLED_MEMORY" -lt "$SYSTEM_TORAM_LIMIT" ]; then mount_part "/flash/$IMAGE_SYSTEM" "/sysroot" "ro,loop" else diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index fc9bea7997..884d14cf14 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="5ea5421" +PKG_VERSION="0a58027" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-5ea5421-001-add_oe_settings_to_homescreen.patch b/packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-0a58027-001-add_oe_settings_to_homescreen.patch similarity index 100% rename from packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-5ea5421-001-add_oe_settings_to_homescreen.patch rename to packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-0a58027-001-add_oe_settings_to_homescreen.patch diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index e5c9a9d7a7..99fd7c9da1 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="5ea5421" +PKG_VERSION="0a58027" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-001-add_support_to_specify_GIT_REV-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-001-add_support_to_specify_GIT_REV-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-001-add_support_to_specify_GIT_REV-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-303-fix_libdvd_xFLAGS-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-303-fix_libdvd_xFLAGS-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-303-fix_libdvd_xFLAGS-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-311-fix_rsxs_build-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-311-fix_rsxs_build-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-311-fix_rsxs_build-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-454-disable_backslash-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-454-disable_backslash-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-454-disable_backslash-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-457-fix_connection_check-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-457-fix_connection_check-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-457-fix_connection_check-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-5ea5421-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-0a58027-463-add_remote_devinput-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-5ea5421-463-add_remote_devinput-0.1.patch rename to packages/mediacenter/xbmc/patches/xbmc-0a58027-463-add_remote_devinput-0.1.patch diff --git a/packages/multimedia/marvell-ipp/install b/packages/multimedia/marvell-ipp/install index 33bdf3e416..7c5145db27 100755 --- a/packages/multimedia/marvell-ipp/install +++ b/packages/multimedia/marvell-ipp/install @@ -31,7 +31,7 @@ fi mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/$VMETA_LIBDIR/*.so* $INSTALL/usr/lib - cp -P $PKG_BUILD/lib/libmiscgen.so $SYSROOT_PREFIX/usr/lib + cp -P $PKG_BUILD/lib/libmiscgen.so $INSTALL/usr/lib mkdir -p $INSTALL/lib/udev/rules.d cp -PR $PKG_BUILD/etc/*.rules $INSTALL/lib/udev/rules.d diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta index 87dbe09a7e..4fcfbb7d3e 100644 --- a/packages/sysutils/upower/meta +++ b/packages/sysutils/upower/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="upower" -PKG_VERSION="0.9.18" +PKG_VERSION="0.9.19" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf b/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf index 932325cb79..30ffa1cc1b 100644 --- a/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf +++ b/packages/x11/driver/xf86-video-dove/config/xorg-dove.conf @@ -1,29 +1,19 @@ Section "Monitor" - Identifier "DVI" - Option "Position" "0 0" - Option "Enable" "true" - Option "PreferredMode" "1920x1080" -# Option "PreferredMode" "1280x720" -# Option "Rotate" "left" -# Option "NoDDCValue" "true" -# Option "PreferredMode" "800x600" -EndSection -Section "Monitor" - Identifier "VGA" - Option "Position" "0 0" - Option "Enable" "true" - Option "PreferredMode" "1920x1080" -# Option "PreferredMode" "1280x720" -# Option "PreferredMode" "800x600" + Identifier "HDMI" + Option "Position" "0 0" + Option "Enable" "true" + Option "PreferredMode" "1920x1080" +# Option "PreferredMode" "1280x720" +# Option "PreferredMode" "1024x768" +# Option "PreferredMode" "640x480" +# Option "PreferredMode" "800x600" EndSection Section "Device" Identifier "Driver0" Screen 0 Driver "dovefb" - Option "debug" "false" -# Option "ShadowFB" "TRUE" -# Option "UseGPU" "FALSE" + Option "debug" "TRUE" Option "ExaAccel" "FALSE" Option "Solid" "TRUE" Option "Copy" "TRUE" @@ -32,22 +22,20 @@ Section "Device" Option "SWCopy" "FALSE" Option "Commit" "FALSE" Option "XvAccel" "TRUE" - Option "HWCursor" "false" + Option "HWCursor" "FALSE" Option "EncFunc" "7" Option "UseDriverBuiltInMode" "TRUE" - Option "EnableDualDisplay" "true" - Option "Monitor-VGA" "VGA" - Option "Monitor-lvds" "DVI" + Option "EnableDualDisplay" "FALSE" EndSection Section "Screen" Device "Driver0" - Identifier "Primary Screen" - DefaultDepth 32 - DefaultFbBpp 32 + Monitor "HDMI" + Identifier "Screen" +# DefaultDepth 24 +# DefaultFbBpp 24 SubSection "Display" Viewport 0 0 Virtual 2048 2048 EndSubSection EndSection - diff --git a/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch b/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch new file mode 100644 index 0000000000..661d802a37 --- /dev/null +++ b/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-crosscompile.patch @@ -0,0 +1,12 @@ +diff -Naur xf86-video-dove-0.3.4/src/Makefile.am xf86-video-dove-0.3.4.patch/src/Makefile.am +--- xf86-video-dove-0.3.4/src/Makefile.am 2011-03-07 18:52:09.000000000 +0100 ++++ xf86-video-dove-0.3.4.patch/src/Makefile.am 2013-01-01 03:58:19.411541528 +0100 +@@ -24,7 +24,7 @@ + # _ladir passes a dummy rpath to libtool so the thing will actually link + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. + +-INCLUDES = -I/usr/include/HAL -I$(top_srcdir)/src/video ++INCLUDES = -I$(top_srcdir)/src/video + + AM_CFLAGS = @XORG_CFLAGS@ + dovefb_drv_la_LTLIBRARIES = dovefb_drv.la diff --git a/tools/mkpkg/mkpkg_oscam b/tools/mkpkg/mkpkg_oscam index 140d9c2e0c..6611e428e1 100755 --- a/tools/mkpkg/mkpkg_oscam +++ b/tools/mkpkg/mkpkg_oscam @@ -34,8 +34,9 @@ echo "copying sources..." rm -rf oscam-$SVN_REV cp -R oscam-latest oscam-$SVN_REV -echo "cleaning sources..." - find oscam-$SVN_REV -name .svn -exec rm -rf {} ";" +# webif needs versioning info +#echo "cleaning sources..." +# find oscam-$SVN_REV -name .svn -exec rm -rf {} ";" echo "packing sources..." tar cvjf oscam-$SVN_REV.tar.bz2 oscam-$SVN_REV