[packages/guvcview] - updated to 2.0.5 - removed obsolete link,ffmpeg3 patch

qboosh qboosh at pld-linux.org
Wed Jun 28 16:04:39 CEST 2017 

commit 3f16502ad999990d5bb22d75465d879baf74c2b3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jun 28 16:06:04 2017 +0200

    - updated to 2.0.5
    - removed obsolete link,ffmpeg3 patch

 ffmpeg3.patch |  22 -----------
 guvcview.spec | 115 ++++++++++++++++++++++++++++++++++++++++++----------------
 link.patch    |  11 ------
 3 files changed, 84 insertions(+), 64 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 4fb8fcb..91a4a91 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,43 +1,82 @@
-Summary:	GTK+ base UVC Viewer
+# NOTE: possible switches:
+# - sfml rendering (BR: sfml-graphics >= 2.0) instead of SDL2
+# - Qt5 gui (BR: Qt5Widgets, qt5-build) instead of gtk+3
+# All can be compiled in, selectable at runtime.
+Summary:	GTK+ based UVC Viewer
+Summary(pl.UTF-8):	Przeglądarka UVC oparta na GTK+
 Name:		guvcview
-Version:	2.0.2
-Release:	2
+Version:	2.0.5
+Release:	1
 License:	GPL v3
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/guvcview/%{name}-src-%{version}.tar.gz
-# Source0-md5:	d88a1bcf80c0d989ffcb19d71bdd8c1e
+# Source0-md5:	f4d238ccd26e126ae6e8e6bd4a052bfc
 URL:		http://guvcview.sourceforge.net/
-Patch0:		link.patch
-Patch1:		ffmpeg3.patch
-BuildRequires:	SDL2-devel
-BuildRequires:	autoconf
+BuildRequires:	SDL2-devel >= 2.0
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	ffmpeg-devel
 BuildRequires:	glib2-devel >= 1:2.10.0
-BuildRequires:	gsl-devel
-BuildRequires:	gtk+3-devel
+BuildRequires:	gsl-devel >= 1.15
+BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	intltool >= 0.40
 BuildRequires:	libpng-devel
+BuildRequires:	libtool
+BuildRequires:	libusb-devel >= 1.0
 BuildRequires:	libv4l-devel
-BuildRequires:	portaudio-devel
-BuildRequires:	pulseaudio-devel
+BuildRequires:	pkgconfig
+BuildRequires:	portaudio-devel >= 19
+BuildRequires:	pulseaudio-devel >= 0.9.15
 BuildRequires:	udev-devel
+Requires:	glib2 >= 1:2.10.0
+Requires:	gsl >= 1.15
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 guvcview is a simple GTK+ interface for capturing and viewing video
 from devices supported by the Linux UVC driver.
 
+%description -l pl.UTF-8
+guvcview to prosty interfejs GTK+ do przechwytywania i oglądania
+obrazu z urządzeń obsługiwanych przez linuksowy sterownik UVC.
+
+%package devel
+Summary:	Header files for guvcview libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek guvcview
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	udev-devel
+
+%description devel
+Header files for guvcview libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek guvcview.
+
+%package static
+Summary:	Static guvcview libraries
+Summary(pl.UTF-8):	Statyczne biblioteki guvcview
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static guvcview libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki guvcview.
+
 %prep
 %setup -q -n %{name}-src-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
-%{__aclocal}
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	--disable-debian-menu
+	--disable-debian-menu \
+	--disable-silent-rules
 %{__make}
 
 %install
