mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
dbus: update to dbus-1.3.1
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
fd338536b4
commit
f47ce1e9e1
@ -10,8 +10,6 @@ export ac_cv_have_abstract_sockets=yes
|
|||||||
|
|
||||||
cd $PKG_BUILD
|
cd $PKG_BUILD
|
||||||
|
|
||||||
$AUTORECONF
|
|
||||||
|
|
||||||
mkdir -p .build-target
|
mkdir -p .build-target
|
||||||
cd .build-target
|
cd .build-target
|
||||||
|
|
||||||
|
@ -10,15 +10,15 @@ add_group dbus 81
|
|||||||
add_group netdev 497
|
add_group netdev 497
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/bin
|
mkdir -p $INSTALL/usr/bin
|
||||||
# cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin
|
cp $PKG_BUILD/.build-target/tools/dbus-cleanup-sockets $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin
|
cp $PKG_BUILD/.build-target/bus/dbus-daemon $INSTALL/usr/bin
|
||||||
# cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin
|
cp $PKG_BUILD/.build-target/tools/.libs/dbus-monitor $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
|
cp $PKG_BUILD/.build-target/tools/.libs/dbus-uuidgen $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin
|
cp $PKG_BUILD/.build-target/tools/dbus-launch $INSTALL/usr/bin
|
||||||
cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only
|
cp $PKG_BUILD/.build-target/tools/.libs/dbus-send $INSTALL/usr/bin #DEVTOOLS only
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -PR $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
|
cp -P $PKG_BUILD/.build-target/dbus/.libs/libdbus-1.so* $INSTALL/usr/lib
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib/dbus
|
mkdir -p $INSTALL/usr/lib/dbus
|
||||||
cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus
|
cp $PKG_BUILD/.build-target/bus/dbus-daemon-launch-helper $INSTALL/usr/lib/dbus
|
||||||
@ -29,11 +29,7 @@ mkdir -p $INSTALL/etc/dbus-1
|
|||||||
cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
|
cp $PKG_BUILD/.build-target/bus/session.conf $INSTALL/etc/dbus-1
|
||||||
cp $PKG_BUILD/.build-target/bus/system.conf $INSTALL/etc/dbus-1
|
cp $PKG_BUILD/.build-target/bus/system.conf $INSTALL/etc/dbus-1
|
||||||
|
|
||||||
mkdir -p $INSTALL/etc/dbus-1/event.d
|
|
||||||
mkdir -p $INSTALL/etc/dbus-1/system.d
|
mkdir -p $INSTALL/etc/dbus-1/system.d
|
||||||
mkdir -p $INSTALL/etc/dbus-1/session.d
|
mkdir -p $INSTALL/etc/dbus-1/session.d
|
||||||
mkdir -p $INSTALL/usr/share/dbus-1/services
|
mkdir -p $INSTALL/usr/share/dbus-1/services
|
||||||
mkdir -p $INSTALL/usr/share/dbus-1/system-services
|
mkdir -p $INSTALL/usr/share/dbus-1/system-services
|
||||||
|
|
||||||
# sed 's%<servicehelper>.*</servicehelper>%<servicehelper>/usr/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>%' \
|
|
||||||
# $PKG_BUILD/.build-target/bus/system.conf > $INSTALL/etc/dbus-1/system.conf
|
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
diff -Naur dbus-1.2.24-old/bus/Makefile.am dbus-1.2.24-new/bus/Makefile.am
|
|
||||||
--- dbus-1.2.24-old/bus/Makefile.am 2010-03-23 12:01:27.000000000 -0700
|
|
||||||
+++ dbus-1.2.24-new/bus/Makefile.am 2010-03-25 15:59:19.000000000 -0700
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
|
|
||||||
configdir=$(sysconfdir)/dbus-1
|
|
||||||
|
|
||||||
-INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
|
|
||||||
+INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
|
|
||||||
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
|
|
||||||
-DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
|
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@
|
|
||||||
$(top_builddir)/dbus/libdbus-convenience.la \
|
|
||||||
$(DBUS_BUS_LIBS)
|
|
||||||
|
|
||||||
-dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
|
|
||||||
+dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
|
|
||||||
|
|
||||||
LAUNCH_HELPER_SOURCES= \
|
|
||||||
$(XML_SOURCES) \
|
|
||||||
diff -Naur dbus-1.2.24-old/bus/Makefile.in dbus-1.2.24-new/bus/Makefile.in
|
|
||||||
--- dbus-1.2.24-old/bus/Makefile.in 2010-03-23 12:11:23.000000000 -0700
|
|
||||||
+++ dbus-1.2.24-new/bus/Makefile.in 2010-03-25 15:59:19.000000000 -0700
|
|
||||||
@@ -459,7 +459,7 @@
|
|
||||||
top_builddir = @top_builddir@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
configdir = $(sysconfdir)/dbus-1
|
|
||||||
-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
|
|
||||||
+INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
|
|
||||||
-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
|
|
||||||
-DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
|
|
||||||
|
|
||||||
@@ -523,7 +523,7 @@
|
|
||||||
$(top_builddir)/dbus/libdbus-convenience.la \
|
|
||||||
$(DBUS_BUS_LIBS)
|
|
||||||
|
|
||||||
-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
|
|
||||||
+dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
|
|
||||||
LAUNCH_HELPER_SOURCES = \
|
|
||||||
$(XML_SOURCES) \
|
|
||||||
config-parser-common.c \
|
|
@ -1 +1 @@
|
|||||||
http://dbus.freedesktop.org/releases/dbus/dbus-1.2.24.tar.gz
|
http://dbus.freedesktop.org/releases/dbus/dbus-1.3.1.tar.gz
|
Loading…
x
Reference in New Issue
Block a user