diff --git a/libcec-3.0.1-buildfix-upstream.patch b/libcec-3.0.1-buildfix-upstream.patch new file mode 100644 index 0000000..db94adb --- /dev/null +++ b/libcec-3.0.1-buildfix-upstream.patch @@ -0,0 +1,25 @@ +From 2f32a9debc1f148b5dfcfc463480f1432bb71725 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Sat, 11 Jul 2015 00:53:17 +0200 +Subject: [PATCH] fixed: don't generate an invalid env.h when not built with + the .git dir present. closes #112 + +--- + support/git-rev.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/support/git-rev.sh b/support/git-rev.sh +index 5dce3d0..4aadae6 100755 +--- a/support/git-rev.sh ++++ b/support/git-rev.sh +@@ -1,5 +1,8 @@ + #!/bin/sh + + ## cmake doesn't read the variable when it doesn't end with a newline, and I haven't figured out how to have it add a newline directly... +-echo -n "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`\n" +- ++if [ -d .git ]; then ++ echo "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`" ++else ++ echo "" ++fi diff --git a/libcec.spec b/libcec.spec index 639631f..b213627 100644 --- a/libcec.spec +++ b/libcec.spec @@ -10,8 +10,9 @@ %endif Name: libcec -Version: 20130217git -Release: 4mamba +Epoch: 1 +Version: 3.0.1 +Release: 1mamba Summary: USB CEC Adaptor communication Library Group: System/Kernel and Hardware Vendor: openmamba @@ -19,14 +20,19 @@ Distribution: openmamba Packager: Davide Madrisan URL: http://libcec.pulse-eight.com/ ## GITSOURCE git://github.com/Pulse-Eight/libcec.git -Source: git://github.com/Pulse-Eight/libcec.git/master/libcec-%{version}.tar.bz2 +Source: git://github.com/Pulse-Eight/libcec.git/libcec-%{version}/libcec-%{version}.tar.bz2 +Patch0: libcec-3.0.1-buildfix-upstream.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libX11-devel +BuildRequires: libXrandr-devel BuildRequires: libgcc +BuildRequires: libncurses-devel +BuildRequires: libplatform-devel +BuildRequires: libpython3-devel BuildRequires: libstdc++6-devel -BuildRequires: systemd-devel -BuildRequires: udev-devel +BuildRequires: libudev-devel ## AUTOBUILDREQ-END BuildRequires: autoconf BuildRequires: libtool @@ -61,37 +67,27 @@ Requires: pkg-config %description -n %{pckname}-devel This package contains libraries and header files for developing applications that use %{pckname}. -%ifnarch noarch -%global __debug_package 1 - -%package -n %{pckname}-debug -Summary: Debug information for package %{pckname} -Group: Development/Debug -AutoReqProv: 0 - -%description -n %{pckname}-debug -This package provides debug information for package %{pckname}. -Debug information is useful when developing applications that use this package or when debugging this package. -%endif +%debug_package %prep %setup -q #-D -T +%patch0 -p1 %build #: << CBLOCK -./bootstrap -%configure \ +%cmake -d build \ +\ %if "%{?_with_raspberrypi}" - --with-rpi-include-path="/opt/vc/include" \ - --with-rpi-lib-path="/opt/vc/lib" + -DRPI_INCLUDE_DIR=/opt/vc/include \ + -DRPI_LIB_DIR=/opt/vc/lib %endif %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%makeinstall -C build %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -102,24 +98,26 @@ Debug information is useful when developing applications that use this package o %files -n %{pckname} %defattr(-,root,root) %{_bindir}/cec-client +%{_bindir}/cec-client-3.0.1 +%{_bindir}/cecc-client +%{_bindir}/cecc-client-3.0.1 +%{_bindir}/pyCecClient.py +%{_prefix}/lib/python*/dist-packages/cec/__init__.py +%{_prefix}/lib/python*/dist-packages/cec/_cec.so %{_libdir}/libcec.so.* %doc AUTHORS COPYING %files -n %{pckname}-devel %defattr(-,root,root) %{_includedir}/libcec -%{_libdir}/libcec.a -%{_libdir}/libcec.la %{_libdir}/libcec.so %{_libdir}/pkgconfig/libcec.pc -%doc ChangeLog README - -%ifnarch noarch -%files -n %{pckname}-debug -f debugfiles.list -%defattr(-,root,root) -%endif +%doc ChangeLog %changelog +* Wed Sep 23 2015 Silvan Calarco 3.0.1-1mamba +- update to 3.0.1 + * Sun Mar 03 2013 Davide Madrisan 20130217git-4mamba - fix the summary of the devel package