@@ -46,12 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/guvcview-2
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la,so}
-%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/*
-
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{bg,fo}
-%{__rm} $RPM_BUILD_ROOT%{_localedir}/bs/LC_MESSAGES/gview_v4l2core.mo
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgview*.la
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -67,16 +101,35 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README.md
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libgviewaudio-1.1.so.1.0.1
-%attr(755,root,root) %{_libdir}/libgviewencoder-1.1.so.1.0.1
-%attr(755,root,root) %{_libdir}/libgviewrender-1.1.so.1.0.1
-%attr(755,root,root) %{_libdir}/libgviewv4l2core-1.1.so.1.0.1
-%attr(755,root,root) %ghost %{_libdir}/libgviewaudio-1.1.so.1
-%attr(755,root,root) %ghost %{_libdir}/libgviewencoder-1.1.so.1
-%attr(755,root,root) %ghost %{_libdir}/libgviewrender-1.1.so.1
-%attr(755,root,root) %ghost %{_libdir}/libgviewv4l2core-1.1.so.1
+%attr(755,root,root) %{_bindir}/guvcview
+%attr(755,root,root) %{_libdir}/libgviewaudio-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewaudio-2.0.so.2
+%attr(755,root,root) %{_libdir}/libgviewencoder-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewencoder-2.0.so.2
+%attr(755,root,root) %{_libdir}/libgviewrender-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewrender-2.0.so.2
+%attr(755,root,root) %{_libdir}/libgviewv4l2core-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgviewv4l2core-2.0.so.2
 %{_datadir}/appdata/guvcview.appdata.xml
 %{_desktopdir}/guvcview.desktop
 %{_pixmapsdir}/guvcview
 %{_mandir}/man1/guvcview.1*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgviewaudio.so
+%attr(755,root,root) %{_libdir}/libgviewencoder.so
+%attr(755,root,root) %{_libdir}/libgviewrender.so
+%attr(755,root,root) %{_libdir}/libgviewv4l2core.so
+%{_includedir}/guvcview-2
+%{_pkgconfigdir}/libgviewaudio.pc
+%{_pkgconfigdir}/libgviewencoder.pc
+%{_pkgconfigdir}/libgviewrender.pc
+%{_pkgconfigdir}/libgviewv4l2core.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgviewaudio.a
+%{_libdir}/libgviewencoder.a
+%{_libdir}/libgviewrender.a
+%{_libdir}/libgviewv4l2core.a
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644
index 27d10c3..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- guvcview-src-2.0.2/gview_v4l2core/uvc_h264.c~	2015-07-27 23:26:48.000000000 +0900
-+++ guvcview-src-2.0.2/gview_v4l2core/uvc_h264.c	2016-03-31 20:35:23.109698271 +0900
-@@ -970,7 +970,7 @@
- 	}
- 	
- 	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
--	h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
-+	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
- 	h264_ctx->context->width = width;
- 	h264_ctx->context->height = height;
- 	//h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
---- guvcview-src-2.0.2/gview_v4l2core/jpeg_decoder.c~	2015-07-27 23:26:48.000000000 +0900
-+++ guvcview-src-2.0.2/gview_v4l2core/jpeg_decoder.c	2016-03-31 20:35:56.186940070 +0900
-@@ -1436,7 +1436,7 @@
- 		exit(-1);
- 	}
- 
--	codec_data->context->pix_fmt = PIX_FMT_YUV422P;
-+	codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
- 	codec_data->context->width = width;
- 	codec_data->context->height = height;
- 	//jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
diff --git a/link.patch b/link.patch
deleted file mode 100644
index c4e82c8..0000000
--- a/link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guvcview-src-2.0.2/configure.ac.orig	2016-01-19 21:11:21.880441118 +0100
-+++ guvcview-src-2.0.2/configure.ac	2016-01-19 21:12:44.860508243 +0100
-@@ -125,7 +125,7 @@ dnl ------------------------------------
- dnl check for libgviewv4l2core dependencies
- dnl --------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(GVIEWV4L2CORE, [libv4l2 libudev libusb-1.0 libavcodec libpng])
-+PKG_CHECK_MODULES(GVIEWV4L2CORE, [libv4l2 libudev libusb-1.0 libavutil libavcodec libpng])
- AC_SUBST(GVIEWV4L2CORE_CFLAGS)
- AC_SUBST(GVIEWV4L2CORE_LIBS)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guvcview.git/commitdiff/3f16502ad999990d5bb22d75465d879baf74c2b3

More information about the pld-cvs-commit mailing list