add liblightscribe

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/lightscribe@1501 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-08-24 17:43:04 +00:00
commit 99a6887023
51 changed files with 2585 additions and 0 deletions

View File

@@ -0,0 +1,40 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-03-25
Initial Package Version: 0.10
Origin: me
Upstream Status: unknwon
Description: dont install dbus files in two places
diff -Naur qlscribe-0.10.orig/lscribed/CMakeLists.txt qlscribe-0.10/lscribed/CMakeLists.txt
--- qlscribe-0.10.orig/lscribed/CMakeLists.txt 2009-03-25 03:06:28.000000000 +0000
+++ qlscribe-0.10/lscribed/CMakeLists.txt 2009-03-25 07:09:45.735238647 +0000
@@ -36,11 +36,21 @@
IF (DBUS_SYSTEM_POLICY_DIR)
INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
-endif (DBUS_SYSTEM_POLICY_DIR)
+ELSE (DBUS_SYSTEM_POLICY_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client policy file for Qt Lightscribe is installed as DBUS_SYSTEM_POLICY_DIR.")
+ MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
+ MESSAGE(STATUS "Normally this is /etc/dbus-1/system.d on a Linux system")
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION share/qlscribe )
+ENDIF (DBUS_SYSTEM_POLICY_DIR)
IF (DBUS_SYSTEM_SERVICE_DIR)
INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
-endif (DBUS_SYSTEM_SERVICE_DIR)
+ELSE (DBUS_SYSTEM_SERVICE_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client service file for Qt Lightscribe is installed as DBUS_SYSTEM_SERVICE_DIR.")
+ MESSAGE(STATUS "Otherwise it will be installed into share/qlscribe")
+ MESSAGE(STATUS "Normally this is /usr/share/dbus-1/services on a Linux system")
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
+ENDIF (DBUS_SYSTEM_SERVICE_DIR)
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
introspecthandler.cpp )
@@ -54,5 +64,4 @@
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
INSTALL( TARGETS lscribed DESTINATION sbin )
-INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )

View File

@@ -0,0 +1,24 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-04-16
Initial Package Version: 0.11
Origin: me
Upstream Status: unknown
Description: add an RPATH to the lscribe daemon so that it works around the LDPATH problem
yes it adds an unneeded overhead to the linker but it works
diff -Naur qlscribe-0.11.orig/lscribed/CMakeLists.txt qlscribe-0.11/lscribed/CMakeLists.txt
--- qlscribe-0.11.orig/lscribed/CMakeLists.txt 2009-04-04 03:43:35.000000000 +0000
+++ qlscribe-0.11/lscribed/CMakeLists.txt 2009-04-15 23:07:14.897023631 +0000
@@ -61,6 +63,12 @@
ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} )
+IF (LSRPATH)
+ SET_TARGET_PROPERTIES( lscribed PROPERTIES INSTALL_NAME_DIR ${LSRPATH} )
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ SET(CMAKE_INSTALL_RPATH "${LSRPATH}")
+ENDIF (LSRPATH)
+
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
INSTALL( TARGETS lscribed DESTINATION sbin )

View File

@@ -0,0 +1,18 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-06-28
Initial Package Version: 0.13
Origin: http://sourceforge.net/forum/message.php?msg_id=7404710
Upstream Status: unknown
Description: add missing headfer for gcc 4.4
diff -Naur qlscribe-0.13.orig/lscribed/dbuscpp.h qlscribe-0.13/lscribed/dbuscpp.h
--- qlscribe-0.13.orig/lscribed/dbuscpp.h 2009-06-28 09:22:59.724035845 +0000
+++ qlscribe-0.13/lscribed/dbuscpp.h 2009-06-28 09:23:24.865233632 +0000
@@ -21,6 +21,7 @@
#ifndef DBUSCPP_H
#define DBUSCPP_H
+#include <stdint.h>
#include <dbus/dbus.h>
#include <string>
#include <map>

View File

@@ -0,0 +1,50 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-03-21
Initial Package Version: 0.9
Origin: me
Upstream Status: unknown
Description: find lightscribe in opt and install dbus files in right dir
diff -Naur qlscribe-0.9.orig/cmake/FindLightScribe.cmake qlscribe-0.9/cmake/FindLightScribe.cmake
--- qlscribe-0.9.orig/cmake/FindLightScribe.cmake 2009-03-11 00:51:03.000000000 +0000
+++ qlscribe-0.9/cmake/FindLightScribe.cmake 2009-03-21 08:44:39.000000000 +0000
@@ -18,9 +18,9 @@
#
# $Id: FindLightScribe.cmake 72 2009-02-22 01:27:45Z ruglory $
-FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include $ENV{LIGHTSCRIBEDIR}/include )
+FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include /usr/include/lightsribe $ENV{LIGHTSCRIBEDIR}/include )
-FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib $ENV{LIGHTSCRIBEDIR}/lib )
+FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib /opt/lightscribe/lib /opt/lightscribe/lib32 $ENV{LIGHTSCRIBEDIR}/lib )
if( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
SET( LSCRIBE_FOUND TRUE )
diff -Naur qlscribe-0.9.orig/lscribed/CMakeLists.txt qlscribe-0.9/lscribed/CMakeLists.txt
--- qlscribe-0.9.orig/lscribed/CMakeLists.txt 2009-03-11 00:51:04.000000000 +0000
+++ qlscribe-0.9/lscribed/CMakeLists.txt 2009-03-21 14:44:03.289663341 +0000
@@ -34,6 +34,18 @@
SET( CMAKE_EXE_LINKER_FLAGS "-m32 -pthread ${CMAKE_EXE_LINKER_FLAGS}" )
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
+IF (DBUS_SYSTEM_POLICY_DIR)
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
+ELSE (DBUS_SYSTEM_POLICY_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client policy file for Qt Lightscribe is installed as DBUS_SYSTEM_POLICY_DIR. Normally this is /etc/dbus-1/system.d on a Linux system")
+endif (DBUS_SYSTEM_POLICY_DIR)
+
+IF (DBUS_SYSTEM_SERVICE_DIR)
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
+ELSE (DBUS_SYSTEM_SERVICE_DIR)
+ MESSAGE(STATUS "It is necessary to specify the directory where the client service file for Qt Lightscribe is installed as DBUS_SYSTEM_SERVICE_DIR. Normally this is /usr/share/dbus-1/services on a Linux system")
+endif (DBUS_SYSTEM_SERVICE_DIR)
+
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
introspecthandler.cpp )
@@ -46,5 +58,4 @@
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
INSTALL( TARGETS lscribed DESTINATION sbin )
-INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )