[SCM] libindi packaging branch, master, updated. debian/0.9.8.1-5.1-12-g5609c33
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jul 8 20:50:33 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libindi.git;a=commitdiff;h=5609c33
The following commit has been merged in the master branch:
commit 5609c33160393e494da61b77612558c5f6193fe4
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Jul 8 22:44:52 2015 +0200
Update patches, only freebsd_support left
---
debian/changelog | 3 ++
debian/patches/abi.diff | 50 ---------------------
debian/patches/freebsd_support | 53 ++++++++++------------
debian/patches/no-sys-io.patch | 99 ------------------------------------------
debian/patches/series | 1 +
5 files changed, 27 insertions(+), 179 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a1bdd9d..c50e5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ libindi (1.0.0-1~) UNRELEASED; urgency=medium
* Follow upstream soversion bump. (Closes: #791746)
* Update copyright information.
* Update symbols with kfreebsd builds.
+ * Update patch for freebsd_support for usb support.
+ * Remove patch: no-sys-io.patch
+ * Remove patch: abi.diff
[ Adrien Grellier ]
* depends on libcfitsio-dev instead of libcfitsio3-dev
diff --git a/debian/patches/abi.diff b/debian/patches/abi.diff
deleted file mode 100644
index 0bab682..0000000
--- a/debian/patches/abi.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Bump the library version ABI
- libindi's API is not final until 1.0 but upstream does not bump SONAME,
- so manually bump the SONAME and library VERSION ourselves.
-Origin: vendor
-Last-Update: 2012-03-23
-Forwarded: not-needed
-
-Index: libindi/CMakeLists.txt
-===================================================================
---- libindi.orig/CMakeLists.txt 2014-04-01 15:42:57.788088964 +0200
-+++ libindi/CMakeLists.txt 2014-04-01 15:52:19.949524550 +0200
-@@ -5,10 +5,16 @@
-
- ################## INDI version ################################
- set(INDI_SOVERSION "0")
-+set(CLIENT_INDI_SOVERSION "0b")
-+set(DRIVER_INDI_SOVERSION "0c")
- set(CMAKE_INDI_VERSION_MAJOR 0)
- set(CMAKE_INDI_VERSION_MINOR 9)
- set(CMAKE_INDI_VERSION_RELEASE 8)
- set(CMAKE_INDI_VERSION_STRING "${CMAKE_INDI_VERSION_MAJOR}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
-+set(CMAKE_INDI_CLIENT_VERSION_STRING
-+ "${CLIENT_INDI_SOVERSION}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
-+set(CMAKE_INDI_DRIVER_VERSION_STRING
-+ "${DRIVER_INDI_SOVERSION}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
-
- ################## Paths ################################
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
-@@ -147,7 +153,8 @@
- target_link_libraries(indi ${NOVA_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY} ${CFITSIO_LIBRARIES})
-
- install(TARGETS indi LIBRARY DESTINATION ${LIB_DESTINATION})
--set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
-+set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_CLIENT_VERSION_STRING}
-+ SOVERSION ${CLIENT_INDI_SOVERSION})
-
- ###################################################
- ############ INDI Main Shared Library #############
-@@ -175,7 +182,9 @@
- add_library(indidriverstatic STATIC ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS})
- target_link_libraries(indidriverstatic ${LIBUSB_1_LIBRARIES} ${NOVA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CFITSIO_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY})
- endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--set_target_properties(indidriver indidriverstatic PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION} OUTPUT_NAME indidriver)
-+set_target_properties(indidriver indidriverstatic PROPERTIES
-+ VERSION ${CMAKE_INDI_DRIVER_VERSION_STRING}
-+ SOVERSION ${DRIVER_INDI_SOVERSION} OUTPUT_NAME indidriver)
- install(TARGETS indidriver LIBRARY DESTINATION ${LIB_DESTINATION})
- install(TARGETS indidriverstatic ARCHIVE DESTINATION ${LIB_DESTINATION})
-
diff --git a/debian/patches/freebsd_support b/debian/patches/freebsd_support
index 5425504..d231ef8 100644
--- a/debian/patches/freebsd_support
+++ b/debian/patches/freebsd_support
@@ -1,7 +1,7 @@
-Index: libindi/cmake_modules/FindUSB-1.cmake
+Index: libindi-1.0.0/cmake_modules/FindUSB-1.cmake
===================================================================
---- libindi.orig/cmake_modules/FindUSB-1.cmake 2014-08-30 04:27:26.897669303 +0200
-+++ libindi/cmake_modules/FindUSB-1.cmake 2014-08-30 04:27:26.897669303 +0200
+--- libindi-1.0.0.orig/cmake_modules/FindUSB-1.cmake 2015-07-08 17:51:51.000000000 +0200
++++ libindi-1.0.0/cmake_modules/FindUSB-1.cmake 2015-07-08 17:53:21.000000000 +0200
@@ -46,16 +46,16 @@
# in cache already
set(LIBUSB_FOUND TRUE)
@@ -38,26 +38,19 @@ Index: libindi/cmake_modules/FindUSB-1.cmake
endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
if (LIBUSB_1_FOUND)
-@@ -88,13 +92,13 @@
- set(CMAKE_REQUIRED_INCLUDES ${LIBUSB_1_INCLUDE_DIRS})
+@@ -89,7 +93,7 @@
set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_1_LIBRARIES})
- include (CheckCXXSourceCompiles)
-- check_cxx_source_compiles("#include <libusb-1.0/libusb.h>
-+ check_cxx_source_compiles("#include <libusb.h>
- int main() { libusb_error_name(0); return 0; }" ERROR_NAME_COMPILE)
- if (NOT ERROR_NAME_COMPILE)
- add_definitions("-DNO_ERROR_NAME")
- message(STATUS " - 1.0.8 or older")
- endif (NOT ERROR_NAME_COMPILE)
--
-+
- else (LIBUSB_1_FOUND)
- if (USB-1_FIND_REQUIRED)
- message(FATAL_ERROR "Could not find libusb-1.0. Please install libusb-1.0 along with the development package.")
-Index: libindi/libs/indibase/indiusbdevice.h
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ include (CheckCXXSourceCompiles)
+- check_cxx_source_compiles("#include <libusb-1.0/libusb.h>
++ check_cxx_source_compiles("#include <libusb.h>
+ int main() { libusb_error_name(0); return 0; }" ERROR_NAME_COMPILE)
+ if (NOT ERROR_NAME_COMPILE)
+ add_definitions("-DNO_ERROR_NAME")
+Index: libindi-1.0.0/libs/indibase/indiusbdevice.h
===================================================================
---- libindi.orig/libs/indibase/indiusbdevice.h 2014-08-30 04:27:26.897669303 +0200
-+++ libindi/libs/indibase/indiusbdevice.h 2014-08-30 04:27:26.897669303 +0200
+--- libindi-1.0.0.orig/libs/indibase/indiusbdevice.h 2015-07-08 17:51:51.000000000 +0200
++++ libindi-1.0.0/libs/indibase/indiusbdevice.h 2015-07-08 17:54:25.000000000 +0200
@@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(c) 2011 Gerry Rozema. All rights reserved.
@@ -66,20 +59,20 @@ Index: libindi/libs/indibase/indiusbdevice.h
Upgrade to libusb 1.0 by CloudMakers, s. r. o.
Copyright(c) 2013 CloudMakers, s. r. o. All rights reserved.
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- #include <errno.h>
-
+@@ -32,7 +32,7 @@
+ #ifdef OSX_EMBEDED_MODE
+ #include <libusb.h>
+ #else
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
+ #endif
#include "indibase.h"
-
-Index: libindi/CMakeLists.txt
+Index: libindi-1.0.0/CMakeLists.txt
===================================================================
---- libindi.orig/CMakeLists.txt 2014-08-30 04:27:26.873670284 +0200
-+++ libindi/CMakeLists.txt 2014-08-30 04:35:42.837424482 +0200
-@@ -81,6 +81,7 @@
+--- libindi-1.0.0.orig/CMakeLists.txt 2015-07-08 17:51:51.000000000 +0200
++++ libindi-1.0.0/CMakeLists.txt 2015-07-08 17:51:51.000000000 +0200
+@@ -77,6 +77,7 @@
include_directories(${CFITSIO_INCLUDE_DIR})
endif (CFITSIO_FOUND)
diff --git a/debian/patches/no-sys-io.patch b/debian/patches/no-sys-io.patch
deleted file mode 100644
index 42e16d2..0000000
--- a/debian/patches/no-sys-io.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: libindi/libs/webcam/port.cpp
-===================================================================
---- libindi.orig/libs/webcam/port.cpp 2014-07-18 10:42:07.084396085 +0200
-+++ libindi/libs/webcam/port.cpp 2014-07-18 10:52:23.127472102 +0200
-@@ -37,39 +37,13 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #endif /* LOCKING */
--#ifdef __linux__
--#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) \
-- || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)\
-- || defined(__mips__) || defined(__mc68000__) || defined(__sh__)
--#define NO_SYSIO
--#endif /* architechtures */
--#endif /* __linux__ */
-
--#ifdef __linux__
-- #if defined(NO_SYSIO)
-- #include <fcntl.h>
-- #else
-- #include <sys/io.h>
-- #endif /* NO_SYSIO */
--#elif defined(QNX)
--#include <conio.h>
--#elif defined(__FreeBSD__)
-+#include "port.h"
-+
-+#if defined(__FreeBSD__)
- #include <sys/types.h>
--#include <machine/cpufunc.h>
--#elif defined(BSDI)
--#include <machine/inline.h>
--#elif defined(OPENBSD)
--#include <machine/pio.h>
--#elif defined(LYNX)
--#include "lynx-io.h"
--#elif defined(SOLARIS)
--#include "solaris-io.h"
--#else
--#error Please define a platform in the Makefile
- #endif /* which OS */
-
--#include "port.h"
--
- port_t::port_t(int iport) {
- port = -1;
-
-Index: libindi/libs/webcam/port.h
-===================================================================
---- libindi.orig/libs/webcam/port.h 2014-07-18 10:42:07.084396085 +0200
-+++ libindi/libs/webcam/port.h 2014-07-18 10:56:37.157203428 +0200
-@@ -36,7 +36,19 @@
- #include <unistd.h>
-
- #ifdef __linux__
-- #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__)
-+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) \
-+ || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)\
-+ || defined(__mips__) || defined(__mc68000__) || defined(__sh__)\
-+ || defined(__aarch64__)
-+#define NO_SYSIO
-+#endif /* architechtures */
-+#endif /* __linux__ */
-+
-+
-+#ifdef __linux__
-+ #if defined(NO_SYSIO)
-+ #include <fcntl.h>
-+ #else
- #include <sys/io.h>
- #endif /* !arm */
- #elif defined(QNX)
-@@ -56,7 +68,7 @@
- #error Please define a platform in the Makefile
- #endif
-
--#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__) || defined(__mips__) || defined(__mc68000__)
-+#if defined(NO_SYSIO)
- static char ports_temp;
-
- #ifdef inb
-@@ -75,7 +87,7 @@
- ports_temp = data; \
- write(devport, &ports_temp, 1);
-
--#endif /* arm, hppa */
-+#endif /* NO_SYSIO */
-
- class port_t {
- public:
-@@ -115,7 +127,7 @@
- #ifdef FREEBSD
- FILE *devio;
- #endif
--#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__) || defined(__mips__) || defined(__mc68000__))
-+#if defined(NO_SYSIO)
- int devport;
- #endif
- };
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..773e432 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+freebsd_support
--
libindi packaging
More information about the pkg-kde-commits
mailing list