Module_tail_build.mk | 4 bluez_bluetooth/Makefile | 7 + config_host.mk.in | 1 configure.in | 39 ++++++ officecfg/Configuration_officecfg.mk | 6 officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs | 63 ++++++++++ officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 19 --- sd/Library_sd.mk | 23 ++- sd/prj/build.lst | 2 sd/source/ui/remotecontrol/BluetoothServer.cxx | 10 - 10 files changed, 139 insertions(+), 35 deletions(-)
New commits: commit 85dbc8129887fb94370afcb587e2a9264cb2ed10 Author: Rene Engelhard <[email protected]> Date: Tue Sep 18 13:19:57 2012 +0200 add --with-system-bluez and alöllow disabling of sdremote Change-Id: I1b0dbc8e8efa7535bdc699e343e31594af00d553 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index ec9e006..c2d6c5d 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -36,7 +36,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ basic \ bean \ binaryurp \ - bluez_bluetooth \ + $(if $(filter BLUEZ,$(BUILD_TYPE)),\ + bluez_bluetooth \ + ) \ canvas \ chart2 \ configmgr \ diff --git a/config_host.mk.in b/config_host.mk.in index 3c7d46f..913a24b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -152,6 +152,7 @@ export ENABLE_PRESENTER_SCREEN=@ENABLE_PRESENTER_SCREEN@ export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@ export ENABLE_RANDR=@ENABLE_RANDR@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ +export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ diff --git a/configure.in b/configure.in index 9aaa2eb..f8a4a45 100644 --- a/configure.in +++ b/configure.in @@ -863,6 +863,12 @@ AC_ARG_ENABLE(packagekit, Right now that is auto font install]) ,) +AC_ARG_ENABLE(sdremote, + AS_HELP_STRING([--disable-sdremote], + [Determines whether to enable Impress remote control. + Uses dbus and bluetooth (bluez(.]) +,enable_sdremote=yes) + AC_ARG_ENABLE(gconf, AS_HELP_STRING([--disable-gconf], [Determines whether to use the GConf support.]), @@ -1576,6 +1582,11 @@ AC_ARG_WITH(system-sane, [Use sane.h already on system.]),, [with_system_sane="$with_system_headers"]) +AC_ARG_WITH(system-bluez, + AS_HELP_STRING([--with-system-bluez], + [Use bluetooth.h already on system.]),, + [with_system_bluez="$with_system_headers"]) + AC_ARG_WITH(system-xextensions-headers, AS_HELP_STRING([--with-system-xextensions-headers], [To build without system X11 extensions headers, use @@ -9317,6 +9328,34 @@ else fi AC_SUBST(ENABLE_PACKAGEKIT) +AC_MSG_CHECKING([whether to enable sd remotecontrol]) +if test "$ENABLE_DBUS" = "TRUE"; then + if test -n "$enable_sdremote"; then + AC_MSG_RESULT([yes]) + ENABLE_SDREMOTE=YES + if test "$OS" = "LINUX"; then + dnl =================================================================== + dnl Check for system bluez + dnl =================================================================== + AC_MSG_CHECKING([which bluetooth header to use]) + if test "$with_system_bluez" = "yes"; then + AC_MSG_RESULT([external]) + AC_CHECK_HEADER(bluetooth/bluetooth.h, [], + [AC_MSG_ERROR(bluetooth.h not found. install bluez)], []) + else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE BLUEZ" + fi + fi + else + ENABLE_SDREMOTE=NO + AC_MSG_RESULT([no]) + fi +else + AC_MSG_RESULT([no, dbus disabled.]) +fi +AC_SUBST(ENABLE_SDREMOTE) + dnl =================================================================== dnl Check whether the gtk 2.0 libraries are available. dnl =================================================================== diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 876954e..953507a 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -329,15 +329,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/presenter/PresenterPreviewCache \ sd/source/ui/presenter/PresenterTextView \ sd/source/ui/presenter/SlideRenderer \ - sd/source/ui/remotecontrol/BluetoothServer \ - sd/source/ui/remotecontrol/BufferedStreamSocket \ - sd/source/ui/remotecontrol/Communicator \ - sd/source/ui/remotecontrol/DiscoveryService \ - sd/source/ui/remotecontrol/ImagePreparer \ - sd/source/ui/remotecontrol/Server \ - sd/source/ui/remotecontrol/Receiver \ - sd/source/ui/remotecontrol/Listener \ - sd/source/ui/remotecontrol/Transmitter \ sd/source/ui/slideshow/PaneHider \ sd/source/ui/slideshow/SlideShowRestarter \ sd/source/ui/slideshow/showwin \ @@ -522,6 +513,20 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/view/zoomlist \ )) +ifeq ($(ENABLE_SDREMOTE),YES) +$(eval $(call gb_Library_add_exception_objects,sd,\ + sd/source/ui/remotecontrol/BluetoothServer \ + sd/source/ui/remotecontrol/BufferedStreamSocket \ + sd/source/ui/remotecontrol/Communicator \ + sd/source/ui/remotecontrol/DiscoveryService \ + sd/source/ui/remotecontrol/ImagePreparer \ + sd/source/ui/remotecontrol/Server \ + sd/source/ui/remotecontrol/Receiver \ + sd/source/ui/remotecontrol/Listener \ + sd/source/ui/remotecontrol/Transmitter \ +)) +endif + ifeq ($(strip $(GUI)),WNT) $(eval $(call gb_Library_add_cxxobjects,sd,\ sd/source/ui/app/optsitem \ diff --git a/sd/prj/build.lst b/sd/prj/build.lst index b4dc93d..b340431 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,3 +1,3 @@ -sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess NULL +sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess BLUEZ:bluez_bluetooth NULL sd sd usr1 - all sd_mkout NULL sd sd\prj nmake - all sd_prj NULL diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 10dee39..2e06322 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -9,13 +9,13 @@ #include "BluetoothServer.hxx" #include <stdio.h> -#if defined(LINUX) && defined(ENABLE_DBUS) +#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS) #include <glib.h> #include <dbus/dbus-glib.h> #include <sys/unistd.h> #include <sys/socket.h> -#include "bluetooth/bluetooth.h" -#include "bluetooth/rfcomm.h" +#include <bluetooth/bluetooth.h> +#include <bluetooth/rfcomm.h> #endif #ifdef WIN32 @@ -51,7 +51,7 @@ bool BluetoothServer::isDiscoverable() void BluetoothServer::execute() { -#if defined(LINUX) && defined(ENABLE_DBUS) +#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS) g_type_init(); @@ -252,7 +252,7 @@ void BluetoothServer::execute() } // WIN32 -#else // !(defined(LINUX) && defined(ENABLE_DBUS)) && !defined(WIN32) +#else // !((defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS)) && !defined(WIN32) (void) mpCommunicators; // avoid warnings about unused member #endif } commit 8c5cd962353dd9ce8234211a66547eb057202eb5 Author: Rene Engelhard <[email protected]> Date: Tue Sep 18 13:17:55 2012 +0200 config split for sdremote Change-Id: Ie1cbf033ca0f1fd56afe714cf645e3361b9b8ad0 diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 682a3e2..89b6203 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -119,6 +119,12 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ org/openoffice/ucb/Store.xcs \ )) +ifeq ($(ENABLE_SDREMOTE),YES) +$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ + org/openoffice/Office/Impress-sdremote.xcs \ +)) +endif + $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Inet.xcu \ org/openoffice/System.xcu \ diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs new file mode 100644 index 0000000..b78a138 --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************************** + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************ --> +<!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd"> +<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="Impress-sdremote" oor:package="org.openoffice.Office" xml:lang="en-US"> + <info> + <author>AF</author> + <desc >Contains configuration items related to the Impress application.</desc> + </info> + <import oor:component="org.openoffice.Office.Common"/> + <templates> + <group oor:name="AuthorisedRemote"> + <info> + <author>ajrhunt</author> + <desc> + A Remote Control Device that has been authorised for connection. + </desc> + </info> + <prop oor:name="PIN" oor:type="xs:string"> + <info> + <desc>The PIN used by the device for authentication.</desc> + </info> + </prop> + </group> + </templates> + <component> + <group oor:name="Content"> + <info> + <desc>Contains content related configuration items.</desc> + </info> + <set oor:name="AuthorisedRemotes" oor:node-type="AuthorisedRemote"> + <info> + <author>ajrhunt</author> + <desc>Contains a list of remote control devices that can connect without user confirmation.</desc> + </info> + </set> + </group> + </component> +</oor:component-schema> diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index aad00d3..582ecbf 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -90,19 +90,6 @@ </info> </prop> </group> - <group oor:name="AuthorisedRemote"> - <info> - <author>ajrhunt</author> - <desc> - A Remote Control Device that has been authorised for connection. - </desc> - </info> - <prop oor:name="PIN" oor:type="xs:string"> - <info> - <desc>The PIN used by the device for authentication.</desc> - </info> - </prop> - </group> </templates> <component> <group oor:name="Layout"> @@ -668,12 +655,6 @@ <value>5000</value> </prop> </group> - <set oor:name="AuthorisedRemotes" oor:node-type="AuthorisedRemote"> - <info> - <author>ajrhunt</author> - <desc>Contains a list of remote control devices that can connect without user confirmation.</desc> - </info> - </set> </group> <group oor:name="Snap"> <info> commit c0c393fecbc4d4df716c3f7d51ff214003767357 Author: Rene Engelhard <[email protected]> Date: Tue Sep 18 10:10:34 2012 +0200 add "Makfile" for bluez_bluetooth Change-Id: If2e3cac0f1fbff33ffaf8352b4dd19eda89f4f31 diff --git a/bluez_bluetooth/Makefile b/bluez_bluetooth/Makefile new file mode 100644 index 0000000..ccb1c85 --- /dev/null +++ b/bluez_bluetooth/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
