rpms/mpv/devel mpv.spec,1.1,1.2
by Miro Hrončok
Author: churchyard
Update of /cvs/free/rpms/mpv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18451/devel
Modified Files:
mpv.spec
Log Message:
Added BR ffmpeg-libs
Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/devel/mpv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpv.spec 1 Sep 2013 11:36:10 -0000 1.1
+++ mpv.spec 9 Sep 2013 11:52:51 -0000 1.2
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv3+
URL: http://%{name}.io/
@@ -13,6 +13,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-libs
BuildRequires: libass-devel
BuildRequires: libbluray-devel
BuildRequires: libdvdnav-devel
@@ -68,6 +69,9 @@
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%changelog
+* Mon Sep 09 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.2-3
+- Added BR ffmpeg-libs
+
* Tue Aug 27 2013 Miro Hrončok <mhroncok(a)redhat.com> - 0.1.2-2
- Reduced BRs a lot (removed support for various stuff)
- Make smbclient realized
11 years, 2 months
rpms/buildsys-build-rpmfusion/F-19 buildsys-build-rpmfusion.spec, 1.58, 1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17867
Modified Files:
buildsys-build-rpmfusion.spec
Log Message:
Bump
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-19/buildsys-build-rpmfusion.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- buildsys-build-rpmfusion.spec 31 Aug 2013 09:18:56 -0000 1.58
+++ buildsys-build-rpmfusion.spec 9 Sep 2013 11:47:02 -0000 1.59
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 19
-Release: 17
+Release: 18
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,7 +86,7 @@
%changelog
-* Fri Aug 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-17
+* Fri Aug 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-18
- rebuild for kernel 3.10.10-200.fc19
* Thu Aug 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:19-13
11 years, 2 months
rpms/libaacs/F-19 libaacs.spec,1.7,1.8
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6947/F-19
Modified Files:
libaacs.spec
Log Message:
Better rpath fix
Index: libaacs.spec
===================================================================
RCS file: /cvs/free/rpms/libaacs/F-19/libaacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libaacs.spec 23 Aug 2013 09:28:36 -0000 1.7
+++ libaacs.spec 8 Sep 2013 20:18:14 -0000 1.8
@@ -8,7 +8,7 @@
%if %{snapshot}
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
@@ -34,7 +34,6 @@
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
-BuildRequires: chrpath
%description
@@ -65,6 +64,8 @@
autoreconf -vif
%endif
%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -72,7 +73,6 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/aacs_info
%clean
@@ -99,6 +99,9 @@
%changelog
+* Sun Sep 08 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.6.0-3
+- Better rpath fix.
+
* Wed Aug 21 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.6.0-2
- Fix rpath issue with aacs_info.
11 years, 2 months
rpms/libaacs/devel libaacs.spec,1.7,1.8
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6947/devel
Modified Files:
libaacs.spec
Log Message:
Better rpath fix
Index: libaacs.spec
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/libaacs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libaacs.spec 23 Aug 2013 09:28:37 -0000 1.7
+++ libaacs.spec 8 Sep 2013 20:18:12 -0000 1.8
@@ -8,7 +8,7 @@
%if %{snapshot}
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
@@ -34,7 +34,6 @@
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
-BuildRequires: chrpath
%description
@@ -65,6 +64,8 @@
autoreconf -vif
%endif
%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -72,7 +73,6 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/aacs_info
%clean
@@ -99,6 +99,9 @@
%changelog
+* Sun Sep 08 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.6.0-3
+- Better rpath fix.
+
* Wed Aug 21 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.6.0-2
- Fix rpath issue with aacs_info.
11 years, 2 months
rpms/libaacs/F-18 libaacs.spec,1.6,1.7
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6947/F-18
Modified Files:
libaacs.spec
Log Message:
Better rpath fix
Index: libaacs.spec
===================================================================
RCS file: /cvs/free/rpms/libaacs/F-18/libaacs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libaacs.spec 23 Aug 2013 12:26:30 -0000 1.6
+++ libaacs.spec 8 Sep 2013 20:18:15 -0000 1.7
@@ -8,7 +8,7 @@
%if %{snapshot}
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
@@ -34,7 +34,6 @@
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
-BuildRequires: chrpath
%description
@@ -65,6 +64,8 @@
autoreconf -vif
%endif
%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
@@ -72,7 +73,6 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/aacs_info
%clean
@@ -99,6 +99,9 @@
%changelog
+* Sun Sep 08 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.6.0-3
+- Better rpath fix.
+
* Wed Aug 21 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.6.0-2
- Fix rpath issue with aacs_info.
11 years, 2 months
rpms/mythweb/F-18 ChangeLog, 1.5, 1.6 mythweb-0.26-fixes.patch, 1.2, 1.3 mythweb.spec, 1.8, 1.9 mythweb-phperror.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-serv27050
Modified Files:
ChangeLog mythweb-0.26-fixes.patch mythweb.spec
Removed Files:
mythweb-phperror.patch
Log Message:
* Mon Sep 2 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2
- Update to latest upstream release.
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 23 Aug 2013 18:30:10 -0000 1.5
+++ ChangeLog 4 Sep 2013 21:07:40 -0000 1.6
@@ -0,0 +1,21 @@
+commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff
+Author: Scott Shawcroft <scott.shawcroft(a)gmail.com>
+Date: Tue Aug 27 22:34:55 2013 -0400
+
+ 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)
mythweb-0.26-fixes.patch:
includes/errors.php | 6 +++---
modules/tv/classes/Schedule.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Index: mythweb-0.26-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/mythweb-0.26-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythweb-0.26-fixes.patch 13 Aug 2013 16:13:38 -0000 1.2
+++ mythweb-0.26-fixes.patch 4 Sep 2013 21:07:40 -0000 1.3
@@ -1,468 +1,41 @@
- classes/Video.php | 14 ++++----
- modules/stream/stream_raw.pl | 4 +++
- modules/tv/classes/Schedule.php | 41 +++++++++++++++++++++
- modules/tv/detail.php | 37 ++-----------------
- modules/tv/schedules_custom.php | 39 ++------------------
- modules/tv/schedules_manual.php | 35 ++----------------
- modules/tv/tmpl/default/detail.php | 2 +-
- modules/tv/tmpl/default/recorded.php | 2 +-
- modules/tv/tmpl/lite/detail.php | 2 +-
- modules/video/handler.php | 26 +++++++++-----
- modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
- modules/video/tmpl/default/video.php | 2 +-
- mythweb.php | 2 +-
- 13 files changed, 152 insertions(+), 123 deletions(-)
+ includes/errors.php | 6 +++---
+ modules/tv/classes/Schedule.php | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/classes/Video.php b/classes/Video.php
-index 7995aa4..5c6f7e4 100644
---- a/classes/Video.php
-+++ b/classes/Video.php
-@@ -90,12 +90,14 @@ class Video {
- $this->childid = $video['childid'];
- // Figure out the URL
- $this->url = '#';
-- if (file_exists('data/video/'))
-- $this->url = implode('/', array_map('rawurlencode',
-- array_map('utf8tolocal',
-- explode('/',
-- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
-- ))));
-+ //// all junk, replacing
-+// if (file_exists('data/video/'))
-+// $this->url = implode('/', array_map('rawurlencode',
-+// array_map('utf8tolocal',
-+// explode('/',
-+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
-+// ))));
-+ $this->url = 'video/stream?Id=' . $this->intid;
- $genre = $db->query('SELECT idgenre
- FROM videometadatagenre
- WHERE idvideo = ?',
-diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
-index 31f6854..6981bca 100755
---- a/modules/stream/stream_raw.pl
-+++ b/modules/stream/stream_raw.pl
-@@ -30,6 +30,10 @@
- $type = 'video/nuppelvideo';
- $suffix = '.nuv';
- }
-+ elsif ($basename =~ /\.mkv$/) {
-+ $type = 'video/x-matroska';
-+ $suffix = '.mkv';
-+ }
- else {
- print header(),
- "Unknown video type requested: $basename\n";
+diff --git a/includes/errors.php b/includes/errors.php
+index 0434b7a..c24e71a 100644
+--- a/includes/errors.php
++++ b/includes/errors.php
+@@ -103,6 +103,9 @@
+ /**/
+ function error_handler($errno, $errstr, $errfile, $errline, $vars) {
+ global $db;
++ // Leave early if we haven't requested reports from this kind of error
++ if (!($errno & error_reporting()))
++ return;
+ if (class_exists('Translate'))
+ $errstr = Translate::find()->string($errstr);
+ // Try to auto-repair damaged SQL tables
+@@ -113,9 +116,6 @@
+ add_error('Regular Expression Error: '.$match[1]);
+ return;
+ }
+- // Leave early if we haven't requested reports from this kind of error
+- if (!($errno & error_reporting()))
+- return;
+ // Fatal errors should report considerably more detail
+ if (in_array($errno, array(E_USER_ERROR, E_ERROR))) {
+ // What type of error?
diff --git a/modules/tv/classes/Schedule.php b/modules/tv/classes/Schedule.php
-index 3d9400f..0ad566d 100644
+index 0ad566d..6a9b8bc 100644
--- a/modules/tv/classes/Schedule.php
+++ b/modules/tv/classes/Schedule.php
-@@ -240,6 +240,47 @@ class Schedule extends MythBase {
- }
-
- /**
-+ * Alternative constructor for returning recording templates
-+ **/
-+ static function recording_template($name) {
-+ global $db;
-+ $sched = new Schedule(NULL);
-+ $data = $db->query_assoc('
-+ SELECT *
-+ FROM record
-+ WHERE type = ?
-+ AND title = ?',
-+ rectype_template,
-+ $name.' (Template)'
-+ );
-+
-+ $template_params = array(
-+ 'recpriority', 'prefinput', 'startoffset', 'endoffset',
-+ 'dupmethod', 'dupin', 'filter', 'inactive',
-+ 'profile', 'recgroup', 'storagegroup', 'playgroup', 'autoexpire',
-+ 'maxepisodes', 'maxnewest',
-+ 'autocommflag', 'autotranscode', 'transcoder',
-+ 'autouserjob1', 'autouserjob2', 'autouserjob3', 'autouserjob4',
-+ 'autometadata');
-+ foreach ($template_params as $param)
-+ if (isset($data[$param]))
-+ $sched->$param = $data[$param];
-+
-+ return $sched;
-+ }
-+
-+/**
-+ * Merge values from another schedule
-+ **/
-+ public function merge($prog) {
-+ foreach (get_object_vars($prog) as $name => $value) {
-+ if ($value && !$this->$name) {
-+ $this->$name = $value;
-+ }
-+ }
-+ }
-+
-+/**
- * Save this schedule
- /**/
- public function save($new_type) {
-diff --git a/modules/tv/detail.php b/modules/tv/detail.php
-index 27637c2..48bdb53 100644
---- a/modules/tv/detail.php
-+++ b/modules/tv/detail.php
-@@ -269,42 +269,9 @@
- // Redirect back to the page again, but without the query string, so reloads are cleaner
- redirect_browser(root_url.'tv/detail/'.$program->chanid.'/'.$program->starttime);
- }
--// Load default settings for recpriority, autoexpire etc
- else {
-- // auto-metadata-lookup
-- if (!isset($schedule->autometadata))
-- $schedule->autometadata = setting('AutoMetadataLookup');
-- // auto-commercial-flag
-- if (!isset($schedule->autocommflag))
-- $schedule->autocommflag = setting('AutoCommercialFlag');
-- // auto-user-jobs
-- if (!isset($schedule->autouserjob1))
-- $schedule->autouserjob1 = setting('AutoRunUserJob1');
-- if (!isset($schedule->autouserjob2))
-- $schedule->autouserjob2 = setting('AutoRunUserJob2');
-- if (!isset($schedule->autouserjob3))
-- $schedule->autouserjob3 = setting('AutoRunUserJob3');
-- if (!isset($schedule->autouserjob4))
-- $schedule->autouserjob4 = setting('AutoRunUserJob4');
-- // auto-transcode
-- if (!isset($schedule->autotranscode))
-- $schedule->autotranscode = setting('AutoTranscode');
-- // transcoder
-- if (!isset($schedule->transcoder))
-- $schedule->transcoder = setting('DefaultTranscoder');
-- // recpriority
-- if (!isset($schedule->recpriority)) {
-- $schedule->recpriority = $db->query_col('SELECT recpriority from channel where chanid=?',
-- $program->chanid);
-- }
-- // autoexpire
-- if (!isset($schedule->autoexpire))
-- $schedule->autoexpire = setting('AutoExpireDefault');
-- // start early / end late
-- if (!isset($schedule->startoffset))
-- $schedule->startoffset = setting('DefaultStartOffset');
-- if (!isset($schedule->endoffset))
-- $schedule->endoffset = setting('DefaultEndOffset');
-+ // Load default values from Default recording rule template
-+ $schedule->merge(Schedule::recording_template('Default'));
- }
-
- // Load the channel
-diff --git a/modules/tv/schedules_custom.php b/modules/tv/schedules_custom.php
-index 623db4b..035c46b 100644
---- a/modules/tv/schedules_custom.php
-+++ b/modules/tv/schedules_custom.php
-@@ -147,46 +147,11 @@
- }
- }
- }
--// Load default settings for recpriority, autoexpire etc
-+// Set some defaults
- else {
- // Make sure we have a default rectype
- if (!$schedule->type)
- $schedule->type = rectype_always;
-- // auto-metadata-lookup
-- if (!isset($schedule->autometadata))
-- $schedule->autometadata = setting('AutoMetadataLookup');
-- // auto-commercial-flag
-- if (!isset($schedule->autocommflag))
-- $schedule->autocommflag = setting('AutoCommercialFlag');
-- // auto-user-jobs
-- if (!isset($schedule->autouserjob1))
-- $schedule->autouserjob1 = setting('AutoRunUserJob1');
-- if (!isset($schedule->autouserjob2))
-- $schedule->autouserjob2 = setting('AutoRunUserJob2');
-- if (!isset($schedule->autouserjob3))
-- $schedule->autouserjob3 = setting('AutoRunUserJob3');
-- if (!isset($schedule->autouserjob4))
-- $schedule->autouserjob4 = setting('AutoRunUserJob4');
-- // auto-transcode
-- if (!isset($schedule->autotranscode))
-- $schedule->autotranscode = setting('AutoTranscode');
-- // transcoder
-- if (!isset($schedule->transcoder))
-- $schedule->transcoder = setting('DefaultTranscoder');
-- // recpriority
-- if (!isset($schedule->recpriority)) {
-- $result = mysql_query('SELECT recpriority from channel where chanid='.escape($program->chanid));
-- list($schedule->recpriority) = mysql_fetch_row($result);
-- mysql_free_result($result);
-- }
-- // autoexpire
-- if (!isset($schedule->autoexpire))
-- $schedule->autoexpire = setting('AutoExpireDefault');
-- // start early / end late
-- if (!isset($schedule->startoffset))
-- $schedule->startoffset = setting('DefaultStartOffset');
-- if (!isset($schedule->endoffset))
-- $schedule->endoffset = setting('DefaultEndOffset');
- // Get the searchtype string
- switch ($schedule->search) {
- case searchtype_power: $schedule->search_type = t('Power'); break;
-@@ -195,6 +160,8 @@
- case searchtype_title:
- default: $schedule->search_type = t('Title'); break;
- }
-+ // Load default values from Default recording rule template
-+ $schedule->merge(Schedule::recording_template('Default'));
- }
-
- // Create an edit-friendly title
-diff --git a/modules/tv/schedules_manual.php b/modules/tv/schedules_manual.php
-index 626ec39..6a2937a 100644
---- a/modules/tv/schedules_manual.php
-+++ b/modules/tv/schedules_manual.php
-@@ -120,39 +120,8 @@
- // Date/time/etc
- if (!$schedule->starttime)
- $schedule->starttime = time();
-- // auto-metadata-lookup
-- if (!isset($schedule->autometadata))
-- $schedule->autometadata = setting('AutoMetadataLookup');
-- // auto-commercial-flag
-- if (!isset($schedule->autocommflag))
-- $schedule->autocommflag = setting('AutoCommercialFlag');
-- // auto-user-jobs
-- if (!isset($schedule->autouserjob1))
-- $schedule->autouserjob1 = setting('AutoRunUserJob1');
-- if (!isset($schedule->autouserjob2))
-- $schedule->autouserjob2 = setting('AutoRunUserJob2');
-- if (!isset($schedule->autouserjob3))
-- $schedule->autouserjob3 = setting('AutoRunUserJob3');
-- if (!isset($schedule->autouserjob4))
-- $schedule->autouserjob4 = setting('AutoRunUserJob4');
-- // auto-transcode
-- if (!isset($schedule->autotranscode))
-- $schedule->autotranscode = setting('AutoTranscode');
-- // transcoder
-- if (!isset($schedule->transcoder))
-- $schedule->transcoder = setting('DefaultTranscoder');
-- // recpriority
-- if (!isset($schedule->recpriority)) {
-- $result = mysql_query('SELECT recpriority from channel where chanid='.escape($program->chanid));
-- list($schedule->recpriority) = mysql_fetch_row($result);
-- mysql_free_result($result);
-- }
-- // autoexpire
-- if (!isset($schedule->autoexpire)) {
-- $result = mysql_query("SELECT data from settings where value='AutoExpireDefault'");
-- list($schedule->autoexpire) = mysql_fetch_row($result);
-- mysql_free_result($result);
-- }
-+ // Load default values from Default recording rule template
-+ $schedule->merge(Schedule::recording_template('Default'));
- }
-
- // Calculate the length
-diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php
-index cdd8093..8e9bfc5 100644
---- a/modules/tv/tmpl/default/detail.php
-+++ b/modules/tv/tmpl/default/detail.php
-@@ -488,7 +488,7 @@
- <th><?php echo t('More') ?>:</th>
- <td>
- <?php if ($schedule->title) { ?>
-- <a href="http://www.themoviedb.org/search?search=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'themoviedb') ?></a>
-+ <a href="http://www.themoviedb.org/search?query=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'themoviedb') ?></a>
- <a href="http://www.imdb.com/search/title?title=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'IMDB') ?></a>
- <a href="http://www.thetvdb.com/?string=<?php echo urlencode($schedule->title) ?>&searchseriesid=&tab=listseries&function=Search"><?php echo t('Search $1', 'TheTVDB') ?></a>
- <a href="http://www.tv.com/search.php?type=11&stype=all&qs=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'TV.com') ?></a>
-diff --git a/modules/tv/tmpl/default/recorded.php b/modules/tv/tmpl/default/recorded.php
-index 203d4da..d1febd9 100644
---- a/modules/tv/tmpl/default/recorded.php
-+++ b/modules/tv/tmpl/default/recorded.php
-@@ -297,7 +297,7 @@ EOM;
- ?>
- file = new Object();
- file.title = '<?php echo addslashes($show->title) ?>';
-- file.subtitle = '<?php echo addslashes($show->subtitle) ?>';
-+ file.subtitle = '<?php echo str_replace("\n", '', nl2br(addslashes($show->subtitle))) ?>';
- file.chanid = '<?php echo addslashes($show->chanid) ?>';
- file.starttime = '<?php echo addslashes($show->recstartts) ?>';
- file.recgroup = '<?php echo addslashes(str_replace('%2F', '/', rawurlencode($show->recgroup))) ?>';
-diff --git a/modules/tv/tmpl/lite/detail.php b/modules/tv/tmpl/lite/detail.php
-index dc124e4..2eba29d 100644
---- a/modules/tv/tmpl/lite/detail.php
-+++ b/modules/tv/tmpl/lite/detail.php
-@@ -65,7 +65,7 @@
- </div>
- <div id="external_searches">
- (<?php echo t('Search') ?>:
-- <a href="http://www.themoviedb.org/search?search=<?php echo urlencode($schedule->title) ?>"><?php echo t('themoviedb') ?></a>
-+ <a href="http://www.themoviedb.org/search?query=<?php echo urlencode($schedule->title) ?>"><?php echo t('themoviedb') ?></a>
- -
- <a href="http://www.imdb.com/search/title?title=<?php echo urlencode($schedule->title) ?>"><?php echo t('IMDB') ?></a>
- -
-diff --git a/modules/video/handler.php b/modules/video/handler.php
-index fd769ce..721f186 100644
---- a/modules/video/handler.php
-+++ b/modules/video/handler.php
-@@ -15,8 +15,10 @@
- * @global string $GLOBALS['mythvideo_dir']
- * @name $mythvideo_dir
- /**/
-- global $mythvideo_dir;
-- $mythvideo_dir = setting('VideoStartupDir', hostname);
-+
-+//// dont need this...
-+// global $mythvideo_dir;
-+// $mythvideo_dir = setting('VideoStartupDir', hostname);
-
- // Load the video storage directories
- $video_dirs = $db->query_list('
-@@ -37,6 +39,7 @@
- }
- }
-
-+/** nor any of this...
- // Make sure the video directory exists
- if (file_exists('data/video')) {
- // File is not a directory or a symlink
-@@ -93,7 +96,7 @@
- .' reload this page.');
- }
- // Create a symlink to the first artwork directory that we find.
-- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
-+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
- else {
- foreach ($artwork_dirs as $dir) {
- if (is_dir($dir) || is_link($dir)) {
-@@ -116,6 +119,7 @@
+@@ -274,7 +274,7 @@ class Schedule extends MythBase {
+ **/
+ public function merge($prog) {
+ foreach (get_object_vars($prog) as $name => $value) {
+- if ($value && !$this->$name) {
++ if (isset($value) && !isset($this->$name)) {
+ $this->$name = $value;
}
}
- }
-+*/
-
- define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
- define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
-@@ -125,11 +129,17 @@
- case 'edit':
- require_once 'modules/video/edit.php';
- exit;
-- case 'imdb':
-- require_once 'modules/video/imdb.php';
-- exit;
-- case 'scan':
-- require_once 'modules/video/scan.php';
-+//// this is probably doing bad things
-+// case 'imdb':
-+// require_once 'modules/video/imdb.php';
-+// exit;
-+//// this is broken, so disable it
-+// case 'scan':
-+// require_once 'modules/video/scan.php';
-+// exit;
-+//// new stuff
-+ case 'stream':
-+ require_once 'modules/video/stream.php';
- exit;
- }
-
-diff --git a/modules/video/stream.php b/modules/video/stream.php
-new file mode 100644
-index 0000000..49a7298
---- /dev/null
-+++ b/modules/video/stream.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Stream a music file
-+ *
-+ * @license GPL
-+ *
-+ * @package MythWeb
-+ * @subpackage Music
-+/**/
-+
-+// Yes, a db connection
-+ global $db;
-+
-+// Pull video ID
-+ $vid_id = $_GET['Id'];
-+
-+// Get filename
-+ list($fname) = $db->query_row('SELECT filename
-+ FROM videometadata
-+ WHERE intid = ?', $vid_id);
-+
-+// Mime type
-+ switch (substr($fname, strrpos($fname, '.'))) {
-+ case 'mpg':
-+ case 'mpeg':
-+ $mime = 'video/mpeg';
-+ break;
-+ case 'mp4':
-+ $mime = 'video/mp4';
-+ break;
-+ case 'ogg':
-+ case 'ogm':
-+ case 'ogv':
-+ $mime = 'video/ogg';
-+ break;
-+ case 'qt':
-+ $mime = 'video/quicktime';
-+ break;
-+ case 'webm':
-+ $mime = 'video/webm';
-+ break;
-+ case 'mkv':
-+ $mime = 'video/x-matroska';
-+ break;
-+ case 'wmv':
-+ $mime = 'video/x-ms-wmv';
-+ break;
-+ case 'flv':
-+ $mime = 'video/x-flv';
-+ break;
-+ default:
-+ $mime = 'applicatoin/octet-stream';
-+ }
-+ header('Content-Type: '.$mime);
-+
-+// Send the filename
-+ header('Content-Disposition: filename="'.$fname.'"');
-+
-+// Send data via the backend
-+ $Master_Host = setting('MasterServerIP');
-+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
-+ get_backend_setting('BackendStatusPort'));
-+ if (stripos($Master_Host,':') !== false) {
-+ $Master_Host = '['.$Master_Host.']';
-+ }
-+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
-+
-+// Nothing else to do
-+ exit;
-diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
-index e80176e..ad7e9a9 100644
---- a/modules/video/tmpl/default/video.php
-+++ b/modules/video/tmpl/default/video.php
-@@ -252,7 +252,7 @@
- <table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
- <tr class="menu">
- <td>
-- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
-+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
- <form action="<?php echo root_url; ?>video" method="GET">
- <?php echo t('Display'); ?>:
- <select name="category" id="category" onchange="filter();">
-diff --git a/mythweb.php b/mythweb.php
-index bba2aa8..79ff196 100644
---- a/mythweb.php
-+++ b/mythweb.php
-@@ -30,7 +30,7 @@
- if (Modules::getModule($Path[0])) {
- // Add the current module directory to our search path, so modules can
- // define includes, etc.
-- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
-+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
- // Load the module handler
- require_once 'handler.php';
- }
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/mythweb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mythweb.spec 23 Aug 2013 18:30:10 -0000 1.8
+++ mythweb.spec 4 Sep 2013 21:07:40 -0000 1.9
@@ -1,4 +1,4 @@
-%global gitrev v0.26.0-220-g92dbb43
+%global gitrev v0.26.1-2-g7326d7e
Name: mythweb
Summary: The web interface to MythTV
@@ -6,7 +6,7 @@
Group: Applications/Multimedia
Version: 0.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -19,7 +19,6 @@
# git diff -p --stat %{version} > mythweb-fixes.patch
Patch0: mythweb-0.26-fixes.patch
Patch1: mythweb-notrans.patch
-Patch2: mythweb-phperror.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.
@@ -42,9 +41,8 @@
%prep
%setup -q
-#patch0 -p1
+%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -78,6 +76,9 @@
%changelog
+* Mon Sep 2 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2
+- Update to latest upstream release.
+
* Fri Aug 23 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1
- Update to latest upstream version.
--- mythweb-phperror.patch DELETED ---
11 years, 2 months
rpms/mythweb/F-19 ChangeLog, 1.5, 1.6 mythweb-0.26-fixes.patch, 1.2, 1.3 mythweb.spec, 1.8, 1.9 mythweb-phperror.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-serv26909
Modified Files:
ChangeLog mythweb-0.26-fixes.patch mythweb.spec
Removed Files:
mythweb-phperror.patch
Log Message:
* Mon Sep 2 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2
- Update to latest upstream release.
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-19/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 23 Aug 2013 18:29:27 -0000 1.5
+++ ChangeLog 4 Sep 2013 21:06:59 -0000 1.6
@@ -0,0 +1,21 @@
+commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff
+Author: Scott Shawcroft <scott.shawcroft(a)gmail.com>
+Date: Tue Aug 27 22:34:55 2013 -0400
+
+ 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)
mythweb-0.26-fixes.patch:
includes/errors.php | 6 +++---
modules/tv/classes/Schedule.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Index: mythweb-0.26-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-19/mythweb-0.26-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythweb-0.26-fixes.patch 13 Aug 2013 16:06:29 -0000 1.2
+++ mythweb-0.26-fixes.patch 4 Sep 2013 21:06:59 -0000 1.3
@@ -1,468 +1,41 @@
- classes/Video.php | 14 ++++----
- modules/stream/stream_raw.pl | 4 +++
- modules/tv/classes/Schedule.php | 41 +++++++++++++++++++++
- modules/tv/detail.php | 37 ++-----------------
- modules/tv/schedules_custom.php | 39 ++------------------
- modules/tv/schedules_manual.php | 35 ++----------------
- modules/tv/tmpl/default/detail.php | 2 +-
- modules/tv/tmpl/default/recorded.php | 2 +-
- modules/tv/tmpl/lite/detail.php | 2 +-
- modules/video/handler.php | 26 +++++++++-----
- modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
- modules/video/tmpl/default/video.php | 2 +-
- mythweb.php | 2 +-
- 13 files changed, 152 insertions(+), 123 deletions(-)
+ includes/errors.php | 6 +++---
+ modules/tv/classes/Schedule.php | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/classes/Video.php b/classes/Video.php
-index 7995aa4..5c6f7e4 100644
---- a/classes/Video.php
-+++ b/classes/Video.php
-@@ -90,12 +90,14 @@ class Video {
- $this->childid = $video['childid'];
- // Figure out the URL
- $this->url = '#';
-- if (file_exists('data/video/'))
-- $this->url = implode('/', array_map('rawurlencode',
-- array_map('utf8tolocal',
-- explode('/',
-- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
-- ))));
-+ //// all junk, replacing
-+// if (file_exists('data/video/'))
-+// $this->url = implode('/', array_map('rawurlencode',
-+// array_map('utf8tolocal',
-+// explode('/',
-+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
-+// ))));
-+ $this->url = 'video/stream?Id=' . $this->intid;
- $genre = $db->query('SELECT idgenre
- FROM videometadatagenre
- WHERE idvideo = ?',
-diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
-index 31f6854..6981bca 100755
---- a/modules/stream/stream_raw.pl
-+++ b/modules/stream/stream_raw.pl
-@@ -30,6 +30,10 @@
- $type = 'video/nuppelvideo';
- $suffix = '.nuv';
- }
-+ elsif ($basename =~ /\.mkv$/) {
-+ $type = 'video/x-matroska';
-+ $suffix = '.mkv';
-+ }
- else {
- print header(),
- "Unknown video type requested: $basename\n";
+diff --git a/includes/errors.php b/includes/errors.php
+index 0434b7a..c24e71a 100644
+--- a/includes/errors.php
++++ b/includes/errors.php
+@@ -103,6 +103,9 @@
+ /**/
+ function error_handler($errno, $errstr, $errfile, $errline, $vars) {
+ global $db;
++ // Leave early if we haven't requested reports from this kind of error
++ if (!($errno & error_reporting()))
++ return;
+ if (class_exists('Translate'))
+ $errstr = Translate::find()->string($errstr);
+ // Try to auto-repair damaged SQL tables
+@@ -113,9 +116,6 @@
+ add_error('Regular Expression Error: '.$match[1]);
+ return;
+ }
+- // Leave early if we haven't requested reports from this kind of error
+- if (!($errno & error_reporting()))
+- return;
+ // Fatal errors should report considerably more detail
+ if (in_array($errno, array(E_USER_ERROR, E_ERROR))) {
+ // What type of error?
diff --git a/modules/tv/classes/Schedule.php b/modules/tv/classes/Schedule.php
-index 3d9400f..0ad566d 100644
+index 0ad566d..6a9b8bc 100644
--- a/modules/tv/classes/Schedule.php
+++ b/modules/tv/classes/Schedule.php
-@@ -240,6 +240,47 @@ class Schedule extends MythBase {
- }
-
- /**
-+ * Alternative constructor for returning recording templates
-+ **/
-+ static function recording_template($name) {
-+ global $db;
-+ $sched = new Schedule(NULL);
-+ $data = $db->query_assoc('
-+ SELECT *
-+ FROM record
-+ WHERE type = ?
-+ AND title = ?',
-+ rectype_template,
-+ $name.' (Template)'
-+ );
-+
-+ $template_params = array(
-+ 'recpriority', 'prefinput', 'startoffset', 'endoffset',
-+ 'dupmethod', 'dupin', 'filter', 'inactive',
-+ 'profile', 'recgroup', 'storagegroup', 'playgroup', 'autoexpire',
-+ 'maxepisodes', 'maxnewest',
-+ 'autocommflag', 'autotranscode', 'transcoder',
-+ 'autouserjob1', 'autouserjob2', 'autouserjob3', 'autouserjob4',
-+ 'autometadata');
-+ foreach ($template_params as $param)
-+ if (isset($data[$param]))
-+ $sched->$param = $data[$param];
-+
-+ return $sched;
-+ }
-+
-+/**
-+ * Merge values from another schedule
-+ **/
-+ public function merge($prog) {
-+ foreach (get_object_vars($prog) as $name => $value) {
-+ if ($value && !$this->$name) {
-+ $this->$name = $value;
-+ }
-+ }
-+ }
-+
-+/**
- * Save this schedule
- /**/
- public function save($new_type) {
-diff --git a/modules/tv/detail.php b/modules/tv/detail.php
-index 27637c2..48bdb53 100644
---- a/modules/tv/detail.php
-+++ b/modules/tv/detail.php
-@@ -269,42 +269,9 @@
- // Redirect back to the page again, but without the query string, so reloads are cleaner
- redirect_browser(root_url.'tv/detail/'.$program->chanid.'/'.$program->starttime);
- }
--// Load default settings for recpriority, autoexpire etc
- else {
-- // auto-metadata-lookup
-- if (!isset($schedule->autometadata))
-- $schedule->autometadata = setting('AutoMetadataLookup');
-- // auto-commercial-flag
-- if (!isset($schedule->autocommflag))
-- $schedule->autocommflag = setting('AutoCommercialFlag');
-- // auto-user-jobs
-- if (!isset($schedule->autouserjob1))
-- $schedule->autouserjob1 = setting('AutoRunUserJob1');
-- if (!isset($schedule->autouserjob2))
-- $schedule->autouserjob2 = setting('AutoRunUserJob2');
-- if (!isset($schedule->autouserjob3))
-- $schedule->autouserjob3 = setting('AutoRunUserJob3');
-- if (!isset($schedule->autouserjob4))
-- $schedule->autouserjob4 = setting('AutoRunUserJob4');
-- // auto-transcode
-- if (!isset($schedule->autotranscode))
-- $schedule->autotranscode = setting('AutoTranscode');
-- // transcoder
-- if (!isset($schedule->transcoder))
-- $schedule->transcoder = setting('DefaultTranscoder');
-- // recpriority
-- if (!isset($schedule->recpriority)) {
-- $schedule->recpriority = $db->query_col('SELECT recpriority from channel where chanid=?',
-- $program->chanid);
-- }
-- // autoexpire
-- if (!isset($schedule->autoexpire))
-- $schedule->autoexpire = setting('AutoExpireDefault');
-- // start early / end late
-- if (!isset($schedule->startoffset))
-- $schedule->startoffset = setting('DefaultStartOffset');
-- if (!isset($schedule->endoffset))
-- $schedule->endoffset = setting('DefaultEndOffset');
-+ // Load default values from Default recording rule template
-+ $schedule->merge(Schedule::recording_template('Default'));
- }
-
- // Load the channel
-diff --git a/modules/tv/schedules_custom.php b/modules/tv/schedules_custom.php
-index 623db4b..035c46b 100644
---- a/modules/tv/schedules_custom.php
-+++ b/modules/tv/schedules_custom.php
-@@ -147,46 +147,11 @@
- }
- }
- }
--// Load default settings for recpriority, autoexpire etc
-+// Set some defaults
- else {
- // Make sure we have a default rectype
- if (!$schedule->type)
- $schedule->type = rectype_always;
-- // auto-metadata-lookup
-- if (!isset($schedule->autometadata))
-- $schedule->autometadata = setting('AutoMetadataLookup');
-- // auto-commercial-flag
-- if (!isset($schedule->autocommflag))
-- $schedule->autocommflag = setting('AutoCommercialFlag');
-- // auto-user-jobs
-- if (!isset($schedule->autouserjob1))
-- $schedule->autouserjob1 = setting('AutoRunUserJob1');
-- if (!isset($schedule->autouserjob2))
-- $schedule->autouserjob2 = setting('AutoRunUserJob2');
-- if (!isset($schedule->autouserjob3))
-- $schedule->autouserjob3 = setting('AutoRunUserJob3');
-- if (!isset($schedule->autouserjob4))
-- $schedule->autouserjob4 = setting('AutoRunUserJob4');
-- // auto-transcode
-- if (!isset($schedule->autotranscode))
-- $schedule->autotranscode = setting('AutoTranscode');
-- // transcoder
-- if (!isset($schedule->transcoder))
-- $schedule->transcoder = setting('DefaultTranscoder');
-- // recpriority
-- if (!isset($schedule->recpriority)) {
-- $result = mysql_query('SELECT recpriority from channel where chanid='.escape($program->chanid));
-- list($schedule->recpriority) = mysql_fetch_row($result);
-- mysql_free_result($result);
-- }
-- // autoexpire
-- if (!isset($schedule->autoexpire))
-- $schedule->autoexpire = setting('AutoExpireDefault');
-- // start early / end late
-- if (!isset($schedule->startoffset))
-- $schedule->startoffset = setting('DefaultStartOffset');
-- if (!isset($schedule->endoffset))
-- $schedule->endoffset = setting('DefaultEndOffset');
- // Get the searchtype string
- switch ($schedule->search) {
- case searchtype_power: $schedule->search_type = t('Power'); break;
-@@ -195,6 +160,8 @@
- case searchtype_title:
- default: $schedule->search_type = t('Title'); break;
- }
-+ // Load default values from Default recording rule template
-+ $schedule->merge(Schedule::recording_template('Default'));
- }
-
- // Create an edit-friendly title
-diff --git a/modules/tv/schedules_manual.php b/modules/tv/schedules_manual.php
-index 626ec39..6a2937a 100644
---- a/modules/tv/schedules_manual.php
-+++ b/modules/tv/schedules_manual.php
-@@ -120,39 +120,8 @@
- // Date/time/etc
- if (!$schedule->starttime)
- $schedule->starttime = time();
-- // auto-metadata-lookup
-- if (!isset($schedule->autometadata))
-- $schedule->autometadata = setting('AutoMetadataLookup');
-- // auto-commercial-flag
-- if (!isset($schedule->autocommflag))
-- $schedule->autocommflag = setting('AutoCommercialFlag');
-- // auto-user-jobs
-- if (!isset($schedule->autouserjob1))
-- $schedule->autouserjob1 = setting('AutoRunUserJob1');
-- if (!isset($schedule->autouserjob2))
-- $schedule->autouserjob2 = setting('AutoRunUserJob2');
-- if (!isset($schedule->autouserjob3))
-- $schedule->autouserjob3 = setting('AutoRunUserJob3');
-- if (!isset($schedule->autouserjob4))
-- $schedule->autouserjob4 = setting('AutoRunUserJob4');
-- // auto-transcode
-- if (!isset($schedule->autotranscode))
-- $schedule->autotranscode = setting('AutoTranscode');
-- // transcoder
-- if (!isset($schedule->transcoder))
-- $schedule->transcoder = setting('DefaultTranscoder');
-- // recpriority
-- if (!isset($schedule->recpriority)) {
-- $result = mysql_query('SELECT recpriority from channel where chanid='.escape($program->chanid));
-- list($schedule->recpriority) = mysql_fetch_row($result);
-- mysql_free_result($result);
-- }
-- // autoexpire
-- if (!isset($schedule->autoexpire)) {
-- $result = mysql_query("SELECT data from settings where value='AutoExpireDefault'");
-- list($schedule->autoexpire) = mysql_fetch_row($result);
-- mysql_free_result($result);
-- }
-+ // Load default values from Default recording rule template
-+ $schedule->merge(Schedule::recording_template('Default'));
- }
-
- // Calculate the length
-diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php
-index cdd8093..8e9bfc5 100644
---- a/modules/tv/tmpl/default/detail.php
-+++ b/modules/tv/tmpl/default/detail.php
-@@ -488,7 +488,7 @@
- <th><?php echo t('More') ?>:</th>
- <td>
- <?php if ($schedule->title) { ?>
-- <a href="http://www.themoviedb.org/search?search=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'themoviedb') ?></a>
-+ <a href="http://www.themoviedb.org/search?query=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'themoviedb') ?></a>
- <a href="http://www.imdb.com/search/title?title=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'IMDB') ?></a>
- <a href="http://www.thetvdb.com/?string=<?php echo urlencode($schedule->title) ?>&searchseriesid=&tab=listseries&function=Search"><?php echo t('Search $1', 'TheTVDB') ?></a>
- <a href="http://www.tv.com/search.php?type=11&stype=all&qs=<?php echo urlencode($schedule->title) ?>"><?php echo t('Search $1', 'TV.com') ?></a>
-diff --git a/modules/tv/tmpl/default/recorded.php b/modules/tv/tmpl/default/recorded.php
-index 203d4da..d1febd9 100644
---- a/modules/tv/tmpl/default/recorded.php
-+++ b/modules/tv/tmpl/default/recorded.php
-@@ -297,7 +297,7 @@ EOM;
- ?>
- file = new Object();
- file.title = '<?php echo addslashes($show->title) ?>';
-- file.subtitle = '<?php echo addslashes($show->subtitle) ?>';
-+ file.subtitle = '<?php echo str_replace("\n", '', nl2br(addslashes($show->subtitle))) ?>';
- file.chanid = '<?php echo addslashes($show->chanid) ?>';
- file.starttime = '<?php echo addslashes($show->recstartts) ?>';
- file.recgroup = '<?php echo addslashes(str_replace('%2F', '/', rawurlencode($show->recgroup))) ?>';
-diff --git a/modules/tv/tmpl/lite/detail.php b/modules/tv/tmpl/lite/detail.php
-index dc124e4..2eba29d 100644
---- a/modules/tv/tmpl/lite/detail.php
-+++ b/modules/tv/tmpl/lite/detail.php
-@@ -65,7 +65,7 @@
- </div>
- <div id="external_searches">
- (<?php echo t('Search') ?>:
-- <a href="http://www.themoviedb.org/search?search=<?php echo urlencode($schedule->title) ?>"><?php echo t('themoviedb') ?></a>
-+ <a href="http://www.themoviedb.org/search?query=<?php echo urlencode($schedule->title) ?>"><?php echo t('themoviedb') ?></a>
- -
- <a href="http://www.imdb.com/search/title?title=<?php echo urlencode($schedule->title) ?>"><?php echo t('IMDB') ?></a>
- -
-diff --git a/modules/video/handler.php b/modules/video/handler.php
-index fd769ce..721f186 100644
---- a/modules/video/handler.php
-+++ b/modules/video/handler.php
-@@ -15,8 +15,10 @@
- * @global string $GLOBALS['mythvideo_dir']
- * @name $mythvideo_dir
- /**/
-- global $mythvideo_dir;
-- $mythvideo_dir = setting('VideoStartupDir', hostname);
-+
-+//// dont need this...
-+// global $mythvideo_dir;
-+// $mythvideo_dir = setting('VideoStartupDir', hostname);
-
- // Load the video storage directories
- $video_dirs = $db->query_list('
-@@ -37,6 +39,7 @@
- }
- }
-
-+/** nor any of this...
- // Make sure the video directory exists
- if (file_exists('data/video')) {
- // File is not a directory or a symlink
-@@ -93,7 +96,7 @@
- .' reload this page.');
- }
- // Create a symlink to the first artwork directory that we find.
-- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
-+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
- else {
- foreach ($artwork_dirs as $dir) {
- if (is_dir($dir) || is_link($dir)) {
-@@ -116,6 +119,7 @@
+@@ -274,7 +274,7 @@ class Schedule extends MythBase {
+ **/
+ public function merge($prog) {
+ foreach (get_object_vars($prog) as $name => $value) {
+- if ($value && !$this->$name) {
++ if (isset($value) && !isset($this->$name)) {
+ $this->$name = $value;
}
}
- }
-+*/
-
- define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
- define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
-@@ -125,11 +129,17 @@
- case 'edit':
- require_once 'modules/video/edit.php';
- exit;
-- case 'imdb':
-- require_once 'modules/video/imdb.php';
-- exit;
-- case 'scan':
-- require_once 'modules/video/scan.php';
-+//// this is probably doing bad things
-+// case 'imdb':
-+// require_once 'modules/video/imdb.php';
-+// exit;
-+//// this is broken, so disable it
-+// case 'scan':
-+// require_once 'modules/video/scan.php';
-+// exit;
-+//// new stuff
-+ case 'stream':
-+ require_once 'modules/video/stream.php';
- exit;
- }
-
-diff --git a/modules/video/stream.php b/modules/video/stream.php
-new file mode 100644
-index 0000000..49a7298
---- /dev/null
-+++ b/modules/video/stream.php
-@@ -0,0 +1,69 @@
-+<?php
-+/**
-+ * Stream a music file
-+ *
-+ * @license GPL
-+ *
-+ * @package MythWeb
-+ * @subpackage Music
-+/**/
-+
-+// Yes, a db connection
-+ global $db;
-+
-+// Pull video ID
-+ $vid_id = $_GET['Id'];
-+
-+// Get filename
-+ list($fname) = $db->query_row('SELECT filename
-+ FROM videometadata
-+ WHERE intid = ?', $vid_id);
-+
-+// Mime type
-+ switch (substr($fname, strrpos($fname, '.'))) {
-+ case 'mpg':
-+ case 'mpeg':
-+ $mime = 'video/mpeg';
-+ break;
-+ case 'mp4':
-+ $mime = 'video/mp4';
-+ break;
-+ case 'ogg':
-+ case 'ogm':
-+ case 'ogv':
-+ $mime = 'video/ogg';
-+ break;
-+ case 'qt':
-+ $mime = 'video/quicktime';
-+ break;
-+ case 'webm':
-+ $mime = 'video/webm';
-+ break;
-+ case 'mkv':
-+ $mime = 'video/x-matroska';
-+ break;
-+ case 'wmv':
-+ $mime = 'video/x-ms-wmv';
-+ break;
-+ case 'flv':
-+ $mime = 'video/x-flv';
-+ break;
-+ default:
-+ $mime = 'applicatoin/octet-stream';
-+ }
-+ header('Content-Type: '.$mime);
-+
-+// Send the filename
-+ header('Content-Disposition: filename="'.$fname.'"');
-+
-+// Send data via the backend
-+ $Master_Host = setting('MasterServerIP');
-+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
-+ get_backend_setting('BackendStatusPort'));
-+ if (stripos($Master_Host,':') !== false) {
-+ $Master_Host = '['.$Master_Host.']';
-+ }
-+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
-+
-+// Nothing else to do
-+ exit;
-diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
-index e80176e..ad7e9a9 100644
---- a/modules/video/tmpl/default/video.php
-+++ b/modules/video/tmpl/default/video.php
-@@ -252,7 +252,7 @@
- <table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
- <tr class="menu">
- <td>
-- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
-+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
- <form action="<?php echo root_url; ?>video" method="GET">
- <?php echo t('Display'); ?>:
- <select name="category" id="category" onchange="filter();">
-diff --git a/mythweb.php b/mythweb.php
-index bba2aa8..79ff196 100644
---- a/mythweb.php
-+++ b/mythweb.php
-@@ -30,7 +30,7 @@
- if (Modules::getModule($Path[0])) {
- // Add the current module directory to our search path, so modules can
- // define includes, etc.
-- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
-+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
- // Load the module handler
- require_once 'handler.php';
- }
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-19/mythweb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mythweb.spec 23 Aug 2013 18:29:28 -0000 1.8
+++ mythweb.spec 4 Sep 2013 21:06:59 -0000 1.9
@@ -1,4 +1,4 @@
-%global gitrev v0.26.0-220-g92dbb43
+%global gitrev v0.26.1-2-g7326d7e
Name: mythweb
Summary: The web interface to MythTV
@@ -6,7 +6,7 @@
Group: Applications/Multimedia
Version: 0.26.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -19,7 +19,6 @@
# git diff -p --stat %{version} > mythweb-fixes.patch
Patch0: mythweb-0.26-fixes.patch
Patch1: mythweb-notrans.patch
-Patch2: mythweb-phperror.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.
@@ -42,9 +41,8 @@
%prep
%setup -q
-#patch0 -p1
+%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -78,6 +76,9 @@
%changelog
+* Mon Sep 2 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-2
+- Update to latest upstream release.
+
* Fri Aug 23 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1
- Update to latest upstream version.
--- mythweb-phperror.patch DELETED ---
11 years, 2 months
rpms/xine-lib-extras-freeworld/devel xine-lib-1.1.21-ffmpeg20.patch, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.51, 1.52
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17700
Modified Files:
xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.21-ffmpeg20.patch
Log Message:
Fix build for ffmpeg 2.0
xine-lib-1.1.21-ffmpeg20.patch:
ff_audio_decoder.c | 5 +++++
ff_video_decoder.c | 2 +-
ffmpeg_decoder.h | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
--- NEW FILE xine-lib-1.1.21-ffmpeg20.patch ---
--- xine-lib-1.1.21/src/combined/ffmpeg/ffmpeg_decoder.h.orig 2013-08-28 22:43:33.653572011 +0200
+++ xine-lib-1.1.21/src/combined/ffmpeg/ffmpeg_decoder.h 2013-08-28 22:44:24.087787844 +0200
@@ -35,7 +35,7 @@
typedef struct ff_codec_s {
uint32_t type;
- enum CodecID id;
+ enum AVCodecID id;
const char *name;
} ff_codec_t;
--- xine-lib-1.1.21/src/combined/ffmpeg/ff_audio_decoder.c.orig 2013-08-28 23:07:28.399833089 +0200
+++ xine-lib-1.1.21/src/combined/ffmpeg/ff_audio_decoder.c 2013-08-28 23:09:41.375423336 +0200
@@ -47,6 +47,11 @@
#define AUDIOBUFSIZE (64 * 1024)
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+/* from libavcodec/avcodec.h dated Dec 23 2012 */
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
typedef struct {
audio_decoder_class_t decoder_class;
} ff_audio_class_t;
--- xine-lib-1.1.21/src/combined/ffmpeg/ff_video_decoder.c.orig 2013-08-28 23:30:14.261671159 +0200
+++ xine-lib-1.1.21/src/combined/ffmpeg/ff_video_decoder.c 2013-08-28 23:30:55.725849741 +0200
@@ -1055,7 +1055,7 @@
this->bih.biWidth = _X_BE_16(&this->buf[12]);
this->bih.biHeight = _X_BE_16(&this->buf[14]);
- this->context->sub_id = _X_BE_32(&this->buf[30]);
+/* this->context->sub_id = _X_BE_32(&this->buf[30]); */
this->context->slice_offset = calloc(SLICE_OFFSET_SIZE, sizeof(int));
this->slice_offset_size = SLICE_OFFSET_SIZE;
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xine-lib-extras-freeworld.spec 15 Aug 2013 10:20:12 -0000 1.51
+++ xine-lib-extras-freeworld.spec 4 Sep 2013 19:24:38 -0000 1.52
@@ -4,7 +4,7 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.21
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -13,6 +13,7 @@
Patch0: xine-lib-1.1.19-no_autopoint.patch
Patch1: xine-lib-1.1.4-optflags.patch
+Patch2: xine-lib-1.1.21-ffmpeg20.patch
BuildRequires: autoconf automake libtool
BuildRequires: pkgconfig
@@ -63,6 +64,7 @@
# extra work for to omit old libtool-related crud
rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
%patch1 -p1 -b .optflags
+%patch2 -p1 -b .ffmpeg20
./autogen.sh noconfig
@@ -176,6 +178,9 @@
%changelog
+* Wed Aug 28 2013 Xavier Bachelot <xavier(a)bachelot.org> - 1.1.21-8
+- Fix build for ffmpeg 2.0.
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-7
- Rebuilt for FFmpeg 2.0.x
11 years, 2 months
rpms/dvbcut/devel dvbcut-svn179-ffmpeg-2.0-compatibility.patch, NONE, 1.1 dvbcut.spec, 1.24, 1.25
by David Timms
Author: dtimms
Update of /cvs/free/rpms/dvbcut/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1826
Modified Files:
dvbcut.spec
Added Files:
dvbcut-svn179-ffmpeg-2.0-compatibility.patch
Log Message:
add patch to use new ffmpeg-2.0 rather than deprecated functions
dvbcut-svn179-ffmpeg-2.0-compatibility.patch:
lavfmuxer.cpp | 32 ++++++++++++++++++++++++++++++++
mpgfile.cpp | 4 ++--
stream.h | 11 +++++++++--
3 files changed, 43 insertions(+), 4 deletions(-)
--- NEW FILE dvbcut-svn179-ffmpeg-2.0-compatibility.patch ---
--- src/stream.h.orig 2012-08-20 00:00:04.000000000 +1000
+++ src/stream.h 2013-08-22 07:22:41.570965090 +1000
@@ -52,8 +52,15 @@
{
if (avcc)
av_free(avcc);
- avcc=avcodec_alloc_context();
- avcodec_get_context_defaults(avcc);
+ // this guy needs a parameter of..? dec ?
+//AVCodecContext * avcodec_alloc_context3 (const AVCodec *codec)
+// Allocate an AVCodecContext and set its fields to default values.
+ avcc=avcodec_alloc_context3(dec);
+
+//int avcodec_get_context_defaults3 (AVCodecContext *s, const AVCodec *codec)
+// Set the fields of the given AVCodecContext to default values corresponding to the given
+// codec (defaults may be codec-dependent).
+ avcodec_get_context_defaults3(avcc, dec);
}
void setvideoencodingparameters(bool interlaced=false)
{
--- src/lavfmuxer.cpp.orig 2013-08-29 23:08:17.893277000 +1000
+++ src/lavfmuxer.cpp 2013-08-29 23:18:50.872436885 +1000
@@ -78,8 +78,19 @@
strpres[astr]=true;
if (s->codec)
av_free(s->codec);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0)
+// todo: what here ?
+// maybe need non NULL passed
+// AVCodecContext* avcodec_alloc_context3 ( const AVCodec * codec )
+ s->codec = avcodec_alloc_context3(NULL);
+
+// attribute_deprecated void avcodec_get_context_defaults ( AVCodecContext * s )
+ avcodec_get_context_defaults3(s->codec, NULL);
+
+#else
s->codec = avcodec_alloc_context();
avcodec_get_context_defaults(s->codec);
+#endif
s->codec->codec_type=AVMEDIA_TYPE_AUDIO;
s->codec->codec_id = (mpg.getstreamtype(astr)==streamtype::ac3audio) ?
CODEC_ID_AC3 : CODEC_ID_MP2;
@@ -94,11 +105,32 @@
break;
if (sd->getitemlistsize() > 1) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0)
+// todo:
+//int avcodec_open2 ( AVCodecContext * avctx,
+// const AVCodec * codec,
+// AVDictionary ** options
+// )
+ if (!avcodec_open2(s->codec,
+ avcodec_find_decoder(s->codec->codec_id), NULL)) {
+#else
if (!avcodec_open(s->codec,
avcodec_find_decoder(s->codec->codec_id))) {
+#endif
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 18, 0)
+// todo:
+// FF_API_OLD_DECODE_AUDIO is not defined, so need to work out how to
+// calc frame_size, or if decode_audio3 needs it
+// used to be AVCODEC_MAX_AUDIO_FRAME_SIZE = 192000
+// trying that
+ int16_t samples[192000/sizeof(int16_t)];
+#else
int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE/sizeof(int16_t)];
+#endif
int frame_size=sizeof(samples);
//fprintf(stderr, "** decode audio size=%d\n", sd->inbytes());
+
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0)
AVPacket avpkt;
av_init_packet(&avpkt);
--- src/mpgfile.cpp.orig 2013-08-31 23:32:44.101958000 +1000
+++ src/mpgfile.cpp 2013-08-31 23:45:55.148008273 +1000
@@ -115,7 +115,7 @@
sd->discard(idx[streampic].getpos().packetoffset());
}
- if (int rv=avcodec_open(S->avcc, S->dec))
+ if (int rv=avcodec_open2(S->avcc, S->dec, NULL))
{
fprintf(stderr,"avcodec_open returned %d\n",rv);
return;
--- src/mpgfile.cpp.orig 2013-08-30 07:02:11.343953000 +1000
+++ src/mpgfile.cpp 2013-08-31 23:20:40.454837190 +1000
@@ -709,7 +709,7 @@
return;
s[VIDEOSTREAM].setvideoencodingparameters();
- if (int rv=avcodec_open(avcc, s[VIDEOSTREAM].enc))
+ if (int rv=avcodec_open2(avcc, s[VIDEOSTREAM].enc, NULL))
{
if (log)
log->printerror("avcodec_open(mpeg2video_encoder) returned %d",rv);
Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dvbcut.spec 15 Aug 2013 10:14:49 -0000 1.24
+++ dvbcut.spec 4 Sep 2013 13:34:55 -0000 1.25
@@ -7,7 +7,7 @@
Name: dvbcut
Version: 0.6.1
-Release: 12.svn%{svnrev}%{?dist}
+Release: 13.svn%{svnrev}%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
@@ -30,6 +30,7 @@
Patch3: %{name}-svn176-desktop-additions.patch
Patch6: %{name}-179-vs-ubuntu-12.04.diff
Patch7: %{name}-svn179-ffmpeg-0.11.1.patch
+Patch8: %{name}-svn179-ffmpeg-2.0-compatibility.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
@@ -64,8 +65,9 @@
%patch1 -b .fix-make-install
%patch2 -b .fix-help-install
%patch3 -b .desktop-improvements
-%patch6 -b .orig
-%patch7 -p1 -b .orig
+%patch6 -b .ubuntu
+%patch7 -p1 -b .ffmpeg-0.11.1
+%patch8 -b .ffmpeg-2.0
# Fix QTDIR libs in configure
sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
@@ -135,6 +137,9 @@
%changelog
+* Wed Sep 04 2013 David Timms <iinet.net.au at dtimms>- 0.6.1-13.svn179
+- add patch to use new ffmpeg-2.0 rather than deprecated functions
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.1-12.svn179
- Rebuilt for FFmpeg 2.0.x
11 years, 2 months
rpms/vlc/devel vlc.spec,1.186,1.187
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19730
Modified Files:
vlc.spec
Log Message:
Add patch from rfbz#2835
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- vlc.spec 1 Sep 2013 15:18:58 -0000 1.186
+++ vlc.spec 3 Sep 2013 21:31:45 -0000 1.187
@@ -422,6 +422,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
}
@@ -470,6 +473,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,-)
11 years, 2 months