mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' into openelec-next
This commit is contained in:
commit
4cbb542a1d
@ -151,3 +151,8 @@ strip_linker_plugin() {
|
||||
# strip out usage from linker plugin
|
||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"`
|
||||
}
|
||||
|
||||
strip_kmod() {
|
||||
[ -z $1 ] && echo "usage strip_kmod <dir>" && exit 1
|
||||
find $1 -type f -name '*.ko' | xargs -r $STRIP -R .comment -R .note -g --strip-unneeded
|
||||
}
|
||||
|
@ -9,9 +9,8 @@ get_graphicdrivers
|
||||
strip_linker_plugin
|
||||
strip_lto # Mesa fails to build with LTO optimization
|
||||
|
||||
# dont use strip or ggdb because of use from mklib
|
||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-s | |"`
|
||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-ggdb | |"`
|
||||
# TODO:
|
||||
LDFLAGS=""
|
||||
|
||||
MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
|
||||
MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
|
||||
|
@ -8,11 +8,9 @@ mkdir -p $INSTALL/lib/modules/$VER/bcm_sta
|
||||
[ $TARGET_ARCH = i386 ] && cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
|
||||
[ $TARGET_ARCH = x86_64 ] && cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta
|
||||
|
||||
for MOD in `find $INSTALL/lib/modules/$VER/bcm_sta -name *.ko`; do
|
||||
$STRIP --strip-debug $MOD
|
||||
done
|
||||
strip_kmod $INSTALL/lib/modules/$VER/bcm_sta
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
|
@ -1,22 +1,22 @@
|
||||
diff -Naur bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_iw.h bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_iw.h
|
||||
--- bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_iw.h 2010-11-22 03:01:28.267226695 +0100
|
||||
+++ bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_iw.h 2010-11-22 03:00:28.308506905 +0100
|
||||
@@ -62,6 +62,7 @@
|
||||
--- bcm_sta-5.60.246.6/x86-32/src/wl/sys/wl_iw.h 2010-10-22 04:18:57.000000000 +0200
|
||||
+++ bcm_sta-5.60.246.6.patch/x86-32/src/wl/sys/wl_iw.h 2010-11-29 08:30:58.911543674 +0100
|
||||
@@ -62,7 +62,6 @@
|
||||
struct timer_list *timer;
|
||||
struct net_device *dev;
|
||||
long sysioc_pid;
|
||||
+ struct semaphore sysioc_sem;
|
||||
- struct semaphore sysioc_sem;
|
||||
struct completion sysioc_exited;
|
||||
};
|
||||
|
||||
diff -Naur bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_iw.h bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_iw.h
|
||||
--- bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_iw.h 2010-11-22 03:01:49.840485699 +0100
|
||||
+++ bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_iw.h 2010-11-22 03:00:28.322507073 +0100
|
||||
@@ -62,6 +62,7 @@
|
||||
--- bcm_sta-5.60.246.6/x86-64/src/wl/sys/wl_iw.h 2010-10-22 04:23:55.000000000 +0200
|
||||
+++ bcm_sta-5.60.246.6.patch/x86-64/src/wl/sys/wl_iw.h 2010-11-29 08:31:15.542760506 +0100
|
||||
@@ -62,7 +62,6 @@
|
||||
struct timer_list *timer;
|
||||
struct net_device *dev;
|
||||
long sysioc_pid;
|
||||
+ struct semaphore sysioc_sem;
|
||||
- struct semaphore sysioc_sem;
|
||||
struct completion sysioc_exited;
|
||||
};
|
||||
|
||||
|
@ -20,7 +20,7 @@ for drivers in "$ADDITIONAL_DRIVERS"; do
|
||||
|
||||
rtl8192se) PKG_DEPENDS="$PKG_DEPENDS rtl8192se"
|
||||
;;
|
||||
broadcom) PKG_DEPENDS="$PKG_DEPENDS bcm_sta"
|
||||
bcm_sta) PKG_DEPENDS="$PKG_DEPENDS bcm_sta"
|
||||
;;
|
||||
|
||||
esac
|
||||
|
@ -10,11 +10,9 @@ mkdir -p $INSTALL/lib/modules/$VER/rtl8192se
|
||||
mkdir -p $INSTALL/lib/firmware/RTL8192SE
|
||||
cp $PKG_BUILD/firmware/RTL8192SE/* $INSTALL/lib/firmware/RTL8192SE
|
||||
|
||||
for MOD in `find $INSTALL/lib/modules/$VER/rtl8192se -name *.ko`; do
|
||||
$STRIP --strip-debug $MOD
|
||||
done
|
||||
strip_kmod $INSTALL/lib/modules/$VER/rtl8192se
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
|
@ -10,8 +10,9 @@ mkdir -p $INSTALL/lib/modules/$VER
|
||||
cp -r $PKG_BUILD/modules/* $INSTALL
|
||||
rm -f $INSTALL/lib/modules/$VER/modules.*
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
strip_kmod $INSTALL/lib/modules/$VER/kernel
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
|
@ -1,5 +1,5 @@
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="2.6.36"
|
||||
PKG_VERSION="2.6.36.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -16,9 +16,7 @@ mkdir -p $INSTALL/lib/udev/rules.d
|
||||
mkdir -p $INSTALL/lib/modules/$VER/crystalhd
|
||||
cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd
|
||||
|
||||
for MOD in `find $INSTALL/lib/modules/$VER/crystalhd -name *.ko`; do
|
||||
$STRIP --strip-debug $MOD
|
||||
done
|
||||
strip_kmod $INSTALL/lib/modules/$VER/crystalhd
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
|
16
packages/multimedia/hts-tvheadend/meta
Normal file
16
packages/multimedia/hts-tvheadend/meta
Normal file
@ -0,0 +1,16 @@
|
||||
PKG_NAME="hts-tvheadend"
|
||||
PKG_VERSION="2.12"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
|
||||
PKG_URL="http://www.lonelycoder.com/debian/dists/hts/main/source/${PKG_NAME}_${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS="avahi"
|
||||
PKG_BUILD_DEPENDS="toolchain avahi"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
|
||||
PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes"
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
@ -2,11 +2,7 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $BUILD/$PKG_NAME-*
|
||||
|
||||
# apply patches provide with the source package
|
||||
cat debian/patches/*.patch | patch -p1
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
|
@ -3,13 +3,13 @@
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp -P $BUILD/$PKG_NAME-*/va/.libs/libva*.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib
|
||||
rm -rf $INSTALL/usr/lib/libva-*.so*T
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/va
|
||||
cp -P $BUILD/$PKG_NAME-*/i965_drv_video/.libs/*.so $INSTALL/usr/lib/va
|
||||
cp -P $PKG_BUILD/i965_drv_video/.libs/*.so $INSTALL/usr/lib/va
|
||||
|
||||
if [ "$DEVTOOLS" = yes ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $BUILD/$PKG_NAME-*/test/.libs/vainfo $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/test/.libs/vainfo $INSTALL/usr/bin
|
||||
fi
|
||||
|
@ -1,10 +1,10 @@
|
||||
PKG_NAME="libva"
|
||||
PKG_VERSION="0.31.1-1+sds4"
|
||||
PKG_VERSION="1.0.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
|
||||
PKG_URL="http://www.splitted-desktop.com/~gbeauchesne/libva/${PKG_NAME}_${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa"
|
||||
PKG_PRIORITY="optional"
|
||||
|
@ -1,16 +0,0 @@
|
||||
PKG_NAME="tvheadend"
|
||||
PKG_VERSION="5650"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
|
||||
PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="avahi"
|
||||
PKG_BUILD_DEPENDS="toolchain avahi"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
|
||||
PKG_LONGDESC="Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes"
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
@ -25,14 +25,12 @@ mkdir -p $INSTALL/usr/lib
|
||||
mkdir -p $INSTALL/lib/modules/$VER/nvidia
|
||||
cp $PKG_BUILD/kernel/nvidia.ko $INSTALL/lib/modules/$VER/nvidia
|
||||
|
||||
for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do
|
||||
$STRIP --strip-debug $MOD
|
||||
done
|
||||
strip_kmod $INSTALL/lib/modules/$VER/nvidia
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/nvidia-smi $INSTALL/usr/bin
|
||||
|
@ -53,9 +53,6 @@
|
||||
# Mediacenter to use (xbmc / no)
|
||||
MEDIACENTER="xbmc-dharma"
|
||||
|
||||
# build and install Tvheadend TV server (yes / no)
|
||||
TVHEADEND="no"
|
||||
|
||||
# Skins to install (Confluence)
|
||||
SKINS="Confluence"
|
||||
|
||||
|
@ -44,8 +44,8 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
# Build optimizations (size/speed)
|
||||
OPTIMIZATIONS="speed"
|
||||
# Build optimizations (size/normal/speed)
|
||||
OPTIMIZATIONS="size"
|
||||
|
||||
# Project CFLAGS
|
||||
PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
|
||||
@ -53,9 +53,6 @@
|
||||
# Mediacenter to use (xbmc / no)
|
||||
MEDIACENTER="xbmc-dharma"
|
||||
|
||||
# build and install Tvheadend TV server (yes / no)
|
||||
TVHEADEND="yes"
|
||||
|
||||
# Skins to install (Confluence)
|
||||
SKINS="Confluence"
|
||||
|
||||
|
@ -69,7 +69,7 @@ mkdir -p $INSTALL
|
||||
|
||||
# Multimedia support
|
||||
[ ! "$MEDIACENTER" = no ] && $SCRIPTS/install mediacenter
|
||||
[ "$TVHEADEND" = yes ] && $SCRIPTS/install tvheadend
|
||||
[ "$TVHEADEND" = yes ] && $SCRIPTS/install hts-tvheadend
|
||||
|
||||
# Automounter support
|
||||
[ "$UDISKS" = yes ] && $SCRIPTS/install udisks
|
||||
|
Loading…
x
Reference in New Issue
Block a user