Projects
Multimedia
gmerlin
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 46
View file
gmerlin.changes
Changed
@@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Sat Feb 21 16:29:47 UTC 2015 - avvissu@yandex.ru + +- Fix build on openSUSE 13.2 (gmerlin-1.2.0-texinfo-5.0.patch) +- Fix build on openSUSE 11.4 (apply gmerlin-1.2.0-cdio.patch) +- Use %suse_update_desktop_file macro instead of + gmerlin-1.0.0-desktop_files.patch: +- Fix shlib-fixed-dependency: libgmerlin does not depend on %name + * remove Requires: %{name} = %{version} from libgmerlin +- Fix file-contains-date-and-time: add HTML_TIMESTAMP = NO +- Add %suse_update_desktop_file and %icon_theme_cache* +- Add packages for plugins and docs + +------------------------------------------------------------------- Fri Mar 28 21:40:10 UTC 2014 - seife+obs@b1-systems.com - do not apply cdio patch for <= 11.4
View file
gmerlin.spec
Changed
@@ -1,7 +1,7 @@ # # spec file for package gmerlin # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %define soname 0 - Name: gmerlin Version: 1.2.0 Release: 0 @@ -32,20 +31,24 @@ Patch1: gmerlin-1.0.0-desktop_files.patch Patch2: gmerlin-1.2.0-cdio.patch Patch3: gmerlin-1.2.0-underlinking.patch +# PATCH-FIX-UPSTREAM texinfo-5.0.patch avvissu@yandex.ru -- Fix build with texinfo >= 5.0 +Patch4: gmerlin-1.2.0-texinfo-5.0.patch BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libmusicbrainz-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: pkg-config BuildRequires: texinfo +BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gavl) >= 1.4.0 -BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gdk-2.0) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -67,22 +70,31 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xv) +Requires: %{name}-plugins = %{version} Requires(post): info Requires(postun): info %description -Multimedia architecture for Linux. +Multimedia architecture consisting of libraries and applications. + +%package plugins +Summary: Gmerlin plugins +Group: Productivity/Multimedia/Other +Requires: lib%{name}%{soname} = %{version} + +%description plugins +Plugins for gmerlin applications. %package -n libgmerlin%{soname} Summary: Base library for gmerlin applications Group: System/Libraries -Requires: %{name} = %{version} %description -n libgmerlin%{soname} -Base library for gmerlin applications. +This package contain the library needed to run a programs compiled +using libgmerlin. %package -n libgmerlin-devel -Summary: Header files for compiling gmerlin applications and plugins +Summary: Development files for gmerlin Group: Development/Libraries/C and C++ Requires: libgmerlin%{soname} = %{version} @@ -94,10 +106,11 @@ Group: System/Libraries %description -n libgmerlin_gtk%{soname} -Gtk support library for package gmerlin. +This package contain the library needed to run a programs compiled +using libgmerlin_gtk. %package -n libgmerlin_gtk-devel -Summary: Header files for compiling gmerlin gtk applications +Summary: Development files for gmerlin gtk Group: Development/Libraries/C and C++ Requires: libgmerlin_gtk%{soname} = %{version} @@ -109,49 +122,50 @@ Group: Productivity/Multimedia/Video/Players %description player -Multiformat media player +Multiformat media player for package gmerlin. %package recorder Summary: Multiformat recorder Group: Productivity/Multimedia/Video/Editors and Convertors %description recorder -Multiformat recorder +Is a small application, which records audio and video from hardware devices. %package alsamixer Summary: Alsa mixer Group: Productivity/Multimedia/Sound/Mixers %description alsamixer -Alsa mixer. +This lets you configure your soundcard even if it has more than 100 controls. +Multiple cards are supported as well. %package transcoder Summary: Audio/Video transcoder Group: Productivity/Multimedia/Video/Editors and Convertors %description transcoder -Audio/Video transcoder. +Lets you configure the options for each track. %package visualizer Summary: Visualization app Group: Productivity/Multimedia/Other %description visualizer -Visualization app. +This program runs visualization plugins with audio coming from the soundcard. %package utils Summary: Utilities for gmerlin Group: Productivity/Multimedia/Other %description utils -Utilities for gmerlin. +Utilities for package gmerlin. %package kbd Summary: Keyboard daemon for gmerlin Group: Productivity/Multimedia/Other %description kbd -Keyboard daemon for gmerlin. +Keyboard daemon for package gmerlin. %package jack Summary: Jack plugins for gmerlin @@ -160,15 +174,30 @@ %description jack Jack plugins for package gmerlin. +%package doc +Summary: Documentation for %{name} +Group: Documentation/HTML +BuildArch: noarch + +%description doc +This package contains documentation for gmerlin. + %lang_package + %prep %setup -q %patch0 -%patch1 -%if 0%{?suse_version} > 1200 +#%patch1 %patch2 -%endif %patch3 +%patch4 -p1 + +%if 0%{?suse_version} > 1320 +cp doc/gmerlin.info-3 gmerlin.info-3 +%endif + +#Do not compile in DATE and TIME +echo 'HTML_TIMESTAMP = NO' >> doc/Doxyfile.in %build %configure --with-cpuflags=none --docdir=%{_defaultdocdir}/%{name} @@ -176,8 +205,26 @@ %install %make_install -rm %{buildroot}%{_libdir}/gmerlin/plugins/*.la -rm %{buildroot}%{_libdir}/*.la + +%if 0%{?suse_version} > 1320 +install -D -m 644 gmerlin.info-3 %{buildroot}%{_infodir}/gmerlin.info-3 +install-info --info-dir='%{buildroot}%{_datadir}/info' '%{buildroot}%{_infodir}/%{name}.info' +%endif + +%suse_update_desktop_file -r %{name}-alsamixer AudioVideo Mixer +%suse_update_desktop_file -r %{name}-kbd AudioVideo AudioVideoEditing +%suse_update_desktop_file -r %{name}-player AudioVideo Player
View file
gmerlin-1.2.0-texinfo-5.0.patch
Added
@@ -0,0 +1,12 @@ +diff -U 3 -H -d -r -N -- gmerlin-1.2.0.orig/doc/gmerlin.texi gmerlin-1.2.0/doc/gmerlin.texi +--- gmerlin-1.2.0.orig/doc/gmerlin.texi 2012-06-08 14:50:30.000000000 +0300 ++++ gmerlin-1.2.0/doc/gmerlin.texi 2014-06-15 01:08:55.000000000 +0300 +@@ -461,7 +461,7 @@ + + A gml can be: + +-@table @bullet ++@table @strong + @item A regular filename + Optionally preceeded with ``file://''. This means, that @b{/files/music.mp3} is the same as + @b{file:///files/music.mp3}.
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.