Hello community, here is the log from the commit of package libindi for openSUSE:Factory checked in at 2012-12-07 14:38:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libindi (Old) and /work/SRC/openSUSE:Factory/.libindi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libindi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libindi/libindi.changes 2012-10-07 19:15:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libindi.new/libindi.changes 2012-12-07 14:38:18.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Nov 28 19:56:10 UTC 2012 - [email protected] + +- Update to version 0.9.6: + * Support for Starlight Xpress Adaptive Optics unit. + * Improved support for Startlight Xpress CCDs and Filter wheels. + * Support for Arduino boards, with customizable drivers for common + observatory auxiliary devices. + * Support for GPUSB Guide Port Interface. + * Improved support for QSI CCDs and Filter wheels. + * Support for filters with absolute positioning. + * Support for cameras with guiding chip. + * Fixed INDI server FIFO CPU utilization bug. + * Fixed various bugs with v4l drivers due to code regression. + * Improved support for Mac OS X. + * Improved simulators. + * _REQUEST properties are now deprecated. + * Updated tutorials and API. +- Removed the previous no-return-in-nonvoid-function.patch (fixed upstream) and + added a new one to fix some new "no-return-in-nonvoid-function" rpm + post-build check errors. +- Added a patch (udev_rules_dir_configurable.patch) to make + "UDEVRULES_INSTALL_DIR" configurable. +- Added pkgconfig(udev) as build requirement in order to install the udev rules + file in the correct directory. + +------------------------------------------------------------------- Old: ---- libindi_0.9.5.tar.gz New: ---- libindi_0.9.6.tar.gz udev_rules_dir_configurable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindi.spec ++++++ --- /var/tmp/diff_new_pack.Cjcy6p/_old 2012-12-07 14:38:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Cjcy6p/_new 2012-12-07 14:38:19.000000000 +0100 @@ -18,8 +18,10 @@ %define so_ver 0 +%define _udevdir %(pkg-config --variable udevdir udev) + Name: libindi -Version: 0.9.5 +Version: 0.9.6 Release: 0 Summary: Instrument Neutral Distributed Interface License: GPL-2.0+ and LGPL-2.1+ @@ -28,11 +30,19 @@ Source0: http://downloads.sourceforge.net/indi/%{name}_%{version}.tar.gz # PATCH-FIX-UPSTREAM no-return-in-nonvoid-function.patch [email protected] -- Fix "no-return-in-nonvoid-function" post-build check errors Patch0: no-return-in-nonvoid-function.patch +# PATCH-FIX-UPSTREAM udev_rules_dir_configurable.patch [email protected] -- Make "UDEVRULES_INSTALL_DIR" configurable +Patch1: udev_rules_dir_configurable.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libcfitsio-devel BuildRequires: libfli-devel BuildRequires: libnova-devel +%if 0%{?suse_version} >= 1140 +BuildRequires: pkgconfig(udev) +%else +BuildRequires: pkg-config +BuildRequires: udev +%endif BuildRequires: libusb-devel BuildRequires: zlib-devel Requires: libindi%{so_ver} = %{version} @@ -51,6 +61,8 @@ Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libindi%{so_ver} = %{version} +Requires: libindidriver%{so_ver} = %{version} +Requires: libindimain%{so_ver} = %{version} %description devel This package contains development files for libindi. @@ -67,9 +79,34 @@ capabilities and communicate with the device drivers and build a completely dynamic GUI based on the services provided by the device. +%package -n libindidriver%{so_ver} +Summary: Instrument Neutral Distributed Interface +Group: System/Libraries + +%description -n libindidriver%{so_ver} +INDI is an Instrument Neutral Distributed Interface control protocol +for astronomical devices, which provides a framework that decouples low +level hardware drivers from high level front end clients. Clients that +use the device drivers are completely unaware of the device +capabilities and communicate with the device drivers and build a +completely dynamic GUI based on the services provided by the device. + +%package -n libindimain%{so_ver} +Summary: Instrument Neutral Distributed Interface +Group: System/Libraries + +%description -n libindimain%{so_ver} +INDI is an Instrument Neutral Distributed Interface control protocol +for astronomical devices, which provides a framework that decouples low +level hardware drivers from high level front end clients. Clients that +use the device drivers are completely unaware of the device +capabilities and communicate with the device drivers and build a +completely dynamic GUI based on the services provided by the device. + %prep %setup -q %patch0 -p1 +%patch1 %build mkdir build @@ -77,35 +114,56 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" _libsuffix=$(echo %_lib | cut -b4-) -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX="$_libsuffix" .. +cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_SUFFIX="$_libsuffix" \ + -DUDEVRULES_INSTALL_DIR=%{_udevdir}/rules.d \ + .. make %{?_smp_mflags} VERBOSE=1 cd .. %install cd build -%make_install +make DESTDIR=%{buildroot} install cd .. %post -n libindi%{so_ver} -p /sbin/ldconfig %postun -n libindi%{so_ver} -p /sbin/ldconfig +%post -n libindidriver%{so_ver} -p /sbin/ldconfig + +%postun -n libindidriver%{so_ver} -p /sbin/ldconfig + +%post -n libindimain%{so_ver} -p /sbin/ldconfig + +%postun -n libindimain%{so_ver} -p /sbin/ldconfig + %files %defattr(-,root,root,-) %doc AUTHORS COPYING.* COPYRIGHT ChangeLog LICENSE NEWS README README.drivers TODO %{_datadir}/indi/ %{_bindir}/indi* +%{_udevdir}/rules.d/99-gpusb.rules %files devel %defattr(-,root,root,-) %doc COPYING.GPL COPYING.LGPL LICENSE %{_includedir}/libindi/ %{_libdir}/pkgconfig/libindi.pc -%{_libdir}/libindi.so +%{_libdir}/libindi*.so %{_libdir}/libindi*.a %files -n libindi%{so_ver} %defattr(-,root,root,-) %{_libdir}/libindi.so.%{so_ver}* +%files -n libindidriver%{so_ver} +%defattr(-,root,root,-) +%{_libdir}/libindidriver.so.%{so_ver}* + +%files -n libindimain%{so_ver} +%defattr(-,root,root,-) +%{_libdir}/libindimain.so.%{so_ver}* + %changelog ++++++ libindi_0.9.5.tar.gz -> libindi_0.9.6.tar.gz ++++++ ++++ 17367 lines of diff (skipped) ++++++ no-return-in-nonvoid-function.patch ++++++ --- /var/tmp/diff_new_pack.Cjcy6p/_old 2012-12-07 14:38:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Cjcy6p/_new 2012-12-07 14:38:19.000000000 +0100 @@ -1,33 +1,66 @@ -diff -Naur libindi-0.9.5.orig/drivers/telescope/telescope_simulator.cpp libindi-0.9.5/drivers/telescope/telescope_simulator.cpp ---- libindi-0.9.5.orig/drivers/telescope/telescope_simulator.cpp 2012-08-24 03:11:27.000000000 +0300 -+++ libindi-0.9.5/drivers/telescope/telescope_simulator.cpp 2012-09-23 15:08:52.227482265 +0300 -@@ -520,6 +520,7 @@ - - - NewRaDec(currentRA, currentDEC); -+ return true; - } - - bool ScopeSim::Park() -diff -Naur libindi-0.9.5.orig/indidriver.c libindi-0.9.5/indidriver.c ---- libindi-0.9.5.orig/indidriver.c 2012-08-24 03:11:28.000000000 +0300 -+++ libindi-0.9.5/indidriver.c 2012-09-23 15:10:20.239899517 +0300 -@@ -307,6 +307,7 @@ - bp->size = size; - bp->blob = blob; - strncpy(bp->format, format, MAXINDIFORMAT); -+ return 0; - } - - void IUFillSwitch(ISwitch *sp, const char *name, const char * label, ISState s) -diff -Naur libindi-0.9.5.orig/libs/indibase/basedevice.cpp libindi-0.9.5/libs/indibase/basedevice.cpp ---- libindi-0.9.5.orig/libs/indibase/basedevice.cpp 2012-08-24 03:11:28.000000000 +0300 -+++ libindi-0.9.5/libs/indibase/basedevice.cpp 2012-09-23 15:12:11.186619202 +0300 -@@ -996,6 +996,7 @@ +diff -Naur libindi-0.9.6.orig/drivers/auxiliary/gpusb.cpp libindi-0.9.6/drivers/auxiliary/gpusb.cpp +--- libindi-0.9.6.orig/drivers/auxiliary/gpusb.cpp 2012-11-19 22:39:14.000000000 +0200 ++++ libindi-0.9.6/drivers/auxiliary/gpusb.cpp 2012-11-22 21:25:20.626955314 +0200 +@@ -148,6 +148,7 @@ + deleteProperty(GuideEWP.name); + } + ++ return true; + } + + void GPUSB::ISGetProperties (const char *dev) +diff -Naur libindi-0.9.6.orig/drivers/ccd/ccd_simulator.cpp libindi-0.9.6/drivers/ccd/ccd_simulator.cpp +--- libindi-0.9.6.orig/drivers/ccd/ccd_simulator.cpp 2012-11-19 22:39:14.000000000 +0200 ++++ libindi-0.9.6/drivers/ccd/ccd_simulator.cpp 2012-11-22 21:27:53.361969306 +0200 +@@ -1033,6 +1033,7 @@ + { + CurrentFilter = f; + SelectFilterDone(f); ++ return true; + } + + bool CCDSim::GetFilterNames(const char* groupName) +diff -Naur libindi-0.9.6.orig/examples/tutorial_five/dome.cpp libindi-0.9.6/examples/tutorial_five/dome.cpp +--- libindi-0.9.6.orig/examples/tutorial_five/dome.cpp 2012-11-19 22:39:14.000000000 +0200 ++++ libindi-0.9.6/examples/tutorial_five/dome.cpp 2012-11-24 22:24:44.153118536 +0200 +@@ -122,6 +122,7 @@ + // Make sure to set the device name to "Rain Detector" since we are snooping on rain detector device. + IUFillLightVector(&RainLP, RainL, 1, "Rain Detector", "Rain Alert", "", MAIN_CONTROL_TAB, IPS_IDLE); + ++ return true; + } + + /******************************************************************************************** +@@ -214,7 +215,10 @@ + else if (old_state == IPS_ALERT && RainL[0].s != IPS_ALERT) + IDMessage(getDeviceName(), "Rain threat passed. Opening the dome is now safe."); - } ++ return true; } -+ return 0; ++ ++ return false; + } + + /******************************************************************************************** +diff -Naur libindi-0.9.6.orig/examples/tutorial_five/raindetector.cpp libindi-0.9.6/examples/tutorial_five/raindetector.cpp +--- libindi-0.9.6.orig/examples/tutorial_five/raindetector.cpp 2012-11-19 22:39:14.000000000 +0200 ++++ libindi-0.9.6/examples/tutorial_five/raindetector.cpp 2012-11-22 21:36:27.312633896 +0200 +@@ -118,6 +118,7 @@ + IUFillSwitch(&RainS[1], "Off", "", ISS_OFF); + IUFillSwitchVector(&RainSP, RainS, 2, getDeviceName(), "Control Rain", "", MAIN_CONTROL_TAB, IP_RW, ISR_1OFMANY, 0, IPS_IDLE); + ++ return true; + } + + /******************************************************************************************** +diff -Naur libindi-0.9.6.orig/examples/tutorial_three/simpleccd.cpp libindi-0.9.6/examples/tutorial_three/simpleccd.cpp +--- libindi-0.9.6.orig/examples/tutorial_three/simpleccd.cpp 2012-11-19 22:39:14.000000000 +0200 ++++ libindi-0.9.6/examples/tutorial_three/simpleccd.cpp 2012-11-22 21:36:52.735964639 +0200 +@@ -131,6 +131,7 @@ + IUFillNumber(&TemperatureN[0], "CCD_TEMPERATURE_VALUE", "Temperature (C)", "%5.2f", MIN_CCD_TEMP, MAX_CCD_TEMP, 0., 0.); + IUFillNumberVector(&TemperatureNP, TemperatureN, 1, getDeviceName(), "CCD_TEMPERATURE", "Temperature", MAIN_CONTROL_TAB, IP_RW, 60, IPS_IDLE); ++ return true; } + /************************************************************************************** ++++++ udev_rules_dir_configurable.patch ++++++ --- CMakeLists.txt.orig 2012-11-19 22:39:14.000000000 +0200 +++ CMakeLists.txt 2012-11-24 22:41:59.392416949 +0200 @@ -13,7 +13,6 @@ set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/") set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") -set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d") IF(APPLE) set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup") @@ -25,6 +24,7 @@ ## the following are directories where stuff will be installed to set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix") set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") +set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d" CACHE STRING "Base directory for udev rules") ################## Includes ################################ Include (CheckCXXSourceCompiles) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
