- updated to 1.26

- rebuild utils from sources, so binary package no longer requires libjpeg 6b and libpng 1.2.x

Changed files:
    AVT_GigE_SDK.spec -> 1.2

diff --git a/AVT_GigE_SDK.spec b/AVT_GigE_SDK.spec
index 89e18b3144d611d408812d9d469c9b5b13000b68..fa8f7a8f8006d0292b61a74f0de8aaced5b385cd 100644 (file)
--- a/AVT_GigE_SDK.spec
+++ b/AVT_GigE_SDK.spec
@@ -1,21 +1,22 @@
-# TODO: build SampleViewer from sources? (using dynamic wxWidgets)
 Summary:       Prosilica GigE Vision Gigabit Ethernet cameras support
 Summary(pl.UTF-8):     Obsługa kamer Prosilica GigE Vision podłączanych przez Gigabit Ethernet
 Name:          AVT_GigE_SDK
-Version:       1.24
+Version:       1.26
 Release:       1
 License:       non-distributable
 Group:         Libraries
-Source0:       http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/Prosilica_software/Prosilica_SDK/%{name}_%{version}_Linux.tgz
-# NoSource0-md5:       f7e895aae4e8b2f0ca3cc72a2351bf70
+Source0:       http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/Prosilica_software/Prosilica_SDK/%{name}_Linux.tgz
+# NoSource0-md5:       1caa78c27d069b0fa1adab916433f248
 NoSource:      0
 URL:           http://www.alliedvisiontec.com/us/products/software/linux/gige-linux-sdk.html
+BuildRequires: wxGTK2-unicode-devel
 ExclusiveArch: %{ix86} %{x8664} arm ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # gcc version of static libs (see tarball for available versions)
-%define                ppcgccver       4.2
-%define                x86gccver       4.4
+%define                armgccver       4.4
+%define                ppcgccver       4.4
+%define                x86gccver       4.5
 
 %description
 The Linux SDK and Sample Viewer program allows users to control and
@@ -59,34 +60,69 @@ Static PvAPI library.
 %description static -l pl.UTF-8
 Statyczna biblioteka PvAPI.
 
+%package viewer
+Summary:       wxWidgets-based sample viewer
+Summary(pl.UTF-8):     Przeglądarka oparta na wxWidgets
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}-%{release}
+
+%description viewer
+wxWidgets-based sample viewer.
+
+%description viewer -l pl.UTF-8
+Przeglądarka oparta na wxWidgets.
+
 %prep
 %setup -q -n "AVT GigE SDK"
 
+%build
+%ifarch %{ix86}
+PLATFORM=x86
+%endif
+%ifarch %{x8664}
+PLATFORM=x64
+%endif
+%ifarch arm
+PLATFORM=arm
+%endif
+%ifarch ppc
+PLATFORM=ppc
+%endif
+%{__make} -C examples/CLIpConfig sample \
+       CPU=$PLATFORM \
+       OPT="%{rpmcxxflags}" \
+       CC="%{__cxx}"
+
+%{__make} -C examples/SampleViewer sample \
+       CPU=$PLATFORM \
+       OPT="%{rpmcxxflags}" \
+       CC="%{__cxx}" \
+       WX_FLAGS="$(wx-gtk2-unicode-config --cxxflags)" \
+       WXLIB="$(wx-gtk2-unicode-config --libs)"
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}}
 
 %ifarch %{ix86}
-install bin-pc/x86/{CLIpConfig,SampleViewer} $RPM_BUILD_ROOT%{_bindir}
 install bin-pc/x86/libPv{API,JNI}.so $RPM_BUILD_ROOT%{_libdir}
 install lib-pc/x86/%{x86gccver}/lib*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 %ifarch %{x8664}
-install bin-pc/x64/{CLIpConfig,SampleViewer} $RPM_BUILD_ROOT%{_bindir}
 install bin-pc/x64/libPv{API,JNI}.so $RPM_BUILD_ROOT%{_libdir}
 install lib-pc/x64/%{x86gccver}/lib*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 %ifarch arm
-install bin-pc/arm/CLIpConfig $RPM_BUILD_ROOT%{_bindir}
 install bin-pc/arm/libPvAPI.so $RPM_BUILD_ROOT%{_libdir}
-install lib-pc/arm/3.3.5/lib*.a $RPM_BUILD_ROOT%{_libdir}
+install lib-pc/arm/%{armgccver}/lib*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 %ifarch ppc
-install bin-pc/ppc/CLIpConfig $RPM_BUILD_ROOT%{_bindir}
 install bin-pc/ppc/libPvAPI.so $RPM_BUILD_ROOT%{_libdir}
 install lib-pc/ppc/%{ppcgccver}/lib*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 install inc-pc/*.h $RPM_BUILD_ROOT%{_includedir}
+install examples/CLIpConfig/CLIpConfig $RPM_BUILD_ROOT%{_bindir}
+install examples/SampleViewer/SampleViewer $RPM_BUILD_ROOT%{_bindir}/AVTSampleViewer
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/CLIpConfig
 %attr(755,root,root) %{_libdir}/libPvAPI.so
 %ifarch %{ix86} %{x8664}
-%attr(755,root,root) %{_bindir}/SampleViewer
 %attr(755,root,root) %{_libdir}/libPvJNI.so
 %endif
 
@@ -116,3 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libPvAPI.a
+
+%files viewer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/AVTSampleViewer