mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
merging trunk
This commit is contained in:
commit
ed508e35a7
@ -1,70 +0,0 @@
|
||||
diff -Naur glib-2.23.5/gio/Makefile.am glib-2.23.5.patch/gio/Makefile.am
|
||||
--- glib-2.23.5/gio/Makefile.am 2010-03-06 17:51:40.000000000 +0100
|
||||
+++ glib-2.23.5.patch/gio/Makefile.am 2010-03-09 09:38:50.205664589 +0100
|
||||
@@ -466,6 +466,7 @@
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la \
|
||||
$(top_builddir)/gmodule/libgmodule-2.0.la \
|
||||
+ $(top_builddir)/gthread/libgthread-2.0.la \
|
||||
libgio-2.0.la \
|
||||
$(NULL)
|
||||
|
||||
diff -Naur glib-2.23.5/gio/Makefile.in glib-2.23.5.patch/gio/Makefile.in
|
||||
--- glib-2.23.5/gio/Makefile.in 2010-03-08 16:35:06.000000000 +0100
|
||||
+++ glib-2.23.5.patch/gio/Makefile.in 2010-03-09 09:39:16.717664516 +0100
|
||||
@@ -824,6 +824,7 @@
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la \
|
||||
$(top_builddir)/gmodule/libgmodule-2.0.la \
|
||||
+ $(top_builddir)/gthread/libgthread-2.0.la \
|
||||
libgio-2.0.la \
|
||||
$(NULL)
|
||||
|
||||
diff -Naur glib-2.23.5/gio/tests/Makefile.am glib-2.23.5.patch/gio/tests/Makefile.am
|
||||
--- glib-2.23.5/gio/tests/Makefile.am 2010-03-06 17:51:40.000000000 +0100
|
||||
+++ glib-2.23.5.patch/gio/tests/Makefile.am 2010-03-09 09:39:44.816664472 +0100
|
||||
@@ -14,6 +14,8 @@
|
||||
progs_ldadd = \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la \
|
||||
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
|
||||
+ $(top_builddir)/gthread/libgthread-2.0.la \
|
||||
$(top_builddir)/gio/libgio-2.0.la
|
||||
|
||||
|
||||
diff -Naur glib-2.23.5/gio/tests/Makefile.in glib-2.23.5.patch/gio/tests/Makefile.in
|
||||
--- glib-2.23.5/gio/tests/Makefile.in 2010-03-08 16:35:07.000000000 +0100
|
||||
+++ glib-2.23.5.patch/gio/tests/Makefile.in 2010-03-09 09:40:11.250664543 +0100
|
||||
@@ -448,6 +448,8 @@
|
||||
progs_ldadd = \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la \
|
||||
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
|
||||
+ $(top_builddir)/gthread/libgthread-2.0.la \
|
||||
$(top_builddir)/gio/libgio-2.0.la
|
||||
|
||||
SAMPLE_PROGS = \
|
||||
diff -Naur glib-2.23.5/tests/Makefile.am glib-2.23.5.patch/tests/Makefile.am
|
||||
--- glib-2.23.5/tests/Makefile.am 2010-01-22 03:57:55.000000000 +0100
|
||||
+++ glib-2.23.5.patch/tests/Makefile.am 2010-03-09 09:36:39.805664621 +0100
|
||||
@@ -86,7 +86,7 @@
|
||||
assert_msg_test_LDADD = $(libglib)
|
||||
if ENABLE_TIMELOOP
|
||||
timeloop_LDADD = $(libglib)
|
||||
-timeloop_closure_LDADD = $(libglib) $(libgobject)
|
||||
+timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread)
|
||||
endif
|
||||
|
||||
test_programs = \
|
||||
diff -Naur glib-2.23.5/tests/Makefile.in glib-2.23.5.patch/tests/Makefile.in
|
||||
--- glib-2.23.5/tests/Makefile.in 2010-03-08 16:35:08.000000000 +0100
|
||||
+++ glib-2.23.5.patch/tests/Makefile.in 2010-03-09 09:37:22.598664379 +0100
|
||||
@@ -692,7 +692,7 @@
|
||||
errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS)
|
||||
assert_msg_test_LDADD = $(libglib)
|
||||
@ENABLE_TIMELOOP_TRUE@timeloop_LDADD = $(libglib)
|
||||
-@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject)
|
||||
+@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread)
|
||||
test_programs = \
|
||||
atomic-test \
|
||||
base64-test \
|
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29759.tar.bz2
|
||||
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29890.tar.bz2
|
||||
|
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29759.tar.bz2
|
||||
http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29890.tar.bz2
|
||||
|
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xbmc-29759.tar.bz2
|
||||
http://sources.openelec.tv/svn/xbmc-29890.tar.bz2
|
||||
|
@ -24,7 +24,7 @@ cd $PKG_BUILD
|
||||
--disable-libcanberra \
|
||||
--disable-gconf2 \
|
||||
--disable-nls \
|
||||
--enable-cli \
|
||||
--disable-cli \
|
||||
--disable-mac \
|
||||
--enable-daemon \
|
||||
|
||||
|
2
packages/network/transmission/init.d/43_transmission
Executable file → Normal file
2
packages/network/transmission/init.d/43_transmission
Executable file → Normal file
@ -40,4 +40,4 @@
|
||||
|
||||
transmission-daemon $TRANSMISSION_ARG
|
||||
fi
|
||||
)&
|
||||
)&
|
||||
|
@ -10,10 +10,6 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/usr/sbin
|
||||
cp $PKG_BUILD/daemon/transmission-daemon $INSTALL/usr/sbin
|
||||
cp $PKG_BUILD/daemon/transmission-remote $INSTALL/usr/sbin
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/cli/transmissioncli $INSTALL/usr/bin
|
||||
|
||||
mkdir -p $INSTALL/usr/share/transmission/web
|
||||
cp -R $PKG_BUILD/web/* $INSTALL/usr/share/transmission/web
|
||||
@ -21,4 +17,4 @@ mkdir -p $INSTALL/usr/share/transmission/web
|
||||
rm -rf $INSTALL/usr/share/transmission/web/LICENSE
|
||||
|
||||
mkdir -p $INSTALL/usr/config
|
||||
cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config
|
||||
cp $PKG_DIR/config/transmission.conf $INSTALL/usr/config
|
||||
|
@ -6,8 +6,6 @@
|
||||
if [ ! -f /var/lock/update.lock ]; then
|
||||
|
||||
if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "auto" ]; then
|
||||
# locking autoupdate
|
||||
touch /var/lock/update.lock
|
||||
|
||||
# sleep a bit, maybe we have a lot of work ;-)
|
||||
usleep 30000000
|
||||
@ -42,14 +40,14 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
# show a message if a new version is avaible
|
||||
send_message "New update avaible: r$NEW_VERSION - please update manually"
|
||||
|
||||
# remove locking
|
||||
rm -rf /var/lock/update.lock
|
||||
|
||||
elif [ "$AUTOUPDATE" = "auto" ]; then
|
||||
|
||||
# show a message if a new version is avaible
|
||||
send_message "New update avaible: r$NEW_VERSION - downloading and extract the new version..."
|
||||
|
||||
# locking autoupdate
|
||||
touch /var/lock/update.lock
|
||||
|
||||
# downloading the new version
|
||||
wget -c $UPDATEURL/$NEW_IMAGE.tar.bz2 -P /tmp
|
||||
|
||||
|
@ -6,8 +6,6 @@
|
||||
if [ ! -f /var/lock/update.lock ]; then
|
||||
|
||||
if [ "$AUTOUPDATE" = "manually" -o "$AUTOUPDATE" = "auto" ]; then
|
||||
# locking autoupdate
|
||||
touch /var/lock/update.lock
|
||||
|
||||
# sleep a bit, maybe we have a lot of work ;-)
|
||||
usleep 30000000
|
||||
@ -49,14 +47,14 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
# show a message if a new version is avaible
|
||||
send_message "New update avaible: $NEW_VERSION - please update manually"
|
||||
|
||||
# remove locking
|
||||
rm -rf /var/lock/update.lock
|
||||
|
||||
elif [ "$AUTOUPDATE" = "auto" ]; then
|
||||
|
||||
# show a message if a new version is avaible
|
||||
send_message "New update avaible: $NEW_VERSION - downloading and extract the new version..."
|
||||
|
||||
# locking autoupdate
|
||||
touch /var/lock/update.lock
|
||||
|
||||
# downloading the new version
|
||||
wget -c $UPDATEURL/$NEW_IMAGE.tar.bz2 -P /tmp
|
||||
|
||||
|
@ -8,8 +8,6 @@ cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--disable-libuuid \
|
||||
--disable-libblkid \
|
||||
--disable-debugfs \
|
||||
|
@ -1,2 +1,2 @@
|
||||
ftp://download.nvidia.com/XFree86/Linux-x86/195.36.15/NVIDIA-Linux-x86-195.36.15-pkg0.run
|
||||
ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.15/NVIDIA-Linux-x86_64-195.36.15-pkg0.run
|
||||
ftp://download.nvidia.com/XFree86/Linux-x86/195.36.24/NVIDIA-Linux-x86-195.36.24-pkg0.run
|
||||
ftp://download.nvidia.com/XFree86/Linux-x86_64/195.36.24/NVIDIA-Linux-x86_64-195.36.24-pkg0.run
|
||||
|
@ -1 +1 @@
|
||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.0.902.tar.bz2
|
||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.0.902.tar.bz2
|
||||
|
Loading…
x
Reference in New Issue
Block a user