jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 21:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source 
Conflicts:
	packages/addons/service/multimedia/boblightd/package.mk
	packages/audio/pulseaudio/package.mk
	packages/audio/sbc/package.mk
	packages/corefonts/package.mk
	packages/debug/package.mk
	packages/devel/boost/package.mk
	packages/devel/glib/package.mk
	packages/devel/libcap/package.mk
	packages/devel/libcec/package.mk
	packages/devel/scons/package.mk
	packages/graphics/Mesa/package.mk
	packages/graphics/glew/package.mk
	packages/lang/Python/package.mk
	packages/lang/gcc/package.mk
	packages/mediacenter/xbmc-pvr-addons/package.mk
	packages/mediacenter/xbmc-theme-Confluence/package.mk
	packages/mediacenter/xbmc/package.mk
	packages/multimedia/crystalhd/package.mk
	packages/multimedia/ffmpeg/package.mk
	packages/multimedia/libva-driver-intel/package.mk
	packages/python/system/simplejson/package.mk
	packages/sysutils/libhid/package.mk
	packages/sysutils/remote/irserver/package.mk
	packages/sysutils/systemd/package.mk
	packages/textproc/libxml2/package.mk
	packages/toolchain/darwin-cross/package.mk
	packages/tools/u-boot/package.mk
	packages/virtual/libc/package.mk
	packages/x11/lib/libxcb/package.mk
	packages/x11/proto/xcb-proto/package.mk
	packages/x11/util/util-macros/package.mk
	scripts/build
This commit is contained in:
Stephan Raue 2014-01-30 17:35:18 +01:00
commit 77031582ee
36 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk vendored
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="vdr-plugin-vnsiserver" PKG_NAME="vdr-plugin-vnsiserver"
PKG_VERSION="9021115" PKG_VERSION="af29425"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

2
packages/linux/package.mk
View File

@ -23,7 +23,7 @@ case "$LINUX" in
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
;; ;;
*) *)
PKG_VERSION="3.13" PKG_VERSION="3.13.1"
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
;; ;;
esac esac

0
packages/linux/patches/3.13/linux-003-no_dev_console.patch → packages/linux/patches/3.13.1/linux-003-no_dev_console.patch vendored
View File

0
packages/linux/patches/3.13/linux-052-XBOX_remote_support.patch → packages/linux/patches/3.13.1/linux-052-XBOX_remote_support.patch vendored
View File

0
packages/linux/patches/3.13/linux-053-spinelplus-remote-0.2.patch → packages/linux/patches/3.13.1/linux-053-spinelplus-remote-0.2.patch vendored
View File

0
packages/linux/patches/3.13/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch → packages/linux/patches/3.13.1/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch vendored
View File

0
packages/linux/patches/3.13/linux-055-add_Formosa_eHome_Infrared_Receiver.patch → packages/linux/patches/3.13.1/linux-055-add_Formosa_eHome_Infrared_Receiver.patch vendored
View File

0
packages/linux/patches/3.13/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch → packages/linux/patches/3.13.1/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch vendored
View File

0
packages/linux/patches/3.13/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch → packages/linux/patches/3.13.1/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch vendored
View File

0
packages/linux/patches/3.13/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch → packages/linux/patches/3.13.1/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch vendored
View File

0
packages/linux/patches/3.13/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch → packages/linux/patches/3.13.1/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch vendored
View File

0
packages/linux/patches/3.13/linux-058.06-hid_sony-add_SMK_link.patch → packages/linux/patches/3.13.1/linux-058.06-hid_sony-add_SMK_link.patch vendored
View File

0
packages/linux/patches/3.13/linux-059-remove_some_xpad_pids-0.2.patch → packages/linux/patches/3.13.1/linux-059-remove_some_xpad_pids-0.2.patch vendored
View File

0
packages/linux/patches/3.13/linux-060-add_AUGUST_DVB-T205.patch → packages/linux/patches/3.13.1/linux-060-add_AUGUST_DVB-T205.patch vendored
View File

0
packages/linux/patches/3.13/linux-203-stb0899_enable_low_symbol_rate.patch → packages/linux/patches/3.13.1/linux-203-stb0899_enable_low_symbol_rate.patch vendored
View File

0
packages/linux/patches/3.13/linux-210-dvbsky.patch → packages/linux/patches/3.13.1/linux-210-dvbsky.patch vendored
View File

0
packages/linux/patches/3.13/linux-212-mantis_stb0899_faster_lock.patch → packages/linux/patches/3.13.1/linux-212-mantis_stb0899_faster_lock.patch vendored
View File

0
packages/linux/patches/3.13/linux-221-ngene-octopus.patch → packages/linux/patches/3.13.1/linux-221-ngene-octopus.patch vendored
View File

0
packages/linux/patches/3.13/linux-222-stb0899_signal_quality.patch → packages/linux/patches/3.13.1/linux-222-stb0899_signal_quality.patch vendored
View File

0
packages/linux/patches/3.13/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch → packages/linux/patches/3.13.1/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch vendored
View File

