rpms/vlc/F-18 sources,1.62,1.63
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9494/F-18
Modified Files:
sources
Log Message:
Update source
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources 30 Jul 2013 18:30:44 -0000 1.62
+++ sources 6 Nov 2013 23:20:32 -0000 1.63
@@ -1 +1 @@
-6445eb55aa087f30abe27423535e1ab8 vlc-2.0.8.tar.xz
+c96408fc0a6e6e7f85b37ab4d7d7c98f vlc-2.0.9.tar.xz
10 years, 5 months
rpms/vlc/F-19 0003-Fix-the-ca-cert-path-in-fedora.patch, NONE, 1.1 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch, 1.1, 1.2 vlc.spec, 1.179, 1.180 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, 1.2, NONE vlc-backport-audio_decoder.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8747/F-19
Modified Files:
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
vlc.spec
Added Files:
0003-Fix-the-ca-cert-path-in-fedora.patch
Removed Files:
0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
vlc-backport-audio_decoder.patch
Log Message:
Update to 2.0.9 and fixes
0003-Fix-the-ca-cert-path-in-fedora.patch:
gnutls.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE 0003-Fix-the-ca-cert-path-in-fedora.patch ---
>From 08c6d8f3cbc5b2bd845b5e6ed8a5d15978ca6186 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed, 6 Nov 2013 23:48:48 +0100
Subject: [PATCH 3/3] Fix the ca cert path in fedora
---
modules/misc/gnutls.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index b0129ad..9070e3d 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -580,8 +580,8 @@ static int OpenClient (vlc_tls_t *session, int fd, const char *hostname)
const char *confdir = config_GetConfDir ();
{
char path[strlen (confdir)
- + sizeof ("/ssl/certs/ca-certificates.crt")];
- sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
+ + sizeof ("/ssl/certs/ca-bundle.trust.crt")];
+ sprintf (path, "%s/ssl/certs/ca-bundle.trust.crt", confdir);
gnutls_Addx509File (VLC_OBJECT(session), sys->x509_cred, path, false);
}
#else /* WIN32 */
--
1.8.3.1
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch:
configure.ac | 13 +++++++------
modules/access/Modules.am | 5 ++---
2 files changed, 9 insertions(+), 9 deletions(-)
Index: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-19/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch 23 Feb 2013 16:25:55 -0000 1.1
+++ 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch 6 Nov 2013 22:57:32 -0000 1.2
@@ -1,43 +1,52 @@
-From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
+From 497c321ae1829bf92856b259aefad7f90d346086 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat, 23 Feb 2013 16:39:23 +0100
-Subject: [PATCH] Switch detection of smbclient from header to pkgconfig
+Subject: [PATCH 1/3] Switch detection of smbclient from header to pkgconfig v2
---
- configure.ac | 5 +++--
- modules/access/Modules.am | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ configure.ac | 13 +++++++------
+ modules/access/Modules.am | 4 ++--
+ 2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 65377ac..6c634f2 100644
+index 27d6476..6ecb819 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1874,9 +1874,10 @@ dnl
+@@ -1871,12 +1871,13 @@ dnl
AC_ARG_ENABLE(smb,
[AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
if test "${enable_smb}" != "no"; then
- AC_CHECK_HEADERS(libsmbclient.h,
-+ PKG_CHECK_MODULES(SMBCLIENT, smbclient,
- [ VLC_ADD_PLUGIN([access_smb])
+- [ VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
-+ VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS])
-+ VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])],
- [ if test -n "${enable_smb}"; then
- AC_MSG_ERROR([cannot find libsmbclient headers])
- fi ])
+- [ if test -n "${enable_smb}"; then
+- AC_MSG_ERROR([cannot find libsmbclient headers])
+- fi ])
++ PKG_CHECK_MODULES(SMBCLIENT, smbclient,
++ [ VLC_ADD_PLUGIN([access_smb]) ], [
++ AC_CHECK_HEADERS(libsmbclient.h, [
++ VLC_ADD_PLUGIN([access_smb])
++ VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
++ AC_MSG_ERROR([${SMBCLIENT_PKG_ERRORS} (required for smb plugin).])
++ ])
+ fi
+
+
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index ff6047e..c06c89b 100644
+index ff6047e..d1c0173 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
-@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
+@@ -35,8 +35,8 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
libsdp_plugin_la_DEPENDENCIES =
libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
-+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb)
- libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
+-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
++libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
++libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS) $(LIBS_access_smb)
if HAVE_WIN32
libaccess_smb_plugin_la_LIBADD += -lmpr
+ endif
--
-1.7.11.7
+1.8.3.1
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-19/vlc.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- vlc.spec 2 Aug 2013 10:14:50 -0000 1.179
+++ vlc.spec 6 Nov 2013 22:57:32 -0000 1.180
@@ -30,15 +30,15 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.8
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
Patch2: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
-Patch3: vlc-backport-audio_decoder.patch
+Patch3: 0003-Fix-the-ca-cert-path-in-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -232,7 +232,7 @@
}
%endif
%patch2 -p1 -b .samba4
-%patch3 -p1 -b .backport
+%patch3 -p1 -b .tls
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -458,6 +458,9 @@
%exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%exclude %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
}
+%{?_with_crystalhd:
+%exclude %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
}
@@ -514,6 +517,9 @@
%{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
}
+%{?_with_crystalhd:
+%{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
%files devel
%defattr(-,root,root,-)
@@ -526,6 +532,13 @@
%changelog
+* Wed Nov 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.9-1
+- Update to 2.0.9
+- Move crystalhd to extras - rhbz#2835
+ Patch from Sergio Durigan Junior <sergiodj(a)riseup.net>
+- Update smb pkgconfig detection
+- Fix ca cert path on fedora
+
* Fri Aug 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.8-2
- Backport patch from 2.0.8a
--- 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch DELETED ---
--- vlc-backport-audio_decoder.patch DELETED ---
10 years, 5 months
rpms/vlc/F-18 0003-Fix-the-ca-cert-path-in-fedora.patch, NONE, 1.1 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch, 1.1, 1.2 vlc.spec, 1.170, 1.171 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, 1.1, NONE vlc-backport-audio_decoder.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8747/F-18
Modified Files:
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
vlc.spec
Added Files:
0003-Fix-the-ca-cert-path-in-fedora.patch
Removed Files:
0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
vlc-backport-audio_decoder.patch
Log Message:
Update to 2.0.9 and fixes
0003-Fix-the-ca-cert-path-in-fedora.patch:
gnutls.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE 0003-Fix-the-ca-cert-path-in-fedora.patch ---
>From 08c6d8f3cbc5b2bd845b5e6ed8a5d15978ca6186 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed, 6 Nov 2013 23:48:48 +0100
Subject: [PATCH 3/3] Fix the ca cert path in fedora
---
modules/misc/gnutls.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index b0129ad..9070e3d 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -580,8 +580,8 @@ static int OpenClient (vlc_tls_t *session, int fd, const char *hostname)
const char *confdir = config_GetConfDir ();
{
char path[strlen (confdir)
- + sizeof ("/ssl/certs/ca-certificates.crt")];
- sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
+ + sizeof ("/ssl/certs/ca-bundle.trust.crt")];
+ sprintf (path, "%s/ssl/certs/ca-bundle.trust.crt", confdir);
gnutls_Addx509File (VLC_OBJECT(session), sys->x509_cred, path, false);
}
#else /* WIN32 */
--
1.8.3.1
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch:
configure.ac | 13 +++++++------
modules/access/Modules.am | 5 ++---
2 files changed, 9 insertions(+), 9 deletions(-)
Index: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch 23 Feb 2013 16:25:55 -0000 1.1
+++ 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch 6 Nov 2013 22:57:33 -0000 1.2
@@ -1,43 +1,52 @@
-From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
+From 497c321ae1829bf92856b259aefad7f90d346086 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat, 23 Feb 2013 16:39:23 +0100
-Subject: [PATCH] Switch detection of smbclient from header to pkgconfig
+Subject: [PATCH 1/3] Switch detection of smbclient from header to pkgconfig v2
---
- configure.ac | 5 +++--
- modules/access/Modules.am | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ configure.ac | 13 +++++++------
+ modules/access/Modules.am | 4 ++--
+ 2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 65377ac..6c634f2 100644
+index 27d6476..6ecb819 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1874,9 +1874,10 @@ dnl
+@@ -1871,12 +1871,13 @@ dnl
AC_ARG_ENABLE(smb,
[AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
if test "${enable_smb}" != "no"; then
- AC_CHECK_HEADERS(libsmbclient.h,
-+ PKG_CHECK_MODULES(SMBCLIENT, smbclient,
- [ VLC_ADD_PLUGIN([access_smb])
+- [ VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
-+ VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS])
-+ VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])],
- [ if test -n "${enable_smb}"; then
- AC_MSG_ERROR([cannot find libsmbclient headers])
- fi ])
+- [ if test -n "${enable_smb}"; then
+- AC_MSG_ERROR([cannot find libsmbclient headers])
+- fi ])
++ PKG_CHECK_MODULES(SMBCLIENT, smbclient,
++ [ VLC_ADD_PLUGIN([access_smb]) ], [
++ AC_CHECK_HEADERS(libsmbclient.h, [
++ VLC_ADD_PLUGIN([access_smb])
++ VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
++ AC_MSG_ERROR([${SMBCLIENT_PKG_ERRORS} (required for smb plugin).])
++ ])
+ fi
+
+
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index ff6047e..c06c89b 100644
+index ff6047e..d1c0173 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
-@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
+@@ -35,8 +35,8 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
libsdp_plugin_la_DEPENDENCIES =
libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
-+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb)
- libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
+-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
++libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
++libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS) $(LIBS_access_smb)
if HAVE_WIN32
libaccess_smb_plugin_la_LIBADD += -lmpr
+ endif
--
-1.7.11.7
+1.8.3.1
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/vlc.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- vlc.spec 2 Aug 2013 10:14:51 -0000 1.170
+++ vlc.spec 6 Nov 2013 22:57:33 -0000 1.171
@@ -30,15 +30,15 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.8
-Release: 2%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
Patch2: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
-Patch3: vlc-backport-audio_decoder.patch
+Patch3: 0003-Fix-the-ca-cert-path-in-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -232,7 +232,7 @@
}
%endif
%patch2 -p1 -b .samba4
-%patch3 -p1 -b .backport
+%patch3 -p1 -b .tls
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -458,6 +458,9 @@
%exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%exclude %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
}
+%{?_with_crystalhd:
+%exclude %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
}
@@ -514,6 +517,9 @@
%{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
}
+%{?_with_crystalhd:
+%{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
+}
%files devel
%defattr(-,root,root,-)
@@ -526,6 +532,13 @@
%changelog
+* Wed Nov 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.9-1
+- Update to 2.0.9
+- Move crystalhd to extras - rhbz#2835
+ Patch from Sergio Durigan Junior <sergiodj(a)riseup.net>
+- Update smb pkgconfig detection
+- Fix ca cert path on fedora
+
* Fri Aug 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.8-2
- Backport patch from 2.0.8a
--- 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch DELETED ---
--- vlc-backport-audio_decoder.patch DELETED ---
10 years, 5 months
rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.45,1.46
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5836
Modified Files:
VirtualBox-kmod.spec
Log Message:
Rebuilt
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- VirtualBox-kmod.spec 4 Nov 2013 23:18:32 -0000 1.45
+++ VirtualBox-kmod.spec 6 Nov 2013 21:24:36 -0000 1.46
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.2
-Release: 1%{?prerel:.%{prerel}}%{?dist}.2
+Release: 1%{?prerel:.%{prerel}}%{?dist}.3
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Wed Nov 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.2-1.3
+- Rebuilt for current
+
* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.2-1.2
- Rebuilt for kernel
10 years, 5 months
rpms/mythweb/F-18 mythweb-0.27-fixes.patch, NONE, 1.1 ChangeLog, 1.6, 1.7 mythweb.spec, 1.9, 1.10 sources, 1.5, 1.6 mythweb-0.26-fixes.patch, 1.3, NONE mythweb-notrans.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3263
Modified Files:
ChangeLog mythweb.spec sources
Added Files:
mythweb-0.27-fixes.patch
Removed Files:
mythweb-0.26-fixes.patch mythweb-notrans.patch
Log Message:
* Mon Oct 28 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1
- Update to 0.27 at latest fixes release.
- Make mythweb write to a more appropriate directory.
mythweb-0.27-fixes.patch:
Channel.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mythweb-0.27-fixes.patch ---
modules/tv/classes/Channel.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php
index ec8b368..ea9e6b7 100644
--- a/modules/tv/classes/Channel.php
+++ b/modules/tv/classes/Channel.php
@@ -121,7 +121,7 @@ class Channel extends MythBase {
// Otherwise, grab it from the backend
else {
// Make the request and store the result
- $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanID' => $this->chanid));
+ $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanId' => $this->chanid));
if ($data)
file_put_contents($this->icon, $data);
unset($data);
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 4 Sep 2013 21:07:40 -0000 1.6
+++ ChangeLog 6 Nov 2013 16:44:18 -0000 1.7
@@ -1,21 +1,5 @@
-commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff
-Author: Scott Shawcroft <scott.shawcroft(a)gmail.com>
-Date: Tue Aug 27 22:34:55 2013 -0400
+commit 6d10afe73e1fb5f21688d4b6d6919cab618e6e88
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Thu Oct 17 21:37:02 2013 +0100
- Fix the problem of MythWeb failing to load translations
-
- Refs #11513
-
- Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
-
-commit 5d8ffe109286269ada87390a2b74e142ec36e364
-Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Mon Aug 26 22:39:35 2013 +0200
-
- fix merge in schedule templates added in f97529656
-
- if (!$this->$name) ends up as if(!0)...
-
- Fixes #11775
-
- (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560)
+ Fix channel icons in mythweb. There was a typo which meant the services API call failed.
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/mythweb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mythweb.spec 4 Sep 2013 21:07:40 -0000 1.9
+++ mythweb.spec 6 Nov 2013 16:44:18 -0000 1.10
@@ -1,24 +1,23 @@
-%global gitrev v0.26.1-2-g7326d7e
+%global ver_string v0.27-1-g6d10afe
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.26.1
-Release: 2%{?dist}
+Version: 0.27
+Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
-# https://github.com/MythTV/mythweb/tarball/v0.25
+# https://github.com/MythTV/mythweb/archive/v0.27.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: mythweb.conf
Source2: ChangeLog
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch0: mythweb-0.26-fixes.patch
-Patch1: mythweb-notrans.patch
+Patch0: mythweb-0.27-fixes.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -40,9 +39,8 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -61,6 +59,14 @@
%install
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
cp -a * %{buildroot}%{_datadir}/mythweb/
+
+# data dir needs to be a directory suitable for writing
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/data %{buildroot}%{_sharedstatedir}/%{name}/
+pushd %{buildroot}%{_datadir}/%{name}
+ln -s ../../..%{_sharedstatedir}/%{name}/data
+
+# Install httpd config
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
@@ -68,14 +74,45 @@
rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
+%pretrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+ # If data exists and is a directory then we need move it out of the way.
+ if [ -d "%{_datadir}/%{name}/data" ] ; then
+ mv %{_datadir}/%{name}/data %{_datadir}/%{name}/_tmp_data
+ fi
+fi
+
+%posttrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+ # If there is data to migrate, let's do it
+ if [ -e "%{_datadir}/%{name}/_tmp_data" ] ; then
+ cp -p %{_datadir}/%{name}/_tmp_data/cache/* \
+ %{_sharedstatedir}/%{name}/data/cache/ &> /dev/null || :
+ cp -p %{_datadir}/%{name}/_tmp_data/tv_icons/* \
+ %{_sharedstatedir}/%{name}/data/tv_icons/ &> /dev/null || :
+ rm -rf %{_datadir}/%{name}/_tmp_data
+ fi
+fi
+
+
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%{_datadir}/%{name}/
%defattr(-,apache,apache,0755)
-%{_datadir}/mythweb/
+%{_sharedstatedir}/%{name}/
%changelog
+* Mon Oct 28 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1
+- Update to 0.27 at latest fixes release.
+- Make mythweb write to a more appropriate directory.
+
+* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-3
+- Rebuilt
+
* Mon Sep 2 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2
- Update to latest upstream release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 23 Aug 2013 18:30:11 -0000 1.5
+++ sources 6 Nov 2013 16:44:18 -0000 1.6
@@ -1 +1 @@
-f833230e664d8465c9c3333099395513 mythweb-0.26.1.tar.gz
+6582f7d589ceb563f97cbc85a5f54e90 mythweb-0.27.tar.gz
--- mythweb-0.26-fixes.patch DELETED ---
--- mythweb-notrans.patch DELETED ---
10 years, 5 months
rpms/mythweb/F-19 mythweb-0.27-fixes.patch, NONE, 1.1 ChangeLog, 1.6, 1.7 mythweb.spec, 1.9, 1.10 sources, 1.5, 1.6 mythweb-0.26-fixes.patch, 1.3, NONE mythweb-notrans.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3091
Modified Files:
ChangeLog mythweb.spec sources
Added Files:
mythweb-0.27-fixes.patch
Removed Files:
mythweb-0.26-fixes.patch mythweb-notrans.patch
Log Message:
* Mon Oct 28 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1
- Update to 0.27 at latest fixes release.
- Make mythweb write to a more appropriate directory.
mythweb-0.27-fixes.patch:
Channel.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mythweb-0.27-fixes.patch ---
modules/tv/classes/Channel.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php
index ec8b368..ea9e6b7 100644
--- a/modules/tv/classes/Channel.php
+++ b/modules/tv/classes/Channel.php
@@ -121,7 +121,7 @@ class Channel extends MythBase {
// Otherwise, grab it from the backend
else {
// Make the request and store the result
- $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanID' => $this->chanid));
+ $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanId' => $this->chanid));
if ($data)
file_put_contents($this->icon, $data);
unset($data);
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-19/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 4 Sep 2013 21:06:59 -0000 1.6
+++ ChangeLog 6 Nov 2013 16:43:10 -0000 1.7
@@ -1,21 +1,5 @@
-commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff
-Author: Scott Shawcroft <scott.shawcroft(a)gmail.com>
-Date: Tue Aug 27 22:34:55 2013 -0400
+commit 6d10afe73e1fb5f21688d4b6d6919cab618e6e88
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Thu Oct 17 21:37:02 2013 +0100
- Fix the problem of MythWeb failing to load translations
-
- Refs #11513
-
- Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
-
-commit 5d8ffe109286269ada87390a2b74e142ec36e364
-Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Mon Aug 26 22:39:35 2013 +0200
-
- fix merge in schedule templates added in f97529656
-
- if (!$this->$name) ends up as if(!0)...
-
- Fixes #11775
-
- (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560)
+ Fix channel icons in mythweb. There was a typo which meant the services API call failed.
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-19/mythweb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mythweb.spec 4 Sep 2013 21:06:59 -0000 1.9
+++ mythweb.spec 6 Nov 2013 16:43:11 -0000 1.10
@@ -1,24 +1,23 @@
-%global gitrev v0.26.1-2-g7326d7e
+%global ver_string v0.27-1-g6d10afe
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.26.1
-Release: 2%{?dist}
+Version: 0.27
+Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
-# https://github.com/MythTV/mythweb/tarball/v0.25
+# https://github.com/MythTV/mythweb/archive/v0.27.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: mythweb.conf
Source2: ChangeLog
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch0: mythweb-0.26-fixes.patch
-Patch1: mythweb-notrans.patch
+Patch0: mythweb-0.27-fixes.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -40,9 +39,8 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -61,6 +59,14 @@
%install
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
cp -a * %{buildroot}%{_datadir}/mythweb/
+
+# data dir needs to be a directory suitable for writing
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/data %{buildroot}%{_sharedstatedir}/%{name}/
+pushd %{buildroot}%{_datadir}/%{name}
+ln -s ../../..%{_sharedstatedir}/%{name}/data
+
+# Install httpd config
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
@@ -68,14 +74,45 @@
rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
+%pretrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+ # If data exists and is a directory then we need move it out of the way.
+ if [ -d "%{_datadir}/%{name}/data" ] ; then
+ mv %{_datadir}/%{name}/data %{_datadir}/%{name}/_tmp_data
+ fi
+fi
+
+%posttrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+ # If there is data to migrate, let's do it
+ if [ -e "%{_datadir}/%{name}/_tmp_data" ] ; then
+ cp -p %{_datadir}/%{name}/_tmp_data/cache/* \
+ %{_sharedstatedir}/%{name}/data/cache/ &> /dev/null || :
+ cp -p %{_datadir}/%{name}/_tmp_data/tv_icons/* \
+ %{_sharedstatedir}/%{name}/data/tv_icons/ &> /dev/null || :
+ rm -rf %{_datadir}/%{name}/_tmp_data
+ fi
+fi
+
+
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%{_datadir}/%{name}/
%defattr(-,apache,apache,0755)
-%{_datadir}/mythweb/
+%{_sharedstatedir}/%{name}/
%changelog
+* Mon Oct 28 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1
+- Update to 0.27 at latest fixes release.
+- Make mythweb write to a more appropriate directory.
+
+* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-3
+- Rebuilt
+
* Mon Sep 2 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2
- Update to latest upstream release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-19/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 23 Aug 2013 18:29:28 -0000 1.5
+++ sources 6 Nov 2013 16:43:11 -0000 1.6
@@ -1 +1 @@
-f833230e664d8465c9c3333099395513 mythweb-0.26.1.tar.gz
+6582f7d589ceb563f97cbc85a5f54e90 mythweb-0.27.tar.gz
--- mythweb-0.26-fixes.patch DELETED ---
--- mythweb-notrans.patch DELETED ---
10 years, 5 months
rpms/mythweb/devel mythweb-0.27-fixes.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ChangeLog, 1.6, 1.7 mythweb.spec, 1.10, 1.11 sources, 1.5, 1.6 mythweb-0.26-fixes.patch, 1.3, NONE mythweb-notrans.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2429
Modified Files:
.cvsignore ChangeLog mythweb.spec sources
Added Files:
mythweb-0.27-fixes.patch
Removed Files:
mythweb-0.26-fixes.patch mythweb-notrans.patch
Log Message:
* Mon Oct 28 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1
- Update to 0.27 at latest fixes release.
- Make mythweb write to a more appropriate directory.
mythweb-0.27-fixes.patch:
Channel.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mythweb-0.27-fixes.patch ---
modules/tv/classes/Channel.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php
index ec8b368..ea9e6b7 100644
--- a/modules/tv/classes/Channel.php
+++ b/modules/tv/classes/Channel.php
@@ -121,7 +121,7 @@ class Channel extends MythBase {
// Otherwise, grab it from the backend
else {
// Make the request and store the result
- $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanID' => $this->chanid));
+ $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanId' => $this->chanid));
if ($data)
file_put_contents($this->icon, $data);
unset($data);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 23 Aug 2013 18:22:18 -0000 1.5
+++ .cvsignore 6 Nov 2013 16:27:06 -0000 1.6
@@ -1 +1 @@
-mythweb-0.26.1.tar.gz
+mythweb-0.27.tar.gz
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 2 Sep 2013 14:14:29 -0000 1.6
+++ ChangeLog 6 Nov 2013 16:27:06 -0000 1.7
@@ -1,21 +1,5 @@
-commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff
-Author: Scott Shawcroft <scott.shawcroft(a)gmail.com>
-Date: Tue Aug 27 22:34:55 2013 -0400
+commit 6d10afe73e1fb5f21688d4b6d6919cab618e6e88
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Thu Oct 17 21:37:02 2013 +0100
- Fix the problem of MythWeb failing to load translations
-
- Refs #11513
-
- Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
-
-commit 5d8ffe109286269ada87390a2b74e142ec36e364
-Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Mon Aug 26 22:39:35 2013 +0200
-
- fix merge in schedule templates added in f97529656
-
- if (!$this->$name) ends up as if(!0)...
-
- Fixes #11775
-
- (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560)
+ Fix channel icons in mythweb. There was a typo which meant the services API call failed.
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mythweb.spec 30 Sep 2013 08:41:06 -0000 1.10
+++ mythweb.spec 6 Nov 2013 16:27:07 -0000 1.11
@@ -1,24 +1,23 @@
-%global gitrev v0.26.1-2-g7326d7e
+%global ver_string v0.27-1-g6d10afe
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.26.1
-Release: 3%{?dist}
+Version: 0.27
+Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
-# https://github.com/MythTV/mythweb/tarball/v0.25
+# https://github.com/MythTV/mythweb/archive/v0.27.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: mythweb.conf
Source2: ChangeLog
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch0: mythweb-0.26-fixes.patch
-Patch1: mythweb-notrans.patch
+Patch0: mythweb-0.27-fixes.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -40,9 +39,8 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -61,6 +59,14 @@
%install
mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
cp -a * %{buildroot}%{_datadir}/mythweb/
+
+# data dir needs to be a directory suitable for writing
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/data %{buildroot}%{_sharedstatedir}/%{name}/
+pushd %{buildroot}%{_datadir}/%{name}
+ln -s ../../..%{_sharedstatedir}/%{name}/data
+
+# Install httpd config
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
@@ -68,14 +74,42 @@
rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
+%pretrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+ # If data exists and is a directory then we need move it out of the way.
+ if [ -d "%{_datadir}/%{name}/data" ] ; then
+ mv %{_datadir}/%{name}/data %{_datadir}/%{name}/_tmp_data
+ fi
+fi
+
+%posttrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+ # If there is data to migrate, let's do it
+ if [ -e "%{_datadir}/%{name}/_tmp_data" ] ; then
+ cp -p %{_datadir}/%{name}/_tmp_data/cache/* \
+ %{_sharedstatedir}/%{name}/data/cache/ &> /dev/null || :
+ cp -p %{_datadir}/%{name}/_tmp_data/tv_icons/* \
+ %{_sharedstatedir}/%{name}/data/tv_icons/ &> /dev/null || :
+ rm -rf %{_datadir}/%{name}/_tmp_data
+ fi
+fi
+
+
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%{_datadir}/%{name}/
%defattr(-,apache,apache,0755)
-%{_datadir}/mythweb/
+%{_sharedstatedir}/%{name}/
%changelog
+* Mon Oct 28 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.27-1
+- Update to 0.27 at latest fixes release.
+- Make mythweb write to a more appropriate directory.
+
* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-3
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 23 Aug 2013 18:22:18 -0000 1.5
+++ sources 6 Nov 2013 16:27:07 -0000 1.6
@@ -1 +1 @@
-f833230e664d8465c9c3333099395513 mythweb-0.26.1.tar.gz
+6582f7d589ceb563f97cbc85a5f54e90 mythweb-0.27.tar.gz
--- mythweb-0.26-fixes.patch DELETED ---
--- mythweb-notrans.patch DELETED ---
10 years, 5 months
rpms/mjpegtools/devel mjpegtools.spec,1.13,1.14
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/mjpegtools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32135
Modified Files:
mjpegtools.spec
Log Message:
* Wed Nov 06 2013 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-9
- Rebuilt for x264/FFmpeg
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mjpegtools.spec 30 Sep 2013 02:34:30 -0000 1.13
+++ mjpegtools.spec 6 Nov 2013 15:06:03 -0000 1.14
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 2.0.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
@@ -183,6 +183,9 @@
%changelog
+* Wed Nov 06 2013 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-9
+- Rebuilt for x264/FFmpeg
+
* Mon Sep 30 2013 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-8
- Rebuilt for x264/FFmpeg
10 years, 5 months
rpms/phonon-backend-vlc/devel phonon-backend-vlc-0.7.0-initial_preference.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 phonon-backend-vlc.spec, 1.21, 1.22 sources, 1.13, 1.14
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31777
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Added Files:
phonon-backend-vlc-0.7.0-initial_preference.patch
Log Message:
* Wed Nov 06 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.0-1
- 0.7.0, Qt5 support
phonon-backend-vlc-0.7.0-initial_preference.patch:
vlc.desktop.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE phonon-backend-vlc-0.7.0-initial_preference.patch ---
diff -up phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake.priority phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake
--- phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake.priority 2013-11-04 10:49:24.000000000 -0600
+++ phonon-backend-vlc-0.7.0/src/vlc.desktop.cmake 2013-11-06 08:46:15.129946199 -0600
@@ -7,7 +7,7 @@ X-KDE-PhononBackendInfo-InterfaceVersion
X-KDE-PhononBackendInfo-Version=@PHONON_VLC_VERSION@
X-KDE-PhononBackendInfo-Website=http://www.videolan.org/
Icon=vlc
-InitialPreference=20
+InitialPreference=10
Name=VLC
Name[bg]=VLC
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 13 Feb 2013 12:35:39 -0000 1.13
+++ .cvsignore 6 Nov 2013 14:53:10 -0000 1.14
@@ -1 +1 @@
-phonon-backend-vlc-0.6.2.tar.xz
+phonon-backend-vlc-0.7.0.tar.xz
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- phonon-backend-vlc.spec 2 Oct 2013 17:30:00 -0000 1.21
+++ phonon-backend-vlc.spec 6 Nov 2013 14:53:10 -0000 1.22
@@ -1,9 +1,9 @@
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.6.2
-Release: 2%{?dist}
-Group: Applications/Multimedia
+Version: 0.7.0
+Release: 1%{?dist}
+
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
@@ -11,69 +11,85 @@
# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-backend-vlc-%{version}-%{snap}.tar.xz
Source0: phonon-backend-vlc-%{version}-%{snap}.tar.xz
%else
-Source0: http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/phono...
+Source0: http://download.kde.org/stable/phonon/phonon-backend-vlc/%{version}/src/p...
%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## downstream patches
+# reset initial preference below (fedora's default) gstreamer
+Patch1: phonon-backend-vlc-0.7.0-initial_preference.patch
BuildRequires: automoc4 >= 0.9.86
-BuildRequires: cmake >= 2.6.0
+BuildRequires: cmake
BuildRequires: kde-filesystem
BuildRequires: pkgconfig(libvlc) >= 1.1.10
BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(phonon) >= 4.5.50
-BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui)
+BuildRequires: pkgconfig(phonon) >= 4.7
+BuildRequires: pkgconfig(phonon4qt5) >= 4.7
+BuildRequires: pkgconfig(QtGui)
+BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(xcb)
# Oh, the irony of being in the default buildroot @ rpmfusion
BuildRequires: phonon-backend-gstreamer
-%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.50)
+%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.7.0)
%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.10)
Provides: phonon-backend%{?_isa} = %{phonon_ver}
Requires: vlc-core%{?_isa} >= %{vlc_ver}
Requires: phonon%{?_isa} >= %{phonon_ver}
-%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%package -n phonon-qt5-backend-vlc
+Summary: Vlc phonon-qt5 backend
+Provides: phonon-qt5-backend%{?_isa} = %{phonon_version}
+%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
+%description -n phonon-qt5-backend-vlc
+%{summary}.
%description
%{summary}.
+
%prep
%setup -q -n phonon-backend-vlc-%{version}%{?pre:-%{pre}}
+%patch1 -p1 -b .initial_preference
-%build
+%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-
-%{cmake} \
- %{?_cmake_skip_rpath} \
- ..
+%{cmake} ..
+make %{?_smp_mflags}
popd
-make %{?_smp_mflags} -C %{_target_platform}
+mkdir -p %{_target_platform}-Qt5
+pushd %{_target_platform}-Qt5
+%{cmake} -DPHONON_BUILD_PHONON4QT5:BOOL=ON ..
+make %{?_smp_mflags}
+popd
%install
-rm -rf %{buildroot}
-
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-Qt5
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING.LIB
%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_vlc.so
%{_kde4_datadir}/kde4/services/phononbackends/vlc.desktop
+%files -n phonon-qt5-backend-vlc
+%doc AUTHORS COPYING.LIB
+%{_qt5_plugindir}/phonon4qt5_backend/phonon_vlc.so
+
%changelog
+* Wed Nov 06 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.0-1
+- 0.7.0, Qt5 support
+
* Wed Oct 02 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.6.2-2
- rebuild (vlc)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 13 Feb 2013 12:35:39 -0000 1.13
+++ sources 6 Nov 2013 14:53:10 -0000 1.14
@@ -1 +1 @@
-1ae8b15594714841d2bcf8c72813a176 phonon-backend-vlc-0.6.2.tar.xz
+1a172744eb0fd9cb0dbe0ea8b69e50f1 phonon-backend-vlc-0.7.0.tar.xz
10 years, 5 months
rpms/nvidia-304xx-kmod/F-18 nvidia-304xx-kmod.spec, 1.22, 1.23 nvidia_304.88_linux_3.11.patch, 1.1, 1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23374
Modified Files:
nvidia-304xx-kmod.spec nvidia_304.88_linux_3.11.patch
Log Message:
* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.88-4
- use nvidia fix for get_num_physpages
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18/nvidia-304xx-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-304xx-kmod.spec 4 Nov 2013 23:21:23 -0000 1.22
+++ nvidia-304xx-kmod.spec 6 Nov 2013 11:05:39 -0000 1.23
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-304xx-kmod
Version: 304.88
# Taken over by kmodtool
-Release: 3%{?dist}.4
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.88-4
+- use nvidia fix for get_num_physpages
+
* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-3.4
- Rebuilt for kernel
nvidia_304.88_linux_3.11.patch:
b/kernel/nv-i2c.c | 14 -
b/kernel/nv-procfs.c | 411 ++++++++++++++++++-------------------
b/kernel/patch-get_num_physpages.h | 10
kernel/Makefile.kbuild | 1
kernel/conftest.sh | 24 ++
kernel/nv-linux.h | 4
kernel/nv-vm.c | 5
7 files changed, 259 insertions(+), 210 deletions(-)
Index: nvidia_304.88_linux_3.11.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-18/nvidia_304.88_linux_3.11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia_304.88_linux_3.11.patch 10 Oct 2013 19:05:46 -0000 1.1
+++ nvidia_304.88_linux_3.11.patch 6 Nov 2013 11:05:39 -0000 1.2
@@ -651,13 +651,70 @@
+ remove_proc_subtree("nvidia", proc_nvidia);
#endif
}
+--- /dev/null
++++ b/kernel/patch-get_num_physpages.h
+@@ -0,0 +1,10 @@
++#define NV_PATCH_get_num_physpages_DESCRIPTION \
++"This patch adds support for kernels such as Linux 3.11, which use the "\
++"get_num_physpages() function instead of the num_physpages variable to "\
++"report the number of physical pages. In order to avoid compatibility "\
++"problems that would otherwise result from differences between what "\
++"the removed num_physpages variable reported versus what is reported "\
++"by get_num_physpages(), the driver will fall back to a different memory "\
++"allocation strategy on systems where num_phsypages is not available, when "\
++"the amount of system memory matches or exceeds the upper bound of a given "\
++"GPU's physical address space.\n"
+
+--- a/kernel/Makefile.kbuild
++++ b/kernel/Makefile.kbuild
+@@ -175,6 +175,7 @@ COMPILE_TESTS = \
+ file_operations \
+ sg_init_table \
+ pci_get_domain_bus_and_slot \
++ get_num_physpages \
+ efi_enabled
+
+ #
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1504,6 +1504,30 @@ compile_test() {
+ fi
+ ;;
+
++ get_num_physpages)
++ #
++ # Determine if the get_num_physpages() function is
++ # present.
++ #
++ echo "$CONFTEST_PREAMBLE
++ #include <linux/mm.h>
++ void conftest_get_num_physpages(void) {
++ get_num_physpages(NULL);
++ }" > conftest$$.c
++
++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++ rm -f conftest$$.c
++
++ if [ -f conftest$$.o ]; then
++ echo "#undef NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ rm -f conftest$$.o
++ return
++ else
++ echo "#define NV_GET_NUM_PHYSPAGES_PRESENT" >> conftest.h
++ return
++ fi
++ ;;
++
+ esac
+ }
+
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
-@@ -1027,7 +1027,11 @@ static inline int nv_execute_on_all_cpus
+@@ -1027,7 +1027,11 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
#endif
#if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++#if defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
@@ -665,3 +722,20 @@
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
+
+--- a/kernel/nv-vm.c
++++ b/kernel/nv-vm.c
+@@ -479,8 +479,13 @@ static unsigned int nv_compute_gfp_mask(
+ system_memory_size = (os_get_system_memory_size() * RM_PAGE_SIZE);
+ if (system_memory_size != 0)
+ {
++#if !defined(NV_GET_NUM_PHYSPAGES_PRESENT)
+ if (dev->dma_mask < (system_memory_size - 1))
+ gfp_mask = NV_GFP_DMA32;
++#else
++ if (dev->dma_mask <= (system_memory_size - 1))
++ gfp_mask = NV_GFP_DMA32;
++#endif
+ }
+ else if (dev->dma_mask < 0xffffffffffULL)
+ {
10 years, 5 months