- up to 4.07.13; vaViewer is gone, arm support added

- removed outdated va patch

diff --git a/XIMEA-va.patch b/XIMEA-va.patch
deleted file mode 100644 (file)
index 74c76ce..0000000
--- a/XIMEA-va.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- XIMEA-4.01.09/package/examples/vaViewer/main.cpp.orig      2013-11-15 15:09:58.000000000 +0100
-+++ XIMEA-4.01.09/package/examples/vaViewer/main.cpp   2014-02-11 19:47:05.065480623 +0100
-@@ -218,7 +218,7 @@
-                               surface_width = lps->color ? lps->sbmp.w : lps->sgf.curCX;
-                               surface_height = lps->color ? lps->sbmp.h : lps->sgf.curCY;
-                               printf("Image size changed to %dx%d\n", surface_width, surface_height);
--                              va_status = vaCreateSurfaces(va_dpy, surface_width, surface_height, VA_RT_FORMAT_YUV420, 1, &surface_id);
-+                              va_status = vaCreateSurfaces(va_dpy, VA_RT_FORMAT_YUV420, surface_width, surface_height, &surface_id, 1, NULL, 0);
-                               CHECK_VASTATUS(va_status, "vaCreateSurfaces", lps->show=0;surface_id=VA_INVALID_SURFACE);
-                               if(max_height > 0 || max_width > 0) {
-                                       if(max_height <= 0 || max_width > 0 && surface_width * max_height > surface_height * max_width) {
-@@ -262,7 +262,7 @@
-                               if (lps->dwNframes) lps->fFPS_sum = lps->fFPS_sum*tau + lps->fFPS*(1.-tau);
-                               else                  lps->fFPS_sum = lps->fFPS;
-                               lps->dwTime++;
--                              snprintf(&win_name[0], 256, "Video FPS: %.1f; Acquisition: frm %lu skip %lu fps %.1f", lps->frame_num*1000.0/(float)lps->putsurface_time, lps->dwNframes, lps->dwLframes, (float)lps->fFPS_sum);
-+                              snprintf(&win_name[0], 256, "Video FPS: %.1f; Acquisition: frm %u skip %u fps %.1f", lps->frame_num*1000.0/(float)lps->putsurface_time, lps->dwNframes, lps->dwLframes, (float)lps->fFPS_sum);
-                               lps->putsurface_time = 0;
-                               lps->frame_num = 0;
-                               XmbTextListToTextProperty(x11_display, &pwin_name, 1, XStringStyle, &winname);

diff --git a/XIMEA.spec b/XIMEA.spec
index 5225f67a3f9ae4fad8e1bd98ec7c098cc71828d5..9121cc499026c408000924ce3c196221529d848e 100644 (file)
--- a/XIMEA.spec
+++ b/XIMEA.spec
@@ -1,41 +1,37 @@
 # TODO: build kernel module (src/currera_acq_module)
 #
-# Conditional build:
-%bcond_without opencl  # OpenCL support in vaViewer
-#
 Summary:       XIMEA API Software Package for Linux
 Summary(pl.UTF-8):     Pakiet XIMEA API dla Linuksa
 Name:          XIMEA
 # see version_LINUX_SP.txt
-Version:       4.01.09
+Version:       4.07.13
 Release:       1
 # some mix of binaries and sources with no licensing information (except for GPL kernel module)
 License:       unknown
 Group:         Libraries
-Source0:       http://www.ximea.com/support/attachments/271/XIMEA_Linux_SP.tgz
-# NoSource0-md5:       fe4a4f4ec44a46da5f4fcd643b70cf46
+Source0:       https://www.ximea.com/support/attachments/271/XIMEA_Linux_SP.tgz
+# NoSource0-md5:       b60f28842bf3e5fb94c5f43c84bb7027
 NoSource:      0
-Patch0:                %{name}-va.patch
 URL:           http://www.ximea.com/support/wiki/apis/XIMEA_Linux_Software_Package
-%{?with_opencl:BuildRequires:  OpenCL-devel}
 BuildRequires: gstreamer0.10-devel
 BuildRequires: gstreamer0.10-plugins-base-devel
 BuildRequires: gtk+2-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libva-devel
 BuildRequires: pkgconfig
 BuildRequires: xorg-lib-libX11-devel
 Requires:      libraw1394 >= 2.1.0
 Requires:      libusb >= 1.0.9
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} arm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch        %{ix86}
 %define        abi     X32
-%else
+%endif
 %ifarch %{x8664}
 %define        abi     X64
 %endif
+%ifarch %{arm}
+%define        abi     Xarm
 %endif
 
 %description
@@ -44,7 +40,7 @@ XIMEA Linux Software Package contains of
  * xiAPI
  * Examples:
    * xiSample - sample showing basic image acquisition in xiAPI
-   * vaViewer - camera live image viewer for picture check
+   * streamViewer - camera live image viewer for picture check
 
 %description -l pl.UTF-8
 Pakiet XIMEA Linux Software Package składa się z:
@@ -53,7 +49,7 @@ Pakiet XIMEA Linux Software Package składa się z:
  - przykładów:
    - xiSample - przykładu pokazującego proste ściąganie obrazu przy
      użyciu xiAPI
-   - vaViewer - podgląd kamery na żywo
+   - streamViewer - podgląd kamery na żywo
 
 %package devel
 Summary:       Header files for xiAPI library
@@ -68,22 +64,22 @@ Header files for xiAPI library.
 Pliki nagłówkowe biblioteki xiAPI.
 
 %package viewer
-Summary:       XIMEA vaViewer utility
-Summary(pl.UTF-8):     Narzędzie vaViewer dla urządzeń XIMEA
+Summary:       XIMEA streamViewer utility
+Summary(pl.UTF-8):     Narzędzie streamViewer dla urządzeń XIMEA
 Group:         X11/Applications/Graphics
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description viewer
-XIMEA vaViewer utility.
+XIMEA streamViewer utility.
 
 %description viewer -l pl.UTF-8
-Narzędzie vaViewer dla urządzeń XIMEA.
+Narzędzie streamViewer dla urządzeń XIMEA.
 
 %prep
 %setup -q -c
-%patch0 -p1
 
 ln -s ../../include package/examples/streamViewer/m3api
+ln -s libm3api.so.2 package/api/%{abi}/libm3api.so
 
 %build
 cd package
@@ -95,24 +91,20 @@ cd package
        $(pkg-config --libs gtk+-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-interfaces-0.10) \
        -Lapi/%{abi} -lm3api
 
-%{__make} -C examples/vaViewer acquisition.o main.o \
-       CXX="%{__cxx}" \
-       CFLAGS="%{rpmcxxflags} %{rpmcppflags} %{?with_opencl:-DOPENCL}"
-%{__cxx} %{rpmldflags} %{rpmcxxflags} -o examples/vaViewer/vaViewer \
-       examples/vaViewer/*.o \
-       $(pkg-config --libs libva libva-x11 gtk+-2.0) %{?with_opencl:-lOpenCL} -lX11 -lpthread \
-       -Lapi/%{abi} -lm3api
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/ximea}
 
 cd package
 cp -p include/*.h $RPM_BUILD_ROOT%{_includedir}/ximea
-install api/%{abi}/libm3api.so $RPM_BUILD_ROOT%{_libdir}
-install libs/gentl/%{abi}/libXIMEA_GenTL.so $RPM_BUILD_ROOT%{_libdir}
+install api/%{abi}/libm3api.so.0 $RPM_BUILD_ROOT%{_libdir}/libm3api.so.0.0.0
+install api/%{abi}/libm3api.so.2 $RPM_BUILD_ROOT%{_libdir}/libm3api.so.2.0.0
+ln -sf libm3api.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/libm3api.so.0
+ln -sf libm3api.so.2.0.0 $RPM_BUILD_ROOT%{_libdir}/libm3api.so.2
+ln -sf libm3api.so.2.0.0 $RPM_BUILD_ROOT%{_libdir}/libm3api.so
+install libs/gentl/%{abi}/libXIMEA_GenTL.cti.* $RPM_BUILD_ROOT%{_libdir}
+ln -sf libXIMEA_GenTL.cti.2 $RPM_BUILD_ROOT%{_libdir}/libXIMEA_GenTL.cti
 install examples/streamViewer/streamViewer $RPM_BUILD_ROOT%{_bindir}
-install examples/vaViewer/vaViewer $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -123,14 +115,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc package/README
-%attr(755,root,root) %{_libdir}/libXIMEA_GenTL.so
-%attr(755,root,root) %{_libdir}/libm3api.so
+%attr(755,root,root) %{_libdir}/libXIMEA_GenTL.cti.0
+%attr(755,root,root) %{_libdir}/libXIMEA_GenTL.cti.2
+%attr(755,root,root) %{_libdir}/libXIMEA_GenTL.cti
+%attr(755,root,root) %{_libdir}/libm3api.so.0.*.*
+%attr(755,root,root) %ghost %{_libdir}/libm3api.so.0
+%attr(755,root,root) %{_libdir}/libm3api.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libm3api.so.2
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libm3api.so
 %{_includedir}/ximea
 
 %files viewer
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/streamViewer
-%attr(755,root,root) %{_bindir}/vaViewer