Changes of Revision 8
| [+] | Deleted | vlc.changes |
| @@ -1,15 +0,0 @@ -------------------------------------------------------------------- -Sat Dec 15 17:31:15 UTC 2012 - cs@linux-administrator.com - -- update to vrsion 2.0.5 - -------------------------------------------------------------------- -Sun Feb 5 19:26:58 UTC 2012 - cs@linux-administrator.com - -- update to version 1.1.13 - -------------------------------------------------------------------- -Sun Dec 18 15:50:50 UTC 2011 - cs@linux-administrator.com - -- re-import - | ||
| [-] | Changed | vlc.spec ^ |
|
x 1 2 -# vim: set ts=4 sw=4 et:3 #4 -# spec file for vlc5 +# spec file for package vlc6 #7 +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.8 # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands9 #10 # All modifications and additions to the file contributed by third parties11 12 # license that conforms to the Open Source Definition (Version 1.9)13 # published by the Open Source Initiative.14 15 -# Please submit bugfixes or comments via email16 +# Please submit bugfixes or comments via http://bugs.opensuse.org/17 +#18 19 -%define pulseplugin 0%{suse_version} >= 114020 +%define BUILD_ORIG 121 +%define pulseplugin 0%{suse_version} > 113022 %define withxcb 0%{suse_version} > 113123 %define libvlc 524 %define libvlccore 525 %define conflicts vlc-beta26 27 +# Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse)28 +%define with_ncurses 029 +30 Summary: VLC - Video Lan Client31 -Name: vlc32 -Version: 2.0.533 -%define _version 2.0.534 -Release: 7.535 -URL: http://www.videolan.org/vlc/36 -Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz37 -Patch1: vlc-fix_font_path.patch38 -Patch2: vlc-buildcompare.patch39 -Patch3: 0001-no-return-in-non-void.patch40 -Patch4: vlc-autoconf-compat.patch41 License: GPL-2.0+42 Group: Productivity/Multimedia/Video/Players 43 +Name: vlc44 +Version: 2.0.645 +Release: 127.446 +%define _version 2.0.647 +Source: http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz48 +Patch1: fix_font_path.patch49 +Patch3: 0001-no-return-in-non-void.patch50 BuildRoot: %{_tmppath}/%{name}-%{version}-build51 BuildRequires: aalib-devel52 BuildRequires: alsa-devel53 BuildRequires: avahi-devel54 -BuildRequires: faad2-devel55 BuildRequires: fdupes56 BuildRequires: flac-devel57 +%if 0%{?suse_version} >= 120058 BuildRequires: fluidsynth-devel59 +%endif60 BuildRequires: freetype2-devel61 BuildRequires: fribidi-devel62 BuildRequires: gcc-c++63 64 BuildRequires: gnome-vfs2-devel65 BuildRequires: gnutls-devel66 BuildRequires: gtk2-devel67 -BuildRequires: liba52-devel68 BuildRequires: libass-devel69 BuildRequires: libavc1394-devel70 BuildRequires: libbluray-devel71 72 BuildRequires: libdc1394_control12-devel73 %endif74 BuildRequires: libdc1394-devel75 -BuildRequires: libdca-devel76 -BuildRequires: libdvbpsi-devel 77 -BuildRequires: libdvdnav-devel 78 -BuildRequires: libdvdread-devel 79 -BuildRequires: libfaac-devel 80 -BuildRequires: libffmpeg-devel 81 +BuildRequires: libdvbpsi-devel < 1.082 +BuildRequires: libdvdnav-devel83 +BuildRequires: libdvdread-devel84 BuildRequires: libgcrypt-devel85 BuildRequires: libjack-devel86 BuildRequires: libkate-devel87 -BuildRequires: libmad-devel 88 BuildRequires: libmatroska-devel89 BuildRequires: libmodplug-devel90 -BuildRequires: libmpeg2-devel 91 BuildRequires: libmtp-devel92 -BuildRequires: libnotify-devel 93 -BuildRequires: libogg-devel 94 +BuildRequires: libnotify-devel95 +BuildRequires: libogg-devel96 +BuildRequires: libopus-devel97 %if 0%{suse_version} >= 112098 -BuildRequires: libproxy-devel 99 +BuildRequires: libproxy-devel100 %endif101 BuildRequires: libqt4-devel102 BuildRequires: libraw1394-devel103 104 BuildRequires: libsamplerate-devel105 BuildRequires: libshout-devel106 BuildRequires: libsmbclient-devel107 -BuildRequires: libssh-devel108 BuildRequires: libtheora-devel109 BuildRequires: libtool110 -BuildRequires: libtwolame-devel111 %if 0%{suse_version} > 1100 112 BuildRequires: libudev-devel113 %endif114 115 %if 0%{?suse_version} > 1130116 BuildRequires: libva-devel117 %endif118 -BuildRequires: libvorbis-devel 119 -BuildRequires: libx264-devel120 -BuildRequires: libxml2-devel 121 -BuildRequires: libxvidcore-devel 122 +BuildRequires: libvorbis-devel123 +BuildRequires: libxml2-devel124 BuildRequires: lirc-devel125 BuildRequires: live555-devel126 %if 0%{?suse_version} >= 1220127 128 BuildRequires: lua-devel129 %endif130 BuildRequires: Mesa-devel131 +%if %{?with_ncurses}132 BuildRequires: ncurses-devel133 +%endif134 BuildRequires: pcre-devel135 BuildRequires: pulseaudio-devel136 -BuildRequires: schroedinger-devel 137 +BuildRequires: schroedinger-devel138 %if 0%{suse_version} < 1120139 BuildRequires: SDL-devel140 -BuildRequires: SDL_image-devel141 %else142 BuildRequires: libSDL-devel143 -BuildRequires: libSDL_image-devel144 %endif145 -BuildRequires: portaudio-devel146 -BuildRequires: libtar-devel147 BuildRequires: slang-devel148 BuildRequires: speex-devel149 -BuildRequires: libtag-devel150 -BuildRequires: vcdimager-devel 151 -BuildRequires: xosd-devel 152 -BuildRequires: zlib-devel153 +BuildRequires: taglib-devel154 +BuildRequires: vcdimager-devel155 +BuildRequires: xosd-devel156 BuildRequires: zvbi-devel157 -BuildRequires: pkgconfig(libprojectM)158 -BuildRequires: libmpcdec-devel159 -%if 0%{?suse_version} > 1130160 -BuildRequires: libgme-devel161 -%endif162 +# This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations163 +# and can favor one over the other.164 +BuildRequires: pkgconfig(libswscale)165 166 # BuildRequires that are not actively used for VLC, but for the build itself to work smoothly167 -BuildRequires: findutils 168 +BuildRequires: findutils169 BuildRequires: update-desktop-files170 BuildRequires: xz171 +# Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.172 +%if 0%{?BUILD_ORIG}173 +BuildRequires: faad2-devel174 +BuildRequires: liba52-devel175 +BuildRequires: libdca-devel176 +BuildRequires: libfaac-devel177 +BuildRequires: libffmpeg-devel178 +BuildRequires: libmad-devel179 +BuildRequires: libmpeg2-devel180 +BuildRequires: libtwolame-devel181 +BuildRequires: libx264-devel182 +BuildRequires: libxvidcore-devel183 +%endif184 185 Requires: %{name}-noX = %{version}-%{release}186 Requires: %{name}-qt = %{version}-%{release}187 188 %package -n libvlc%{libvlc}189 Summary: Shared library libvlc190 Group: System/Libraries191 -Requires: vlc-noX192 193 %description -n libvlc%{libvlc}194 Shared library libvlc. To be installed by system dependencies195 196 Shared library libvlc. To be installed by system dependencies197 198 %package noX199 -Summary: VLC: VideoLAN Client - without X dependencies200 +Summary: VLC: VideoLAN Client - without X dependencies201 |
||
| [+] | Added | fix_font_path.patch ^ |
| @@ -0,0 +1,13 @@ +diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c +index fcfe9a8..dfea2e7 100644 +--- a/modules/text_renderer/freetype.c ++++ b/modules/text_renderer/freetype.c +@@ -52,7 +52,7 @@ + # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf" + # define DEFAULT_FAMILY "Nokia Sans Bold" + #else +-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" ++# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf" + # define DEFAULT_FAMILY "Serif Bold" + #endif + | ||
| [+] | Deleted | vlc-autoconf-compat.patch ^ |
| @@ -1,110 +0,0 @@ ---- test/Makefile.am.orig 2012-04-04 20:36:27.936566467 +0200 -+++ test/Makefile.am 2012-04-04 20:36:33.391566272 +0200 -@@ -4,8 +4,8 @@ - - AUTOMAKE_OPTIONS = subdir-objects - --extra_check_verbose = $(extra_check_verbose_$(V)) --extra_check_verbose_ = $(extra_check_flags__$(AM_DEFAULT_VERBOSITY)) -+extra_check_verbose = -+extra_check_verbose_ = - extra_check_verbose_0 = @echo TEST $@ - extra_check_verbose__0 = $(extra_check_verbose_0) - ---- modules/gui/qt4/Modules.am.orig 2012-04-04 20:33:21.908573084 +0200 -+++ modules/gui/qt4/Modules.am 2012-04-04 20:34:09.460571393 +0200 -@@ -213,13 +213,13 @@ - - BUILT_SOURCES += $(nodist_SOURCES_qt4) - --moc_verbose = $(moc_verbose_$(V)) --moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY)) -+moc_verbose = -+moc_verbose_ = - moc_verbose_0 = @echo " MOC " $@; - moc_verbose__0 = $(moc_verbose_0) - --uic_verbose = $(uic_verbose_$(V)) --uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY)) -+uic_verbose = -+uic_verbose_ = - uic_verbose_0 = @echo " UIC " $@; - uic_verbose__0 = $(uic_verbose_0) - ---- Makefile.am.orig 2012-04-04 20:36:13.981566963 +0200 -+++ Makefile.am 2012-04-04 20:39:16.025560486 +0200 -@@ -77,11 +77,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - AUTOMAKE_OPTIONS = \ -- 1.11 \ -+ 1.10 \ - -Wall \ -- check-news \ -- dist-xz \ -- no-dist-gzip -+ check-news - # std-options - - ChangeLog: Makefile.am -@@ -469,8 +467,8 @@ - uninstall-hook: - rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat" - --silentstd = $(silentstd_$(V)) --silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY)) -+silentstd = -+silentstd_ = - silentstd_0 = 2>&1 >/dev/null - - ############################################################################### ---- configure.ac.orig 2012-04-04 19:03:21.841765198 +0200 -+++ configure.ac 2012-04-04 23:29:27.142197216 +0200 -@@ -24,12 +24,9 @@ - AC_CANONICAL_HOST - AC_PRESERVE_HELP_ORDER - --AM_INIT_AUTOMAKE(tar-ustar color-tests) -+AM_INIT_AUTOMAKE(tar-ustar) - AM_CONFIG_HEADER(config.h) - --# Disable with "./configure --disable-silent-rules" or "make V=1" --AM_SILENT_RULES([yes]) -- - dnl Too many people are not aware of maintainer mode: - dnl If you want to use it, you definitely know what you are doing, so - dnl you can specify "--disable-maintainer-mode". But if you want the default -@@ -4298,20 +4295,6 @@ - modules/arm_neon/Makefile - ]) - --AM_COND_IF([HAVE_WIN32], [ -- AC_CONFIG_FILES([ -- extras/package/win32/spad.nsi -- extras/package/win32/vlc.win32.nsi -- ]) --]) -- --AM_COND_IF([HAVE_DARWIN], [ -- AC_CONFIG_FILES([ -- extras/package/macosx/Info.plist -- extras/package/macosx/Resources/English.lproj/InfoPlist.strings -- ]) --]) -- - dnl Generate makefiles - AC_OUTPUT - ---- share/Makefile.am.orig 2012-04-04 20:35:58.986567496 +0200 -+++ share/Makefile.am 2012-04-04 20:36:05.170567277 +0200 -@@ -137,8 +137,8 @@ - # - # LUA - # --luac_verbose = $(luac_verbose_$(V)) --luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY)) -+luac_verbose = -+luac_verbose_ = - luac_verbose_0 = @echo " LUAC $@"; - - .lua.luac: | ||
| [+] | Deleted | vlc-buildcompare.patch ^ |
| @@ -1,24 +0,0 @@ ---- src/config/help.c.orig 2012-04-03 08:18:01.158216498 +0200 -+++ src/config/help.c 2012-04-03 08:18:29.629215484 +0200 -@@ -788,8 +788,8 @@ - ShowConsole(); - utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VERSION_MESSAGE, - psz_vlc_changeset ); -- utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"), -- VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ ); -+ utf8_fprintf( stdout, _("Compiled by %s on %s\n"), -+ VLC_CompileBy(), VLC_CompileHost()); - utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() ); - utf8_fprintf( stdout, "%s", LICENSE_MSG ); - PauseConsole(); ---- modules/gui/qt4/dialogs/help.cpp.orig 2012-04-03 08:18:36.056215256 +0200 -+++ modules/gui/qt4/dialogs/help.cpp 2012-04-03 08:18:49.710214770 +0200 -@@ -112,7 +112,7 @@ - "popular platform.\n\n" ) - + qtr( "This version of VLC was compiled by:\n " ) - + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) + -- + " ("__DATE__" "__TIME__").\n" -+ + ".\n" - + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n" - + qtr( "You are using the Qt4 Interface.\n\n" ) - + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS | ||
| [+] | Deleted | vlc-fix_font_path.patch ^ |
| @@ -1,11 +0,0 @@ ---- modules/text_renderer/freetype.c.orig 2012-04-03 08:15:12.514222497 +0200 -+++ modules/text_renderer/freetype.c 2012-04-03 08:15:30.604221853 +0200 -@@ -58,7 +58,7 @@ - # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf" - # define DEFAULT_FAMILY "Nokia Sans Bold" - #else --# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" -+# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf" - # define DEFAULT_FAMILY "Serif Bold" - #endif - | ||
| Changed | vlc-2.0.6.tar.xz ^ | |