0
packages/linux/patches/3.13/linux-701-linksys_aes2500_brcmfmac.patch → packages/linux/patches/3.13.1/linux-701-linksys_aes2500_brcmfmac.patch vendored
View File

0
packages/linux/patches/3.13/linux-703-macmini2012-ethernet.patch → packages/linux/patches/3.13.1/linux-703-macmini2012-ethernet.patch vendored
View File

0
packages/linux/patches/3.13/linux-704-Support-for-Ubiquiti-WifiStation.patch → packages/linux/patches/3.13.1/linux-704-Support-for-Ubiquiti-WifiStation.patch vendored
View File

0
packages/linux/patches/3.13/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch → packages/linux/patches/3.13.1/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch vendored
View File

0
packages/linux/patches/3.13/linux-706-Sitecom-N300.patch → packages/linux/patches/3.13.1/linux-706-Sitecom-N300.patch vendored
View File

0
packages/linux/patches/3.13/linux-900-hide_tsc_error.patch → packages/linux/patches/3.13.1/linux-900-hide_tsc_error.patch vendored
View File

0
packages/linux/patches/3.13/linux-950-saa716x_PCIe_interface_chipset.patch → packages/linux/patches/3.13.1/linux-950-saa716x_PCIe_interface_chipset.patch vendored
View File

0
packages/linux/patches/3.13/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch → packages/linux/patches/3.13.1/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch vendored
View File

0
packages/linux/patches/3.13/linux-991.01-ptrace_fix.patch → packages/linux/patches/3.13.1/linux-991.01-ptrace_fix.patch vendored
View File

0
packages/linux/patches/3.13/linux-995-CX24120-13Z_frontend.patch → packages/linux/patches/3.13.1/linux-995-CX24120-13Z_frontend.patch vendored
View File

2
packages/mediacenter/xbmc-pvr-addons/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-pvr-addons" PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="f73fac7" PKG_VERSION="af29425"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc-theme-Confluence/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13.alpha-2667375" PKG_VERSION="13.alpha-536cf62"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="13.alpha-2667375" PKG_VERSION="13.alpha-536cf62"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

5
scripts/build
View File

@ -30,6 +30,11 @@ if [ ! -f $PKG_DIR/package.mk ]; then
exit 1 exit 1
fi fi
if [ ! -f $PKG_DIR/package.mk ]; then
printf "${boldred} no package.mk file found in $PKG_DIR${endcolor}\n"
exit 1
fi
# set defaults # set defaults
PKG_CONFIGURE_SCRIPT="" PKG_CONFIGURE_SCRIPT=""
PKG_MAKE_OPTS="" PKG_MAKE_OPTS=""

8
scripts/checkdeps
View File

@ -35,6 +35,10 @@ case $1 in
deps_pkg="bash bc gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils xfonts-utils diff xsltproc default-jre" deps_pkg="bash bc gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xutils xfonts-utils diff xsltproc default-jre"
files="/usr/include/stdio.h /usr/include/ncurses.h" files="/usr/include/stdio.h /usr/include/ncurses.h"
files_pkg="libc6-dev libncurses5-dev" files_pkg="libc6-dev libncurses5-dev"
if [ -f /etc/redhat-release ]; then
deps_pkg="bash bc gcc gcc-c++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf cvs zip unzip xorg-x11-font-utils xorg-x11-font-utils diffutils libxslt java-1.7.0-openjdk"
files_pkg="glibc-headers ncurses-devel"
fi
;; ;;
qemu) qemu)
if [ ! `which qemu` ]; then if [ ! `which qemu` ]; then
@ -113,6 +117,10 @@ if [ -n "$need" ]; then
echo "**** You seem to use a fedora system ****" echo "**** You seem to use a fedora system ****"
read -p "would you like to install the needed tools ? (y/n) " ans read -p "would you like to install the needed tools ? (y/n) " ans
[ "$ans" = "y" ] && sudo yum install $need_pkg [ "$ans" = "y" ] && sudo yum install $need_pkg
elif [ -f /etc/redhat-release -a "`which yum 2>/dev/null`" ]; then
echo "**** You seem to use a RedHat or clone (CentOS) system ****"
read -p "would you like to install the needed tools ? (y/n) " ans
[ "$ans" = "y" ] && sudo yum install $need_pkg
else else
echo "********" echo "********"
exit 1 exit 1

5
scripts/image
View File

@ -31,7 +31,10 @@ $SCRIPTS/build kmod:host
BUILD_DATE=`date +%Y%m%d%H%M%S` BUILD_DATE=`date +%Y%m%d%H%M%S`
if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then if [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ]; then
GIT_BUILD=$(git rev-list --count HEAD) if ! GIT_BUILD=$(git rev-list --count HEAD 2>/dev/null)
then
GIT_BUILD=$(git rev-list HEAD | wc -l)
fi
GIT_HASH=$(git rev-parse HEAD) GIT_HASH=$(git rev-parse HEAD)
GIT_ABBREV=$(git log -1 --pretty=format:%h) GIT_ABBREV=$(git log -1 --pretty=format:%h)
OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV