packages: AVT_GigE_SDK/AVT_GigE_SDK.spec - updated to 1.26 - rebuild utils ...

[qboosh]

Author: qboosh                       Date: Thu Jan 26 15:49:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.26
- rebuild utils from sources, so binary package no longer requires libjpeg 6b and libpng 1.2.x

---- Files affected:
packages/AVT_GigE_SDK:
   AVT_GigE_SDK.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/AVT_GigE_SDK/AVT_GigE_SDK.spec
diff -u packages/AVT_GigE_SDK/AVT_GigE_SDK.spec:1.1 packages/AVT_GigE_SDK/AVT_GigE_SDK.spec:1.2
--- packages/AVT_GigE_SDK/AVT_GigE_SDK.spec:1.1	Sun Jan 23 17:42:20 2011
+++ packages/AVT_GigE_SDK/AVT_GigE_SDK.spec	Thu Jan 26 16:49:46 2012
@@ -1,22 +1,23 @@
 # $Revision$, $Date$
-# 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
@@ -60,34 +61,69 @@
 %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
@@ -101,7 +137,6 @@
 %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
 
@@ -118,11 +153,19 @@
 %defattr(644,root,root,755)
 %{_libdir}/libPvAPI.a
 
+%files viewer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/AVTSampleViewer
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/01/26 15:49:46  qboosh
+- updated to 1.26
+- rebuild utils from sources, so binary package no longer requires libjpeg 6b and libpng 1.2.x
+
 Revision 1.1  2011/01/23 16:42:20  qboosh
 - new, contains PvAPI; unfortunately binary and non-distributable
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/AVT_GigE_SDK/AVT_GigE_SDK.spec?r1=1.1&r2=1.2&f=u