rpms/rpmfusion-free-package-config-smart/F-12 rpmfusion-free-package-config-smart.spec, 1.6, 1.7
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24395
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
Fix typo in changelog date, "Jun" not "June"
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-12/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmfusion-free-package-config-smart.spec 10 Jun 2010 19:20:25 -0000 1.6
+++ rpmfusion-free-package-config-smart.spec 10 Jun 2010 19:22:08 -0000 1.7
@@ -55,7 +55,7 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
-* Thu June 10 2010 Stewart Adam <s.adam at diffingo.com> - 12-2
+* Thu Jun 10 2010 Stewart Adam <s.adam at diffingo.com> - 12-2
- Use hardcoded %%{basearch} instead of %%{_target_cpu} (fixes #1268)
* Tue Dec 15 2009 Stewart Adam <s.adam at diffingo.com> - 12-1
13 years, 11 months
- 1
- 0
rpms/rpmfusion-free-package-config-smart/F-12 rpmfusion-free-package-config-smart.spec, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24289
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
* Thu June 10 2010 Stewart Adam <s.adam at diffingo.com> - 12-2
- Use hardcoded %{basearch} instead of %{_target_cpu} (fixes #1268)
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-12/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-free-package-config-smart.spec 15 Dec 2009 19:20:16 -0000 1.5
+++ rpmfusion-free-package-config-smart.spec 10 Jun 2010 19:20:25 -0000 1.6
@@ -1,9 +1,15 @@
%define debug_package %{nil}
+%ifarch %{ix86}
+%define basearch i386
+%else
+%define basearch %{_target_cpu}
+%endif
+
Summary: RPM Fusion (free) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
Version: 12
-Release: 1
+Release: 2
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -36,7 +42,7 @@
for channel in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4};do
name=$(basename $channel)
install -p -m0644 $channel $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
- sed -i 's/\$basearch/%{_target_cpu}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+ sed -i 's/\$basearch/%{basearch}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$releasever/%{fedora}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
done
@@ -49,6 +55,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Thu June 10 2010 Stewart Adam <s.adam at diffingo.com> - 12-2
+- Use hardcoded %%{basearch} instead of %%{_target_cpu} (fixes #1268)
+
* Tue Dec 15 2009 Stewart Adam <s.adam at diffingo.com> - 12-1
- Update for F-12
13 years, 11 months
- 1
- 0
rpms/rpmfusion-free-package-config-smart/F-13 rpmfusion-free-package-config-smart.spec, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/rpmfusion-free-package-config-smart/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23856
Modified Files:
rpmfusion-free-package-config-smart.spec
Log Message:
* Thu Jun 10 2010 Stewart Adam <s.adam at diffingo.com> - 13-2
- Use hardcoded %{basearch} instead of %{_target_cpu} (fixes #1268)
Index: rpmfusion-free-package-config-smart.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-package-config-smart/F-13/rpmfusion-free-package-config-smart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-free-package-config-smart.spec 29 May 2010 19:05:38 -0000 1.5
+++ rpmfusion-free-package-config-smart.spec 10 Jun 2010 19:18:45 -0000 1.6
@@ -1,9 +1,15 @@
%define debug_package %{nil}
+%ifarch %{ix86}
+%define basearch i386
+%else
+%define basearch %{_target_cpu}
+%endif
+
Summary: RPM Fusion (free) configuration files for the Smart package manager
Name: rpmfusion-free-package-config-smart
Version: 13
-Release: 1
+Release: 2
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -35,7 +41,7 @@
for channel in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4};do
name=$(basename $channel)
install -p -m0644 $channel $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
- sed -i 's/\$basearch/%{_target_cpu}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
+ sed -i 's/\$basearch/%{basearch}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
sed -i 's/\$releasever/%{fedora}/' $RPM_BUILD_ROOT%{_sysconfdir}/smart/channels/$name
done
@@ -48,6 +54,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Thu Jun 10 2010 Stewart Adam <s.adam at diffingo.com> - 13-2
+- Use hardcoded %%{basearch} instead of %%{_target_cpu} (fixes #1268)
+
* Sat May 29 2010 Stewart Adam <s.adam at diffingo.com> - 13-1
- Update for F13
13 years, 11 months
- 1
- 0
rpms/cairo-dock/F-13 cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch, NONE, 1.1 cairo-dock.spec, 1.52, 1.53
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15078/F-13
Modified Files:
cairo-dock.spec
Added Files:
cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch
Log Message:
* Fri Jun 11 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.9-3
- Fix for "GMenu does not handle desktop file exec strings properly"
(Lauchpad 526138, rpmfusion 1265)
cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch:
applet-util.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 118 insertions(+), 14 deletions(-)
--- NEW FILE cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch ---
------------------------------------------------------------
revno: 1524
committer: fabounet <fabounet03(a)gmail.com>
branch nick: cairo-dock-plug-ins
timestamp: Sat 2010-02-27 14:54:53 +0100
message:
GMenu : applied the patch to take into account the parameters of the Exec command + Animated-Icons : fixed a bug with the unfolding animation
=== modified file 'GMenu/src/applet-util.c'
--- GMenu/src/applet-util.c 2009-09-01 19:55:41 +0000
+++ GMenu/src/applet-util.c 2010-02-27 13:54:53 +0000
@@ -85,17 +85,114 @@
}
#endif
+#define CD_EXPAND_FIELD_CODES //comment this line to switch off the arguments parsing.
+static gchar * cd_expand_field_codes(const gchar* cCommand, GKeyFile* keyfile) // Thanks to ... for this patch !
+{
+ gchar* cCommandExpanded = NULL;
+#ifdef CD_EXPAND_FIELD_CODES
+ gchar* cField = strchr (cCommand, '%');
+ gchar* cFieldLast;
+ gchar* cFieldCodeToken = NULL;
+ GError* erreur;
+
+ // Break out immediately if there are no field codes
+ if( cField == NULL )
+ {
+ cCommandExpanded = g_strdup(cCommand);
+ return cCommandExpanded;
+ }
+
+ // parse all the %x tokens, replacing them with the value they represent.
+ GString *sExpandedcCommand = g_string_new ("");
+ g_string_append_len (sExpandedcCommand, cCommand, cField - cCommand); // take the command until the first % (not included).
+ while ( cField != NULL )
+ {
+ cField ++; // jump to the code.
+ switch ( *cField ) // Make sure field code is valid
+ {
+ case 'f':
+ case 'F':
+ case 'u':
+ case 'U': //Is there any reason to expect these codes in a launcher for the main menu?
+ cd_warning("Unexpected field code %%%c in exec string '%s' : cannot handle file or url codes in the menu.", *cField, cCommand);
+ break;
+ case 'd':
+ case 'D':
+ case 'n':
+ case 'N':
+ case 'w':
+ case 'm': //Deprecated field codes ignored and stripped, per freedesktop spec
+ cd_warning("Deprecated field code %%%c ignored in exec string '%s'.", *cField, cCommand);
+ break;
+ case 'c':
+ cFieldCodeToken = g_key_file_get_locale_string (keyfile, "Desktop Entry", "Name", NULL, erreur);
+ if (erreur != NULL)
+ {
+ cd_warning ("Error while expanding %%%c in exec string '%s' : %s", *cField, cCommand, erreur->message);
+ g_error_free (erreur);
+ erreur = NULL;
+ }
+ break;
+ case 'i':
+ cFieldCodeToken = g_key_file_get_locale_string (keyfile, "Desktop Entry", "Icon", NULL, NULL); // Icon key not required. If not found, no error message necessary.
+ if (cFieldCodeToken != NULL)
+ {
+ gchar *tmp = cFieldCodeToken;
+ cFieldCodeToken = g_strconcat("--icon ", cFieldCodeToken, NULL);
+ g_free (tmp);
+ }
+ break;
+ case 'k':
+ cd_warning("Field code %%k not handled yet");
+ break;
+ case '%': // %% is a literal % sign.
+ cFieldCodeToken = g_strdup("%");
+ //cField ++; // to avoid capturing this %-sign as the beginning of the next field code
+ break;
+ default:
+ cd_warning("Invalid field code %%%c in exec string '%s'", *cField, cCommand);
+ break; // we'll try to launch it anyway.
+ }
+
+ if (cFieldCodeToken != NULL) // there is a token to add to the command.
+ {
+ g_string_append_printf (sExpandedcCommand, "%s ", cFieldCodeToken);
+ g_free (cFieldCodeToken);
+ cFieldCodeToken = NULL;
+ }
+ cFieldLast = cField;
+ cField = strchr(cField + 1, '%'); // next field.
+ // we append everything between the current filed and the next field.
+ if (cField != NULL)
+ g_string_append_len (sExpandedcCommand, cFieldLast+1, cField - cFieldLast - 1);
+ else
+ g_string_append (sExpandedcCommand, cFieldLast+1);
+ }
+ cCommandExpanded = sExpandedcCommand->str;
+ g_string_free (sExpandedcCommand, FALSE);
+#else
+ gchar *str = strchr (cCommand, '%');
+ if (str != NULL)
+ cCommandExpanded = g_strndup (cCommand, str - cCommand);
+ else
+ cCommandExpanded = g_strdup (cCommand,);
+#endif //CD_EXPAND_FIELD_CODES
+
+ return cCommandExpanded;
+}
static void _launch_from_file (const gchar *cDesktopFilePath)
{
+ //\____________ On ouvre le .desktop
GError *erreur = NULL;
GKeyFile* keyfile = g_key_file_new();
- g_key_file_load_from_file (keyfile, cDesktopFilePath, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, &erreur);
+ g_key_file_load_from_file (keyfile, cDesktopFilePath, 0, &erreur); //skip comments and translations.
if (erreur != NULL)
{
cd_warning ("while trying to read %s : %s", cDesktopFilePath, erreur->message);
g_error_free (erreur);
return ;
}
+ //\____________ On recupere la commande.
gchar *cCommand = g_key_file_get_string (keyfile, "Desktop Entry", "Exec", &erreur);
if (erreur != NULL)
{
@@ -103,22 +200,29 @@
g_error_free (erreur);
erreur = NULL;
}
- gchar *cWorkingDirectory = NULL;
- if (cCommand != NULL)
+ g_return_if_fail (cCommand != NULL);
+
+ //\____________ On gere les arguments de la forme %x.
+ gchar *cCommandExpanded = NULL;
+#ifdef CD_EXPAND_FIELD_CODES
+ cCommandExpanded = cd_expand_field_codes(cCommand, keyfile);
+#else
+ gchar *str = strchr (cCommand, '%');
+ if (str != NULL)
+ *str = '\0';
+#endif //CD_EXPAND_FIELD_CODES
+
+ //\____________ On recupere le repertoire d'execution.
+ gchar *cWorkingDirectory = g_key_file_get_string (keyfile, "Desktop Entry", "Path", NULL);
+ if (cWorkingDirectory != NULL && *cWorkingDirectory == '\0')
{
- gchar *str = strchr (cCommand, '%');
- if (str != NULL)
- *str = '\0';
g_free (cWorkingDirectory);
- cWorkingDirectory = g_key_file_get_string (keyfile, "Desktop Entry", "Path", NULL);
- if (cWorkingDirectory != NULL && *cWorkingDirectory == '\0')
- {
- g_free (cWorkingDirectory);
- cWorkingDirectory = NULL;
- }
- }
- cairo_dock_launch_command_full (cCommand, cWorkingDirectory);
+ cWorkingDirectory = NULL;
+ }
+ //\____________ On lance le tout.
+ cairo_dock_launch_command_full (cCommandExpanded, cWorkingDirectory);
g_free (cCommand);
+ g_free (cCommandExpanded);
g_free (cWorkingDirectory);
}
static void _launch_from_basename (const gchar *cDesktopFileName)
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-13/cairo-dock.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cairo-dock.spec 28 May 2010 18:11:41 -0000 1.52
+++ cairo-dock.spec 10 Jun 2010 17:10:35 -0000 1.53
@@ -24,7 +24,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 3
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -55,6 +55,11 @@
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
+#
+# Patch from upstream
+# Lauchpad 526138, rpmfusion 1265
+# GMenu does not handle desktop file exec strings properly
+Patch200: cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch
%if ! %{released}
BuildRequires: automake
@@ -246,6 +251,9 @@
find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
# source code fix
+# Gmenu
+# Upstream patch
+%patch200 -p0 -b .quote
# Scooby-do & Network-Monitor
# try to enable these modules (where the original code says
@@ -623,6 +631,10 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Jun 11 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.9-3
+- Fix for "GMenu does not handle desktop file exec strings properly"
+ (Lauchpad 526138, rpmfusion 1265)
+
* Wed May 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rebuild against new libetpan
13 years, 11 months
- 1
- 0
rpms/cairo-dock/devel cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch, NONE, 1.1 cairo-dock.spec, 1.52, 1.53
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15078/devel
Modified Files:
cairo-dock.spec
Added Files:
cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch
Log Message:
* Fri Jun 11 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.9-3
- Fix for "GMenu does not handle desktop file exec strings properly"
(Lauchpad 526138, rpmfusion 1265)
cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch:
applet-util.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 118 insertions(+), 14 deletions(-)
--- NEW FILE cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch ---
------------------------------------------------------------
revno: 1524
committer: fabounet <fabounet03(a)gmail.com>
branch nick: cairo-dock-plug-ins
timestamp: Sat 2010-02-27 14:54:53 +0100
message:
GMenu : applied the patch to take into account the parameters of the Exec command + Animated-Icons : fixed a bug with the unfolding animation
=== modified file 'GMenu/src/applet-util.c'
--- GMenu/src/applet-util.c 2009-09-01 19:55:41 +0000
+++ GMenu/src/applet-util.c 2010-02-27 13:54:53 +0000
@@ -85,17 +85,114 @@
}
#endif
+#define CD_EXPAND_FIELD_CODES //comment this line to switch off the arguments parsing.
+static gchar * cd_expand_field_codes(const gchar* cCommand, GKeyFile* keyfile) // Thanks to ... for this patch !
+{
+ gchar* cCommandExpanded = NULL;
+#ifdef CD_EXPAND_FIELD_CODES
+ gchar* cField = strchr (cCommand, '%');
+ gchar* cFieldLast;
+ gchar* cFieldCodeToken = NULL;
+ GError* erreur;
+
+ // Break out immediately if there are no field codes
+ if( cField == NULL )
+ {
+ cCommandExpanded = g_strdup(cCommand);
+ return cCommandExpanded;
+ }
+
+ // parse all the %x tokens, replacing them with the value they represent.
+ GString *sExpandedcCommand = g_string_new ("");
+ g_string_append_len (sExpandedcCommand, cCommand, cField - cCommand); // take the command until the first % (not included).
+ while ( cField != NULL )
+ {
+ cField ++; // jump to the code.
+ switch ( *cField ) // Make sure field code is valid
+ {
+ case 'f':
+ case 'F':
+ case 'u':
+ case 'U': //Is there any reason to expect these codes in a launcher for the main menu?
+ cd_warning("Unexpected field code %%%c in exec string '%s' : cannot handle file or url codes in the menu.", *cField, cCommand);
+ break;
+ case 'd':
+ case 'D':
+ case 'n':
+ case 'N':
+ case 'w':
+ case 'm': //Deprecated field codes ignored and stripped, per freedesktop spec
+ cd_warning("Deprecated field code %%%c ignored in exec string '%s'.", *cField, cCommand);
+ break;
+ case 'c':
+ cFieldCodeToken = g_key_file_get_locale_string (keyfile, "Desktop Entry", "Name", NULL, erreur);
+ if (erreur != NULL)
+ {
+ cd_warning ("Error while expanding %%%c in exec string '%s' : %s", *cField, cCommand, erreur->message);
+ g_error_free (erreur);
+ erreur = NULL;
+ }
+ break;
+ case 'i':
+ cFieldCodeToken = g_key_file_get_locale_string (keyfile, "Desktop Entry", "Icon", NULL, NULL); // Icon key not required. If not found, no error message necessary.
+ if (cFieldCodeToken != NULL)
+ {
+ gchar *tmp = cFieldCodeToken;
+ cFieldCodeToken = g_strconcat("--icon ", cFieldCodeToken, NULL);
+ g_free (tmp);
+ }
+ break;
+ case 'k':
+ cd_warning("Field code %%k not handled yet");
+ break;
+ case '%': // %% is a literal % sign.
+ cFieldCodeToken = g_strdup("%");
+ //cField ++; // to avoid capturing this %-sign as the beginning of the next field code
+ break;
+ default:
+ cd_warning("Invalid field code %%%c in exec string '%s'", *cField, cCommand);
+ break; // we'll try to launch it anyway.
+ }
+
+ if (cFieldCodeToken != NULL) // there is a token to add to the command.
+ {
+ g_string_append_printf (sExpandedcCommand, "%s ", cFieldCodeToken);
+ g_free (cFieldCodeToken);
+ cFieldCodeToken = NULL;
+ }
+ cFieldLast = cField;
+ cField = strchr(cField + 1, '%'); // next field.
+ // we append everything between the current filed and the next field.
+ if (cField != NULL)
+ g_string_append_len (sExpandedcCommand, cFieldLast+1, cField - cFieldLast - 1);
+ else
+ g_string_append (sExpandedcCommand, cFieldLast+1);
+ }
+ cCommandExpanded = sExpandedcCommand->str;
+ g_string_free (sExpandedcCommand, FALSE);
+#else
+ gchar *str = strchr (cCommand, '%');
+ if (str != NULL)
+ cCommandExpanded = g_strndup (cCommand, str - cCommand);
+ else
+ cCommandExpanded = g_strdup (cCommand,);
+#endif //CD_EXPAND_FIELD_CODES
+
+ return cCommandExpanded;
+}
static void _launch_from_file (const gchar *cDesktopFilePath)
{
+ //\____________ On ouvre le .desktop
GError *erreur = NULL;
GKeyFile* keyfile = g_key_file_new();
- g_key_file_load_from_file (keyfile, cDesktopFilePath, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, &erreur);
+ g_key_file_load_from_file (keyfile, cDesktopFilePath, 0, &erreur); //skip comments and translations.
if (erreur != NULL)
{
cd_warning ("while trying to read %s : %s", cDesktopFilePath, erreur->message);
g_error_free (erreur);
return ;
}
+ //\____________ On recupere la commande.
gchar *cCommand = g_key_file_get_string (keyfile, "Desktop Entry", "Exec", &erreur);
if (erreur != NULL)
{
@@ -103,22 +200,29 @@
g_error_free (erreur);
erreur = NULL;
}
- gchar *cWorkingDirectory = NULL;
- if (cCommand != NULL)
+ g_return_if_fail (cCommand != NULL);
+
+ //\____________ On gere les arguments de la forme %x.
+ gchar *cCommandExpanded = NULL;
+#ifdef CD_EXPAND_FIELD_CODES
+ cCommandExpanded = cd_expand_field_codes(cCommand, keyfile);
+#else
+ gchar *str = strchr (cCommand, '%');
+ if (str != NULL)
+ *str = '\0';
+#endif //CD_EXPAND_FIELD_CODES
+
+ //\____________ On recupere le repertoire d'execution.
+ gchar *cWorkingDirectory = g_key_file_get_string (keyfile, "Desktop Entry", "Path", NULL);
+ if (cWorkingDirectory != NULL && *cWorkingDirectory == '\0')
{
- gchar *str = strchr (cCommand, '%');
- if (str != NULL)
- *str = '\0';
g_free (cWorkingDirectory);
- cWorkingDirectory = g_key_file_get_string (keyfile, "Desktop Entry", "Path", NULL);
- if (cWorkingDirectory != NULL && *cWorkingDirectory == '\0')
- {
- g_free (cWorkingDirectory);
- cWorkingDirectory = NULL;
- }
- }
- cairo_dock_launch_command_full (cCommand, cWorkingDirectory);
+ cWorkingDirectory = NULL;
+ }
+ //\____________ On lance le tout.
+ cairo_dock_launch_command_full (cCommandExpanded, cWorkingDirectory);
g_free (cCommand);
+ g_free (cCommandExpanded);
g_free (cWorkingDirectory);
}
static void _launch_from_basename (const gchar *cDesktopFileName)
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cairo-dock.spec 12 May 2010 13:55:49 -0000 1.52
+++ cairo-dock.spec 10 Jun 2010 17:10:36 -0000 1.53
@@ -24,7 +24,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 3
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -55,6 +55,11 @@
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
+#
+# Patch from upstream
+# Lauchpad 526138, rpmfusion 1265
+# GMenu does not handle desktop file exec strings properly
+Patch200: cairo-dock-plugins-c1524-gmenu-parse-desktop-with-quote.patch
%if ! %{released}
BuildRequires: automake
@@ -246,6 +251,9 @@
find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
# source code fix
+# Gmenu
+# Upstream patch
+%patch200 -p0 -b .quote
# Scooby-do & Network-Monitor
# try to enable these modules (where the original code says
@@ -623,6 +631,10 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Jun 11 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.9-3
+- Fix for "GMenu does not handle desktop file exec strings properly"
+ (Lauchpad 526138, rpmfusion 1265)
+
* Wed May 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rebuild against new libetpan
13 years, 11 months
- 1
- 0
rpms/vlc/devel vlc-1.1.0-bugfix-dlopen.patch,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25276
Added Files:
vlc-1.1.0-bugfix-dlopen.patch
Log Message:
Add patch
vlc-1.1.0-bugfix-dlopen.patch:
override.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE vlc-1.1.0-bugfix-dlopen.patch ---
diff --git a/bin/override.c b/bin/override.c
index 54ca687..5e72918 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -297,7 +297,7 @@ int (*XSetIOErrorHandler (int (*handler) (Display *))) (Display *)
void *dlopen (const char *path, int flag)
{
- if (strstr (path, "/gui_platform/libkde.so"))
+ if (path && strstr (path, "/gui_platform/libkde.so"))
return NULL; /* Oh no, not that one! */
return CALL(dlopen, path, flag);
}
13 years, 11 months
- 1
- 0
rpms/vlc/devel vlc.spec,1.82,1.83
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25205
Modified Files:
vlc.spec
Log Message:
Fix segfault on dlopen
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- vlc.spec 7 Jun 2010 09:23:28 -0000 1.82
+++ vlc.spec 8 Jun 2010 19:58:19 -0000 1.83
@@ -20,7 +20,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.0
-Release: 0.10.rc2%{?dist}
+Release: 0.11.rc2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -30,6 +30,7 @@
%endif
Source10: vlc-handlers.schemas
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
+Patch1: vlc-1.1.0-bugfix-dlopen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -219,6 +220,7 @@
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
%patch0 -p1 -b .noerror
+%patch1 -p1 -b .0dlopen
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -505,7 +507,10 @@
%changelog
-* Mon Jun 07 2010 kwizart(a)gmail.com - 1.1.0-0.10.rc2
+* Tue Jun 08 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.0-0.11.rc2
+- Fix segfault on dlopen
+
+* Mon Jun 07 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.0-0.10.rc2
- Fix --with a52dec conditional
* Fri Jun 04 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.0-0.9.rc2
13 years, 11 months
- 1
- 0
rpms/mythtv/F-11 mythbackend.init, 1.1, 1.2 mythbackend.sysconfig, 1.1, 1.2 mythplugins-0.23-svnfixes.patch, 1.1, 1.2 mythtv-0.23-svnfixes.patch, 1.1, 1.2 mythtv.spec, 1.44, 1.45 mythtv-version.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22443
Modified Files:
mythbackend.init mythbackend.sysconfig
mythplugins-0.23-svnfixes.patch mythtv-0.23-svnfixes.patch
mythtv.spec
Removed Files:
mythtv-version.patch
Log Message:
* Sat May 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-2
- Update to release-0-23-fixes branch, svn revision 24896
Index: mythbackend.init
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythbackend.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.init 10 May 2010 16:07:36 -0000 1.1
+++ mythbackend.init 8 Jun 2010 19:16:17 -0000 1.2
@@ -16,18 +16,22 @@
fi
## Defaults, override them in /etc/sysconfig/mythbackend
-: ${MYTHTV_HOME=/etc/mythtv}
+MYTHTV_HOME=${MYTHTV_HOME:-/etc/mythtv}
+MYTHBACKEND_USER=${MYTHBACKEND_USER:-root}
binary=/usr/bin/mythbackend
prog=mythbackend
RETVAL=0
-OPTIONS="$OPTIONS --daemon --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
-# Would be nice to run as non-root, but it doesn't work -- dvb/v4l devices owned by root become unusable
-#OPTIONS="$OPTIONS --daemon --user mythtv --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
+OPTIONS="$OPTIONS --daemon --logfile --user ${MYTHBACKEND_USER} /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
start() {
echo -n $"Starting $prog: "
- touch /var/run/mythbackend.pid; chown mythtv:mythtv /var/run/mythbackend.pid
+ touch /var/run/mythbackend.pid
+ if [ "${MYTHBACKEND_USER}" != root ]; then
+ chown ${MYTHBACKEND_USER}:${MYTHBACKEND_USER} /var/run/mythbackend.pid
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- -R /dev/dvb/
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/video*
+ fi
export MYTHCONFDIR="$MYTHTV_HOME"
export HOME="$MYTHTV_HOME"
daemon $binary $OPTIONS
@@ -41,6 +45,10 @@
echo -n $"Stopping $prog: "
killproc $binary
RETVAL=$?
+ if [ "${MYTHBACKEND_USER}" != root ]; then
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/video*
+ fi
echo
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
}
Index: mythbackend.sysconfig
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythbackend.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.sysconfig 10 May 2010 16:07:36 -0000 1.1
+++ mythbackend.sysconfig 8 Jun 2010 19:16:18 -0000 1.2
@@ -1,2 +1,10 @@
#MYTHTV_HOME=/etc/mythtv
+# mythbackend runs as root by default, but support for running as a non-root
+# user should be functional. However, switching to a non-root user on an
+# existing setup will require fixing up permissions on files mythbackend
+# needs access to -- particularly, your recordings, which are owned by the
+# user mythbackend runs as. If you switch from running as root to running as
+# user mythtv, deleting existing recordings won't work until their file
+# ownership has been changed from root to mythtv as well.
+#MYTHBACKEND_USER=mythtv
#OPTIONS=
mythplugins-0.23-svnfixes.patch:
mytharchive/mythburn/scripts/mythburn.py | 91 +++++-----
mythgallery/mythgallery/galleryutil.cpp | 5
mythgallery/mythgallery/glsingleview.cpp | 1
mythmusic/mythmusic/dbcheck.cpp | 5
mythvideo/mythvideo/dbcheck.cpp | 5
mythweb/classes/Database.php | 4
mythweb/classes/Database/Query.php | 4
mythweb/classes/Database/Query/mysql.php | 4
mythweb/classes/Database/Query/mysqlicompat.php | 4
mythweb/classes/Database/mysql.php | 4
mythweb/classes/Database/mysqlicompat.php | 4
mythweb/classes/JSON.php | 4
mythweb/classes/Modules.php | 4
mythweb/classes/MythBackend.php | 4
mythweb/classes/MythFrontend.php | 4
mythweb/includes/class_autoload.php | 4
mythweb/includes/cleanup.php | 4
mythweb/includes/config.php | 4
mythweb/includes/css.php | 4
mythweb/includes/data_dir.php | 4
mythweb/includes/database.php | 4
mythweb/includes/db_update.php | 4
mythweb/includes/defines.php | 4
mythweb/includes/errordisplay.php | 4
mythweb/includes/errors.php | 4
mythweb/includes/init.php | 4
mythweb/includes/jobqueue.php | 4
mythweb/includes/lockdown.php | 4
mythweb/includes/mobile.php | 4
mythweb/includes/mouseovers.php | 4
mythweb/includes/php_version_check.php | 4
mythweb/includes/session.php | 4
mythweb/includes/skin.php | 4
mythweb/includes/sorting.php | 4
mythweb/includes/translate.php | 4
mythweb/includes/utils.php | 4
mythweb/js/pngbehavior.htc | 2
mythweb/js/table_sort.js | 4
mythweb/js/utils.js | 4
mythweb/modules/_shared/tmpl/_errors/db_access_denied.php | 4
mythweb/modules/_shared/tmpl/_errors/db_vars_error.php | 4
mythweb/modules/_shared/tmpl/_errors/error.php | 4
mythweb/modules/_shared/tmpl/_errors/fatal.php | 4
mythweb/modules/_shared/tmpl/_errors/lockdown.php | 4
mythweb/modules/_shared/tmpl/_errors/no_modules.php | 4
mythweb/modules/_shared/tmpl/_errors/site_down.php | 4
mythweb/modules/_shared/tmpl/_errors/unknown_module.php | 4
mythweb/modules/_shared/tmpl/default/footer.php | 4
mythweb/modules/_shared/tmpl/default/header.php | 4
mythweb/modules/_shared/tmpl/default/welcome.php | 4
mythweb/modules/_shared/tmpl/iPod/footer.php | 4
mythweb/modules/_shared/tmpl/iPod/header.php | 4
mythweb/modules/_shared/tmpl/iPod/welcome.php | 4
mythweb/modules/_shared/tmpl/lite/footer.php | 4
mythweb/modules/_shared/tmpl/lite/header.php | 4
mythweb/modules/_shared/tmpl/lite/welcome.php | 4
mythweb/modules/_shared/tmpl/wap/footer.php | 4
mythweb/modules/_shared/tmpl/wap/header.php | 4
mythweb/modules/_shared/tmpl/wap/welcome.php | 4
mythweb/modules/backend_log/handler.php | 4
mythweb/modules/backend_log/init.php | 4
mythweb/modules/backend_log/tmpl/default/backend_log.php | 4
mythweb/modules/backend_log/tmpl/default/welcome.php | 4
mythweb/modules/backend_log/tmpl/lite/backend_log.php | 4
mythweb/modules/backend_log/tmpl/lite/welcome.php | 4
mythweb/modules/database/init.php | 4
mythweb/modules/database/set_settings.php | 4
mythweb/modules/database/tmpl/default/set_settings.php | 4
mythweb/modules/music/handler.php | 4
mythweb/modules/music/init.php | 4
mythweb/modules/music/mp3act_functions.php | 4
mythweb/modules/music/stream.php | 4
mythweb/modules/music/tmpl/default/welcome.php | 4
mythweb/modules/mythtv/init.php | 4
mythweb/modules/mythtv/set_keys.php | 4
mythweb/modules/mythtv/set_settings.php | 4
mythweb/modules/mythtv/tmpl/default/set_keys.php | 4
mythweb/modules/mythtv/tmpl/default/set_settings.php | 4
mythweb/modules/mythtv/tmpl/lite/set_keys.php | 4
mythweb/modules/mythtv/tmpl/lite/set_settings.php | 4
mythweb/modules/mythweb/init.php | 4
mythweb/modules/mythweb/set_defaults.php | 4
mythweb/modules/mythweb/set_flvplayer.php | 4
mythweb/modules/mythweb/set_session.php | 4
mythweb/modules/mythweb/tmpl/default/set_defaults.php | 4
mythweb/modules/mythweb/tmpl/default/set_flvplayer.php | 4
mythweb/modules/mythweb/tmpl/default/set_session.php | 4
mythweb/modules/mythweb/tmpl/lite/set_defaults.php | 4
mythweb/modules/mythweb/tmpl/lite/set_flvplayer.php | 4
mythweb/modules/mythweb/tmpl/lite/set_session.php | 4
mythweb/modules/remote/do.php | 4
mythweb/modules/remote/handler.php | 4
mythweb/modules/remote/init.php | 4
mythweb/modules/remote/keys.php | 4
mythweb/modules/remote/play_program_on_frontend.php | 4
mythweb/modules/remote/tmpl/default/keys.php | 4
mythweb/modules/remote/tmpl/default/remote.php | 4
mythweb/modules/remote/tmpl/default/welcome.php | 4
mythweb/modules/remote/tmpl/iPod/play_program_on_frontend.php | 4
mythweb/modules/remote/tmpl/iPod/welcome.php | 4
mythweb/modules/settings/handler.php | 4
mythweb/modules/settings/init.php | 4
mythweb/modules/settings/tmpl/default/header.php | 4
mythweb/modules/settings/tmpl/default/welcome.php | 4
mythweb/modules/settings/tmpl/lite/header.php | 4
mythweb/modules/settings/tmpl/lite/mythweb.php | 4
mythweb/modules/settings/tmpl/lite/welcome.php | 4
mythweb/modules/stats/handler.php | 4
mythweb/modules/stats/init.php | 4
mythweb/modules/stats/tmpl/default/stats.php | 4
mythweb/modules/stats/tmpl/default/welcome.php | 4
mythweb/modules/stats/tmpl/lite/stats.php | 4
mythweb/modules/stats/tmpl/lite/welcome.php | 4
mythweb/modules/status/handler.php | 4
mythweb/modules/status/init.php | 4
mythweb/modules/status/tmpl/default/status.php | 4
mythweb/modules/status/tmpl/default/welcome.php | 4
mythweb/modules/status/tmpl/lite/status.php | 4
mythweb/modules/status/tmpl/lite/welcome.php | 4
mythweb/modules/status/tmpl/wap/status.php | 4
mythweb/modules/stream/handler.pl | 4
mythweb/modules/stream/init.php | 4
mythweb/modules/stream/set_protocol.php | 4
mythweb/modules/stream/stream_asx.pl | 4
mythweb/modules/stream/stream_flv.pl | 4
mythweb/modules/stream/stream_flvp.pl | 4
mythweb/modules/stream/stream_mp4.pl | 4
mythweb/modules/stream/stream_raw.pl | 4
mythweb/modules/stream/tmpl/default/set_protocol.php | 4
mythweb/modules/stream/tmpl/lite/set_protocol.php | 4
mythweb/modules/stream/tv.pl | 4
mythweb/modules/tv/canned_searches.conf.php | 4
mythweb/modules/tv/channel.php | 4
mythweb/modules/tv/classes/Channel.php | 4
mythweb/modules/tv/classes/Channel_List.php | 4
mythweb/modules/tv/classes/Program.php | 4
mythweb/modules/tv/classes/Recording.php | 4
mythweb/modules/tv/classes/Schedule.php | 4
mythweb/modules/tv/detail.php | 4
mythweb/modules/tv/get_pixmap.php | 4
mythweb/modules/tv/handler.php | 4
mythweb/modules/tv/includes/channels.php | 4
mythweb/modules/tv/includes/programs.php | 4
mythweb/modules/tv/includes/recording_schedules.php | 4
mythweb/modules/tv/includes/schedule_utils.php | 4
mythweb/modules/tv/init.php | 4
mythweb/modules/tv/list.php | 4
mythweb/modules/tv/list_recording_groups.php | 4
mythweb/modules/tv/list_shows_in_title_and_group.php | 4
mythweb/modules/tv/list_titles_in_group.php | 4
mythweb/modules/tv/opensearch.php | 4
mythweb/modules/tv/recorded.php | 4
mythweb/modules/tv/schedules.php | 4
mythweb/modules/tv/schedules_custom.php | 4
mythweb/modules/tv/schedules_manual.php | 4
mythweb/modules/tv/search.php | 4
mythweb/modules/tv/searches.php | 4
mythweb/modules/tv/set_channels.php | 4
mythweb/modules/tv/set_playgroup.php | 4
mythweb/modules/tv/set_screens.php | 4
mythweb/modules/tv/set_session.php | 4
mythweb/modules/tv/submenu.php | 4
mythweb/modules/tv/tmpl/default/channel.php | 4
mythweb/modules/tv/tmpl/default/detail.php | 4
mythweb/modules/tv/tmpl/default/list.php | 4
mythweb/modules/tv/tmpl/default/list_data.php | 4
mythweb/modules/tv/tmpl/default/recorded.php | 4
mythweb/modules/tv/tmpl/default/schedules.php | 4
mythweb/modules/tv/tmpl/default/schedules_custom.php | 4
mythweb/modules/tv/tmpl/default/schedules_manual.php | 4
mythweb/modules/tv/tmpl/default/search.php | 4
mythweb/modules/tv/tmpl/default/searches.php | 4
mythweb/modules/tv/tmpl/default/set_channels.php | 4
mythweb/modules/tv/tmpl/default/set_playgroup.php | 4
mythweb/modules/tv/tmpl/default/set_screens.php | 4
mythweb/modules/tv/tmpl/default/set_session.php | 4
mythweb/modules/tv/tmpl/default/upcoming.php | 4
mythweb/modules/tv/tmpl/default/welcome.php | 4
mythweb/modules/tv/tmpl/iPod/detail.php | 4
mythweb/modules/tv/tmpl/iPod/list_recording_groups.php | 4
mythweb/modules/tv/tmpl/iPod/list_shows_in_title_and_group.php | 4
mythweb/modules/tv/tmpl/iPod/list_titles_in_group.php | 4
mythweb/modules/tv/tmpl/iPod/search.php | 4
mythweb/modules/tv/tmpl/iPod/submenu.php | 4
mythweb/modules/tv/tmpl/iPod/upcoming.php | 4
mythweb/modules/tv/tmpl/iPod/welcome.php | 4
mythweb/modules/tv/tmpl/ical/upcoming.php | 4
mythweb/modules/tv/tmpl/lite/channel.php | 4
mythweb/modules/tv/tmpl/lite/detail.php | 4
mythweb/modules/tv/tmpl/lite/list.php | 4
mythweb/modules/tv/tmpl/lite/recorded.php | 4
mythweb/modules/tv/tmpl/lite/schedules.php | 4
mythweb/modules/tv/tmpl/lite/schedules_custom.php | 4
mythweb/modules/tv/tmpl/lite/schedules_manual.php | 4
mythweb/modules/tv/tmpl/lite/search.php | 4
mythweb/modules/tv/tmpl/lite/searches.php | 4
mythweb/modules/tv/tmpl/lite/set_channels.php | 10 -
mythweb/modules/tv/tmpl/lite/set_session.php | 4
mythweb/modules/tv/tmpl/lite/upcoming.php | 4
mythweb/modules/tv/tmpl/lite/welcome.php | 4
mythweb/modules/tv/tmpl/rss/recorded.php | 4
mythweb/modules/tv/tmpl/wap/channel.php | 4
mythweb/modules/tv/tmpl/wap/detail.php | 4
mythweb/modules/tv/tmpl/wap/list.php | 4
mythweb/modules/tv/tmpl/wap/recorded.php | 4
mythweb/modules/tv/tmpl/wap/search.php | 4
mythweb/modules/tv/tmpl/wap/upcoming.php | 4
mythweb/modules/tv/upcoming.php | 4
mythweb/modules/video/edit.php | 4
mythweb/modules/video/handler.php | 4
mythweb/modules/video/imdb.php | 4
mythweb/modules/video/init.php | 4
mythweb/modules/video/scan.php | 4
mythweb/modules/video/set_settings.php | 4
mythweb/modules/video/tmpl/default/set_settings.php | 4
mythweb/modules/video/tmpl/default/video.php | 4
mythweb/modules/video/tmpl/default/welcome.php | 4
mythweb/modules/weather/classes/WeatherScreen.php | 4
mythweb/modules/weather/handler.php | 4
mythweb/modules/weather/init.php | 4
mythweb/modules/weather/set_screen.php | 4
mythweb/modules/weather/tmpl/default/set_screen.php | 4
mythweb/modules/weather/tmpl/default/weather.18h.php | 4
mythweb/modules/weather/tmpl/default/weather.3d.php | 4
mythweb/modules/weather/tmpl/default/weather.6d.php | 4
mythweb/modules/weather/tmpl/default/weather.am.php | 4
mythweb/modules/weather/tmpl/default/weather.cc.php | 4
mythweb/modules/weather/tmpl/default/weather.php | 4
mythweb/modules/weather/tmpl/default/weather.sm.php | 4
mythweb/modules/weather/tmpl/default/welcome.php | 4
mythweb/modules/welcome.php | 4
mythweb/mythweb.php | 4
mythweb/mythweb.pl | 4
settings.pro | 2
234 files changed, 509 insertions(+), 516 deletions(-)
Index: mythplugins-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythplugins-0.23-svnfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythplugins-0.23-svnfixes.patch 29 May 2010 04:26:01 -0000 1.1
+++ mythplugins-0.23-svnfixes.patch 8 Jun 2010 19:16:18 -0000 1.2
@@ -242,6 +242,36 @@
m_view = new GLSingleView(itemList, pos, slideShow, sortOrder, this);
l->addWidget(m_view);
+diff -Naurp mythplugins-0.23-release/mythmusic/mythmusic/dbcheck.cpp mythplugins-0.23/mythmusic/mythmusic/dbcheck.cpp
+--- mythplugins-0.23-release/mythmusic/mythmusic/dbcheck.cpp 2009-10-12 02:28:43.000000000 -0400
++++ mythplugins-0.23/mythmusic/mythmusic/dbcheck.cpp 2010-06-06 00:54:24.555359000 -0400
+@@ -84,11 +84,6 @@ bool UpgradeMusicDatabaseSchema(void)
+ if (DBup->DBver.isEmpty())
+ return doUpgradeMusicDatabaseSchema(DBup->DBver);
+
+- // An upgrade is likely. Ensure we have a backup first:
+- if ((DBup->backupStatus == kDB_Backup_Unknown) ||
+- (DBup->backupStatus == kDB_Backup_Failed))
+- DBup->BackupDB();
+-
+ // Pop up messages, questions, warnings, et c.
+ switch (DBup->PromptForUpgrade("Music", true, false))
+ {
+diff -Naurp mythplugins-0.23-release/mythvideo/mythvideo/dbcheck.cpp mythplugins-0.23/mythvideo/mythvideo/dbcheck.cpp
+--- mythplugins-0.23-release/mythvideo/mythvideo/dbcheck.cpp 2010-01-18 21:10:45.000000000 -0500
++++ mythplugins-0.23/mythvideo/mythvideo/dbcheck.cpp 2010-06-06 00:54:24.555359000 -0400
+@@ -721,11 +721,6 @@ namespace
+ if (DBup->versionsBehind == 0) // same schema
+ return true;
+
+- // An upgrade is likely. Ensure we have a backup first:
+- if ((DBup->backupStatus == kDB_Backup_Unknown) ||
+- (DBup->backupStatus == kDB_Backup_Failed))
+- DBup->BackupDB();
+-
+ // Pop up messages, questions, warnings, et c.
+ switch (DBup->PromptForUpgrade("Video", true, false))
+ {
diff -Naurp mythplugins-0.23-release/mythweb/classes/Database/mysqlicompat.php mythplugins-0.23/mythweb/classes/Database/mysqlicompat.php
--- mythplugins-0.23-release/mythweb/classes/Database/mysqlicompat.php 2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.23/mythweb/classes/Database/mysqlicompat.php 2008-11-08 21:42:14.216654000 -0500
mythtv-0.23-svnfixes.patch:
VERSION | 1
bindings/perl/IO/Socket/INET/MythTV.pm | 4 -
bindings/perl/MythTV.pm | 11 +-
bindings/perl/MythTV/Channel.pm | 64 ++++++++--------
bindings/perl/MythTV/Program.pm | 4 -
bindings/perl/MythTV/Recording.pm | 4 -
bindings/perl/MythTV/StorageGroup.pm | 4 -
bindings/python/MythTV/MythData.py | 4 -
bindings/python/MythTV/MythFunc.py | 13 ++-
configure | 18 ++--
contrib/config_files/lirc/lircrc.native.example.mceusb2 | 2
contrib/icons/master_iconmap/channel_icons.pl | 4 -
contrib/maintenance/flush_deleted_recgroup.pl | 4 -
contrib/maintenance/optimize_mythdb.pl | 4 -
contrib/user_jobs/firewire_primer.pl | 4 -
contrib/user_jobs/mythlink.pl | 4 -
libs/libavcodec/libavcodec.pro | 5 -
libs/libmyth/audiooutputpulse.cpp | 13 ++-
libs/libmyth/mythcontext.cpp | 9 +-
libs/libmyth/schemawizard.cpp | 17 ++++
libs/libmythdb/mythdirs.cpp | 5 -
libs/libmythdvdnav/libmythdvdnav.pro | 3
libs/libmythsoundtouch/AAFilter.cpp | 2
libs/libmythsoundtouch/AAFilter.h | 2
libs/libmythsoundtouch/BPMDetect.h | 2
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 2
libs/libmythsoundtouch/FIFOSampleBuffer.h | 2
libs/libmythsoundtouch/FIFOSamplePipe.h | 2
libs/libmythsoundtouch/FIRFilter.cpp | 2
libs/libmythsoundtouch/FIRFilter.h | 2
libs/libmythsoundtouch/RateTransposer.cpp | 2
libs/libmythsoundtouch/RateTransposer.h | 2
libs/libmythsoundtouch/STTypes.h | 2
libs/libmythsoundtouch/SoundTouch.cpp | 2
libs/libmythsoundtouch/SoundTouch.h | 2
libs/libmythsoundtouch/TDStretch.cpp | 2
libs/libmythsoundtouch/TDStretch.h | 2
libs/libmythsoundtouch/cpu_detect.h | 2
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 2
libs/libmythsoundtouch/mmx_gcc.cpp | 2
libs/libmythtv/avformatdecoder.cpp | 17 ++++
libs/libmythtv/dbcheck.cpp | 9 --
libs/libmythtv/tv_play.cpp | 19 +---
libs/libmythtv/tv_play.h | 2
libs/libmythui/mythmainwindow.cpp | 12 +--
libs/libmythui/mythsystem.cpp | 4 -
libs/libmythui/xmlparsebase.cpp | 6 -
libs/libswscale/libswscale.pro | 6 +
programs/mythbackend/main.cpp | 7 +
programs/mythcommflag/main.cpp | 35 +++++++-
programs/mythtv-setup/main.cpp | 2
settings.pro | 2
version.pro | 2
53 files changed, 221 insertions(+), 139 deletions(-)
Index: mythtv-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythtv-0.23-svnfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.23-svnfixes.patch 29 May 2010 04:26:01 -0000 1.1
+++ mythtv-0.23-svnfixes.patch 8 Jun 2010 19:16:18 -0000 1.2
@@ -187,7 +187,7 @@
dtv_multiplex.sourceid AS dtv_sourceid,
diff -Naurp mythtv-0.23-release/bindings/python/MythTV/MythData.py mythtv-0.23/bindings/python/MythTV/MythData.py
--- mythtv-0.23-release/bindings/python/MythTV/MythData.py 2010-04-21 00:46:55.000000000 -0400
-+++ mythtv-0.23/bindings/python/MythTV/MythData.py 2010-05-19 23:43:41.152467000 -0400
++++ mythtv-0.23/bindings/python/MythTV/MythData.py 2010-06-06 20:03:02.104550000 -0400
@@ -175,7 +175,7 @@ class FileTransfer( MythBEConn ):
if not self.open:
return
@@ -197,6 +197,15 @@
self.socket.shutdown(1)
self.socket.close()
self.open = False
+@@ -526,6 +526,8 @@ class Program( DictData ):
+ if type != 'r':
+ raise MythFileError(MythError.FILE_FAILED_WRITE, self.filename,
+ 'Program () objects cannot be opened for writing')
++ if not self.filename.startswith('myth://'):
++ self.filename = 'myth://%s/%s' % (self.hostname, self.filename)
+ return ftopen(self.filename, 'r')
+
+ class Record( DBDataWrite ):
diff -Naurp mythtv-0.23-release/bindings/python/MythTV/MythFunc.py mythtv-0.23/bindings/python/MythTV/MythFunc.py
--- mythtv-0.23-release/bindings/python/MythTV/MythFunc.py 2010-03-31 15:07:44.000000000 -0400
+++ mythtv-0.23/bindings/python/MythTV/MythFunc.py 2010-05-23 15:52:40.992320000 -0400
@@ -397,6 +406,29 @@
QMAKE_CFLAGS_SHLIB =
}
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp mythtv-0.23/libs/libmyth/audiooutputpulse.cpp
+--- mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp 2009-11-16 11:18:35.000000000 -0500
++++ mythtv-0.23/libs/libmyth/audiooutputpulse.cpp 2010-06-07 23:31:50.923907000 -0400
+@@ -554,9 +554,16 @@ bool AudioOutputPulseAudio::ConnectPlayb
+ else
+ pa_cvolume_reset(&volume_control, audio_channels);
+
+- // set myth sizes and pa buffer metrics
+- fragment_size = (float)sample_rate * 0.020f * // 20msec
+- (float)(audio_bits / 8 * audio_channels);
++ // set myth sizes and pa buffer metrics (20 ms)
++ // Note: The 20 is an unsigned long (at least 32 bits).
++ // sample_rate, audio_bits and audio_channels are at least
++ // that size, so the math will be done with a range of at
++ // least 2 billion. If we assume a max audio_bits of 32,
++ // audio_channels of 16 and sample_rate of <= 448000, then
++ // the largest number will be 230 million, well within range.
++ fragment_size = 20UL * sample_rate * audio_bits * audio_channels
++ / 8 /* 8 bits per byte */ / 1000 /* 1000 ms per second */;
++
+ soundcard_buffer_size = 16 * fragment_size;
+ buffer_settings.maxlength = soundcard_buffer_size;
+ buffer_settings.tlength = fragment_size * 4;
diff -Naurp mythtv-0.23-release/libs/libmyth/mythcontext.cpp mythtv-0.23/libs/libmyth/mythcontext.cpp
--- mythtv-0.23-release/libs/libmyth/mythcontext.cpp 2010-03-23 20:43:43.000000000 -0400
+++ mythtv-0.23/libs/libmyth/mythcontext.cpp 2010-05-14 18:39:42.189261000 -0400
@@ -425,20 +457,24 @@
}
diff -Naurp mythtv-0.23-release/libs/libmyth/schemawizard.cpp mythtv-0.23/libs/libmyth/schemawizard.cpp
--- mythtv-0.23-release/libs/libmyth/schemawizard.cpp 2010-01-22 12:12:23.000000000 -0500
-+++ mythtv-0.23/libs/libmyth/schemawizard.cpp 2010-05-23 19:30:49.920201000 -0400
-@@ -261,6 +261,11 @@ SchemaUpgradeWizard::PromptForUpgrade(co
++++ mythtv-0.23/libs/libmyth/schemawizard.cpp 2010-06-06 00:54:24.555359000 -0400
+@@ -261,6 +261,15 @@ SchemaUpgradeWizard::PromptForUpgrade(co
return MYTH_SCHEMA_USE_EXISTING;
#endif
-+ // Only back up the database if it's old/about to be upgraded
-+ // (not if it's too new)
-+ // or if a user is doing something they probably shouldn't ("expert mode")
-+ if ((upgradeAllowed && (versionsBehind > 0)) || m_expertMode)
++ // Only back up the database if we haven't already successfully made a
++ // backup and the database is old/about to be upgraded (not if it's too
++ // new) or if a user is doing something they probably shouldn't ("expert
++ // mode")
++ if (((backupStatus == kDB_Backup_Unknown) ||
++ (backupStatus == kDB_Backup_Failed)) &&
++ ((upgradeAllowed && (versionsBehind > 0)) ||
++ m_expertMode))
+ BackupDB();
connections = CountClients() > 1;
gui = GetMythUI()->IsScreenSetup() && gContext->GetMainWindow();
-@@ -314,6 +319,14 @@ SchemaUpgradeWizard::PromptForUpgrade(co
+@@ -314,6 +323,14 @@ SchemaUpgradeWizard::PromptForUpgrade(co
return MYTH_SCHEMA_EXIT;
}
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-11/mythtv.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mythtv.spec 29 May 2010 04:26:01 -0000 1.44
+++ mythtv.spec 8 Jun 2010 19:16:18 -0000 1.45
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r24896
+%define _svnrev r25048
%define branch release-0-23-fixes
#
@@ -81,7 +81,7 @@
%if "%{branch}" == "trunk"
Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -132,7 +132,6 @@
Patch0: mythtv-%{version}-svnfixes.patch
Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
Patch1: mythplugins-%{version}-svnfixes.patch
-Patch2: mythtv-version.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
Source102: mythbackend.init
@@ -842,7 +841,6 @@
cd mythtv-%{version}
%patch0 -p1
-%patch2 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -980,7 +978,7 @@
--enable-debug
# Insert rpm version-release for mythbackend --version output
- sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh
+ echo 'SOURCE_VERSION="%{version}-%{release} (%_svnrev)"' > VERSION
# Make
make %{?_smp_mflags}
@@ -1479,6 +1477,12 @@
################################################################################
%changelog
+* Tue Jun 08 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-3
+- Update to release-0-23-fixes branch, svn revision 25048
+- Includes pulseaudio white noise and seeking fixes (rpmfusion bz#1260)
+- Wire up improved support for running the backend as a non-root user,
+ must be enabled by the user, see caveats in /etc/sysconfig/mythbackend
+
* Sat May 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-2
- Update to release-0-23-fixes branch, svn revision 24896
--- mythtv-version.patch DELETED ---
13 years, 11 months
- 1
- 0
rpms/mythtv/F-12 mythbackend.init, 1.1, 1.2 mythbackend.sysconfig, 1.1, 1.2 mythplugins-0.23-svnfixes.patch, 1.1, 1.2 mythtv-0.23-svnfixes.patch, 1.1, 1.2 mythtv.spec, 1.67, 1.68 mythtv-version.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22304
Modified Files:
mythbackend.init mythbackend.sysconfig
mythplugins-0.23-svnfixes.patch mythtv-0.23-svnfixes.patch
mythtv.spec
Removed Files:
mythtv-version.patch
Log Message:
* Tue Jun 08 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-3
- Update to release-0-23-fixes branch, svn revision 25048
- Includes pulseaudio white noise and seeking fixes (rpmfusion bz#1260)
- Wire up improved support for running the backend as a non-root user,
must be enabled by the user, see caveats in /etc/sysconfig/mythbackend
Index: mythbackend.init
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythbackend.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.init 4 May 2010 18:42:56 -0000 1.1
+++ mythbackend.init 8 Jun 2010 19:15:42 -0000 1.2
@@ -16,18 +16,22 @@
fi
## Defaults, override them in /etc/sysconfig/mythbackend
-: ${MYTHTV_HOME=/etc/mythtv}
+MYTHTV_HOME=${MYTHTV_HOME:-/etc/mythtv}
+MYTHBACKEND_USER=${MYTHBACKEND_USER:-root}
binary=/usr/bin/mythbackend
prog=mythbackend
RETVAL=0
-OPTIONS="$OPTIONS --daemon --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
-# Would be nice to run as non-root, but it doesn't work -- dvb/v4l devices owned by root become unusable
-#OPTIONS="$OPTIONS --daemon --user mythtv --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
+OPTIONS="$OPTIONS --daemon --logfile --user ${MYTHBACKEND_USER} /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
start() {
echo -n $"Starting $prog: "
- touch /var/run/mythbackend.pid; chown mythtv:mythtv /var/run/mythbackend.pid
+ touch /var/run/mythbackend.pid
+ if [ "${MYTHBACKEND_USER}" != root ]; then
+ chown ${MYTHBACKEND_USER}:${MYTHBACKEND_USER} /var/run/mythbackend.pid
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- -R /dev/dvb/
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/video*
+ fi
export MYTHCONFDIR="$MYTHTV_HOME"
export HOME="$MYTHTV_HOME"
daemon $binary $OPTIONS
@@ -41,6 +45,10 @@
echo -n $"Stopping $prog: "
killproc $binary
RETVAL=$?
+ if [ "${MYTHBACKEND_USER}" != root ]; then
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/video*
+ fi
echo
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
}
Index: mythbackend.sysconfig
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythbackend.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.sysconfig 4 May 2010 18:42:56 -0000 1.1
+++ mythbackend.sysconfig 8 Jun 2010 19:15:42 -0000 1.2
@@ -1,2 +1,10 @@
#MYTHTV_HOME=/etc/mythtv
+# mythbackend runs as root by default, but support for running as a non-root
+# user should be functional. However, switching to a non-root user on an
+# existing setup will require fixing up permissions on files mythbackend
+# needs access to -- particularly, your recordings, which are owned by the
+# user mythbackend runs as. If you switch from running as root to running as
+# user mythtv, deleting existing recordings won't work until their file
+# ownership has been changed from root to mythtv as well.
+#MYTHBACKEND_USER=mythtv
#OPTIONS=
mythplugins-0.23-svnfixes.patch:
mytharchive/mythburn/scripts/mythburn.py | 91 +++++-----
mythgallery/mythgallery/galleryutil.cpp | 5
mythgallery/mythgallery/glsingleview.cpp | 1
mythmusic/mythmusic/dbcheck.cpp | 5
mythvideo/mythvideo/dbcheck.cpp | 5
mythweb/classes/Database.php | 4
mythweb/classes/Database/Query.php | 4
mythweb/classes/Database/Query/mysql.php | 4
mythweb/classes/Database/Query/mysqlicompat.php | 4
mythweb/classes/Database/mysql.php | 4
mythweb/classes/Database/mysqlicompat.php | 4
mythweb/classes/JSON.php | 4
mythweb/classes/Modules.php | 4
mythweb/classes/MythBackend.php | 4
mythweb/classes/MythFrontend.php | 4
mythweb/includes/class_autoload.php | 4
mythweb/includes/cleanup.php | 4
mythweb/includes/config.php | 4
mythweb/includes/css.php | 4
mythweb/includes/data_dir.php | 4
mythweb/includes/database.php | 4
mythweb/includes/db_update.php | 4
mythweb/includes/defines.php | 4
mythweb/includes/errordisplay.php | 4
mythweb/includes/errors.php | 4
mythweb/includes/init.php | 4
mythweb/includes/jobqueue.php | 4
mythweb/includes/lockdown.php | 4
mythweb/includes/mobile.php | 4
mythweb/includes/mouseovers.php | 4
mythweb/includes/php_version_check.php | 4
mythweb/includes/session.php | 4
mythweb/includes/skin.php | 4
mythweb/includes/sorting.php | 4
mythweb/includes/translate.php | 4
mythweb/includes/utils.php | 4
mythweb/js/pngbehavior.htc | 2
mythweb/js/table_sort.js | 4
mythweb/js/utils.js | 4
mythweb/modules/_shared/tmpl/_errors/db_access_denied.php | 4
mythweb/modules/_shared/tmpl/_errors/db_vars_error.php | 4
mythweb/modules/_shared/tmpl/_errors/error.php | 4
mythweb/modules/_shared/tmpl/_errors/fatal.php | 4
mythweb/modules/_shared/tmpl/_errors/lockdown.php | 4
mythweb/modules/_shared/tmpl/_errors/no_modules.php | 4
mythweb/modules/_shared/tmpl/_errors/site_down.php | 4
mythweb/modules/_shared/tmpl/_errors/unknown_module.php | 4
mythweb/modules/_shared/tmpl/default/footer.php | 4
mythweb/modules/_shared/tmpl/default/header.php | 4
mythweb/modules/_shared/tmpl/default/welcome.php | 4
mythweb/modules/_shared/tmpl/iPod/footer.php | 4
mythweb/modules/_shared/tmpl/iPod/header.php | 4
mythweb/modules/_shared/tmpl/iPod/welcome.php | 4
mythweb/modules/_shared/tmpl/lite/footer.php | 4
mythweb/modules/_shared/tmpl/lite/header.php | 4
mythweb/modules/_shared/tmpl/lite/welcome.php | 4
mythweb/modules/_shared/tmpl/wap/footer.php | 4
mythweb/modules/_shared/tmpl/wap/header.php | 4
mythweb/modules/_shared/tmpl/wap/welcome.php | 4
mythweb/modules/backend_log/handler.php | 4
mythweb/modules/backend_log/init.php | 4
mythweb/modules/backend_log/tmpl/default/backend_log.php | 4
mythweb/modules/backend_log/tmpl/default/welcome.php | 4
mythweb/modules/backend_log/tmpl/lite/backend_log.php | 4
mythweb/modules/backend_log/tmpl/lite/welcome.php | 4
mythweb/modules/database/init.php | 4
mythweb/modules/database/set_settings.php | 4
mythweb/modules/database/tmpl/default/set_settings.php | 4
mythweb/modules/music/handler.php | 4
mythweb/modules/music/init.php | 4
mythweb/modules/music/mp3act_functions.php | 4
mythweb/modules/music/stream.php | 4
mythweb/modules/music/tmpl/default/welcome.php | 4
mythweb/modules/mythtv/init.php | 4
mythweb/modules/mythtv/set_keys.php | 4
mythweb/modules/mythtv/set_settings.php | 4
mythweb/modules/mythtv/tmpl/default/set_keys.php | 4
mythweb/modules/mythtv/tmpl/default/set_settings.php | 4
mythweb/modules/mythtv/tmpl/lite/set_keys.php | 4
mythweb/modules/mythtv/tmpl/lite/set_settings.php | 4
mythweb/modules/mythweb/init.php | 4
mythweb/modules/mythweb/set_defaults.php | 4
mythweb/modules/mythweb/set_flvplayer.php | 4
mythweb/modules/mythweb/set_session.php | 4
mythweb/modules/mythweb/tmpl/default/set_defaults.php | 4
mythweb/modules/mythweb/tmpl/default/set_flvplayer.php | 4
mythweb/modules/mythweb/tmpl/default/set_session.php | 4
mythweb/modules/mythweb/tmpl/lite/set_defaults.php | 4
mythweb/modules/mythweb/tmpl/lite/set_flvplayer.php | 4
mythweb/modules/mythweb/tmpl/lite/set_session.php | 4
mythweb/modules/remote/do.php | 4
mythweb/modules/remote/handler.php | 4
mythweb/modules/remote/init.php | 4
mythweb/modules/remote/keys.php | 4
mythweb/modules/remote/play_program_on_frontend.php | 4
mythweb/modules/remote/tmpl/default/keys.php | 4
mythweb/modules/remote/tmpl/default/remote.php | 4
mythweb/modules/remote/tmpl/default/welcome.php | 4
mythweb/modules/remote/tmpl/iPod/play_program_on_frontend.php | 4
mythweb/modules/remote/tmpl/iPod/welcome.php | 4
mythweb/modules/settings/handler.php | 4
mythweb/modules/settings/init.php | 4
mythweb/modules/settings/tmpl/default/header.php | 4
mythweb/modules/settings/tmpl/default/welcome.php | 4
mythweb/modules/settings/tmpl/lite/header.php | 4
mythweb/modules/settings/tmpl/lite/mythweb.php | 4
mythweb/modules/settings/tmpl/lite/welcome.php | 4
mythweb/modules/stats/handler.php | 4
mythweb/modules/stats/init.php | 4
mythweb/modules/stats/tmpl/default/stats.php | 4
mythweb/modules/stats/tmpl/default/welcome.php | 4
mythweb/modules/stats/tmpl/lite/stats.php | 4
mythweb/modules/stats/tmpl/lite/welcome.php | 4
mythweb/modules/status/handler.php | 4
mythweb/modules/status/init.php | 4
mythweb/modules/status/tmpl/default/status.php | 4
mythweb/modules/status/tmpl/default/welcome.php | 4
mythweb/modules/status/tmpl/lite/status.php | 4
mythweb/modules/status/tmpl/lite/welcome.php | 4
mythweb/modules/status/tmpl/wap/status.php | 4
mythweb/modules/stream/handler.pl | 4
mythweb/modules/stream/init.php | 4
mythweb/modules/stream/set_protocol.php | 4
mythweb/modules/stream/stream_asx.pl | 4
mythweb/modules/stream/stream_flv.pl | 4
mythweb/modules/stream/stream_flvp.pl | 4
mythweb/modules/stream/stream_mp4.pl | 4
mythweb/modules/stream/stream_raw.pl | 4
mythweb/modules/stream/tmpl/default/set_protocol.php | 4
mythweb/modules/stream/tmpl/lite/set_protocol.php | 4
mythweb/modules/stream/tv.pl | 4
mythweb/modules/tv/canned_searches.conf.php | 4
mythweb/modules/tv/channel.php | 4
mythweb/modules/tv/classes/Channel.php | 4
mythweb/modules/tv/classes/Channel_List.php | 4
mythweb/modules/tv/classes/Program.php | 4
mythweb/modules/tv/classes/Recording.php | 4
mythweb/modules/tv/classes/Schedule.php | 4
mythweb/modules/tv/detail.php | 4
mythweb/modules/tv/get_pixmap.php | 4
mythweb/modules/tv/handler.php | 4
mythweb/modules/tv/includes/channels.php | 4
mythweb/modules/tv/includes/programs.php | 4
mythweb/modules/tv/includes/recording_schedules.php | 4
mythweb/modules/tv/includes/schedule_utils.php | 4
mythweb/modules/tv/init.php | 4
mythweb/modules/tv/list.php | 4
mythweb/modules/tv/list_recording_groups.php | 4
mythweb/modules/tv/list_shows_in_title_and_group.php | 4
mythweb/modules/tv/list_titles_in_group.php | 4
mythweb/modules/tv/opensearch.php | 4
mythweb/modules/tv/recorded.php | 4
mythweb/modules/tv/schedules.php | 4
mythweb/modules/tv/schedules_custom.php | 4
mythweb/modules/tv/schedules_manual.php | 4
mythweb/modules/tv/search.php | 4
mythweb/modules/tv/searches.php | 4
mythweb/modules/tv/set_channels.php | 4
mythweb/modules/tv/set_playgroup.php | 4
mythweb/modules/tv/set_screens.php | 4
mythweb/modules/tv/set_session.php | 4
mythweb/modules/tv/submenu.php | 4
mythweb/modules/tv/tmpl/default/channel.php | 4
mythweb/modules/tv/tmpl/default/detail.php | 4
mythweb/modules/tv/tmpl/default/list.php | 4
mythweb/modules/tv/tmpl/default/list_data.php | 4
mythweb/modules/tv/tmpl/default/recorded.php | 4
mythweb/modules/tv/tmpl/default/schedules.php | 4
mythweb/modules/tv/tmpl/default/schedules_custom.php | 4
mythweb/modules/tv/tmpl/default/schedules_manual.php | 4
mythweb/modules/tv/tmpl/default/search.php | 4
mythweb/modules/tv/tmpl/default/searches.php | 4
mythweb/modules/tv/tmpl/default/set_channels.php | 4
mythweb/modules/tv/tmpl/default/set_playgroup.php | 4
mythweb/modules/tv/tmpl/default/set_screens.php | 4
mythweb/modules/tv/tmpl/default/set_session.php | 4
mythweb/modules/tv/tmpl/default/upcoming.php | 4
mythweb/modules/tv/tmpl/default/welcome.php | 4
mythweb/modules/tv/tmpl/iPod/detail.php | 4
mythweb/modules/tv/tmpl/iPod/list_recording_groups.php | 4
mythweb/modules/tv/tmpl/iPod/list_shows_in_title_and_group.php | 4
mythweb/modules/tv/tmpl/iPod/list_titles_in_group.php | 4
mythweb/modules/tv/tmpl/iPod/search.php | 4
mythweb/modules/tv/tmpl/iPod/submenu.php | 4
mythweb/modules/tv/tmpl/iPod/upcoming.php | 4
mythweb/modules/tv/tmpl/iPod/welcome.php | 4
mythweb/modules/tv/tmpl/ical/upcoming.php | 4
mythweb/modules/tv/tmpl/lite/channel.php | 4
mythweb/modules/tv/tmpl/lite/detail.php | 4
mythweb/modules/tv/tmpl/lite/list.php | 4
mythweb/modules/tv/tmpl/lite/recorded.php | 4
mythweb/modules/tv/tmpl/lite/schedules.php | 4
mythweb/modules/tv/tmpl/lite/schedules_custom.php | 4
mythweb/modules/tv/tmpl/lite/schedules_manual.php | 4
mythweb/modules/tv/tmpl/lite/search.php | 4
mythweb/modules/tv/tmpl/lite/searches.php | 4
mythweb/modules/tv/tmpl/lite/set_channels.php | 10 -
mythweb/modules/tv/tmpl/lite/set_session.php | 4
mythweb/modules/tv/tmpl/lite/upcoming.php | 4
mythweb/modules/tv/tmpl/lite/welcome.php | 4
mythweb/modules/tv/tmpl/rss/recorded.php | 4
mythweb/modules/tv/tmpl/wap/channel.php | 4
mythweb/modules/tv/tmpl/wap/detail.php | 4
mythweb/modules/tv/tmpl/wap/list.php | 4
mythweb/modules/tv/tmpl/wap/recorded.php | 4
mythweb/modules/tv/tmpl/wap/search.php | 4
mythweb/modules/tv/tmpl/wap/upcoming.php | 4
mythweb/modules/tv/upcoming.php | 4
mythweb/modules/video/edit.php | 4
mythweb/modules/video/handler.php | 4
mythweb/modules/video/imdb.php | 4
mythweb/modules/video/init.php | 4
mythweb/modules/video/scan.php | 4
mythweb/modules/video/set_settings.php | 4
mythweb/modules/video/tmpl/default/set_settings.php | 4
mythweb/modules/video/tmpl/default/video.php | 4
mythweb/modules/video/tmpl/default/welcome.php | 4
mythweb/modules/weather/classes/WeatherScreen.php | 4
mythweb/modules/weather/handler.php | 4
mythweb/modules/weather/init.php | 4
mythweb/modules/weather/set_screen.php | 4
mythweb/modules/weather/tmpl/default/set_screen.php | 4
mythweb/modules/weather/tmpl/default/weather.18h.php | 4
mythweb/modules/weather/tmpl/default/weather.3d.php | 4
mythweb/modules/weather/tmpl/default/weather.6d.php | 4
mythweb/modules/weather/tmpl/default/weather.am.php | 4
mythweb/modules/weather/tmpl/default/weather.cc.php | 4
mythweb/modules/weather/tmpl/default/weather.php | 4
mythweb/modules/weather/tmpl/default/weather.sm.php | 4
mythweb/modules/weather/tmpl/default/welcome.php | 4
mythweb/modules/welcome.php | 4
mythweb/mythweb.php | 4
mythweb/mythweb.pl | 4
settings.pro | 2
234 files changed, 509 insertions(+), 516 deletions(-)
Index: mythplugins-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythplugins-0.23-svnfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythplugins-0.23-svnfixes.patch 29 May 2010 04:25:35 -0000 1.1
+++ mythplugins-0.23-svnfixes.patch 8 Jun 2010 19:15:42 -0000 1.2
@@ -242,6 +242,36 @@
m_view = new GLSingleView(itemList, pos, slideShow, sortOrder, this);
l->addWidget(m_view);
+diff -Naurp mythplugins-0.23-release/mythmusic/mythmusic/dbcheck.cpp mythplugins-0.23/mythmusic/mythmusic/dbcheck.cpp
+--- mythplugins-0.23-release/mythmusic/mythmusic/dbcheck.cpp 2009-10-12 02:28:43.000000000 -0400
++++ mythplugins-0.23/mythmusic/mythmusic/dbcheck.cpp 2010-06-06 00:54:24.555359000 -0400
+@@ -84,11 +84,6 @@ bool UpgradeMusicDatabaseSchema(void)
+ if (DBup->DBver.isEmpty())
+ return doUpgradeMusicDatabaseSchema(DBup->DBver);
+
+- // An upgrade is likely. Ensure we have a backup first:
+- if ((DBup->backupStatus == kDB_Backup_Unknown) ||
+- (DBup->backupStatus == kDB_Backup_Failed))
+- DBup->BackupDB();
+-
+ // Pop up messages, questions, warnings, et c.
+ switch (DBup->PromptForUpgrade("Music", true, false))
+ {
+diff -Naurp mythplugins-0.23-release/mythvideo/mythvideo/dbcheck.cpp mythplugins-0.23/mythvideo/mythvideo/dbcheck.cpp
+--- mythplugins-0.23-release/mythvideo/mythvideo/dbcheck.cpp 2010-01-18 21:10:45.000000000 -0500
++++ mythplugins-0.23/mythvideo/mythvideo/dbcheck.cpp 2010-06-06 00:54:24.555359000 -0400
+@@ -721,11 +721,6 @@ namespace
+ if (DBup->versionsBehind == 0) // same schema
+ return true;
+
+- // An upgrade is likely. Ensure we have a backup first:
+- if ((DBup->backupStatus == kDB_Backup_Unknown) ||
+- (DBup->backupStatus == kDB_Backup_Failed))
+- DBup->BackupDB();
+-
+ // Pop up messages, questions, warnings, et c.
+ switch (DBup->PromptForUpgrade("Video", true, false))
+ {
diff -Naurp mythplugins-0.23-release/mythweb/classes/Database/mysqlicompat.php mythplugins-0.23/mythweb/classes/Database/mysqlicompat.php
--- mythplugins-0.23-release/mythweb/classes/Database/mysqlicompat.php 2008-11-08 21:42:14.000000000 -0500
+++ mythplugins-0.23/mythweb/classes/Database/mysqlicompat.php 2008-11-08 21:42:14.216654000 -0500
mythtv-0.23-svnfixes.patch:
VERSION | 1
bindings/perl/IO/Socket/INET/MythTV.pm | 4 -
bindings/perl/MythTV.pm | 11 +-
bindings/perl/MythTV/Channel.pm | 64 ++++++++--------
bindings/perl/MythTV/Program.pm | 4 -
bindings/perl/MythTV/Recording.pm | 4 -
bindings/perl/MythTV/StorageGroup.pm | 4 -
bindings/python/MythTV/MythData.py | 4 -
bindings/python/MythTV/MythFunc.py | 13 ++-
configure | 18 ++--
contrib/config_files/lirc/lircrc.native.example.mceusb2 | 2
contrib/icons/master_iconmap/channel_icons.pl | 4 -
contrib/maintenance/flush_deleted_recgroup.pl | 4 -
contrib/maintenance/optimize_mythdb.pl | 4 -
contrib/user_jobs/firewire_primer.pl | 4 -
contrib/user_jobs/mythlink.pl | 4 -
libs/libavcodec/libavcodec.pro | 5 -
libs/libmyth/audiooutputpulse.cpp | 13 ++-
libs/libmyth/mythcontext.cpp | 9 +-
libs/libmyth/schemawizard.cpp | 17 ++++
libs/libmythdb/mythdirs.cpp | 5 -
libs/libmythdvdnav/libmythdvdnav.pro | 3
libs/libmythsoundtouch/AAFilter.cpp | 2
libs/libmythsoundtouch/AAFilter.h | 2
libs/libmythsoundtouch/BPMDetect.h | 2
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 2
libs/libmythsoundtouch/FIFOSampleBuffer.h | 2
libs/libmythsoundtouch/FIFOSamplePipe.h | 2
libs/libmythsoundtouch/FIRFilter.cpp | 2
libs/libmythsoundtouch/FIRFilter.h | 2
libs/libmythsoundtouch/RateTransposer.cpp | 2
libs/libmythsoundtouch/RateTransposer.h | 2
libs/libmythsoundtouch/STTypes.h | 2
libs/libmythsoundtouch/SoundTouch.cpp | 2
libs/libmythsoundtouch/SoundTouch.h | 2
libs/libmythsoundtouch/TDStretch.cpp | 2
libs/libmythsoundtouch/TDStretch.h | 2
libs/libmythsoundtouch/cpu_detect.h | 2
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 2
libs/libmythsoundtouch/mmx_gcc.cpp | 2
libs/libmythtv/avformatdecoder.cpp | 17 ++++
libs/libmythtv/dbcheck.cpp | 9 --
libs/libmythtv/tv_play.cpp | 19 +---
libs/libmythtv/tv_play.h | 2
libs/libmythui/mythmainwindow.cpp | 12 +--
libs/libmythui/mythsystem.cpp | 4 -
libs/libmythui/xmlparsebase.cpp | 6 -
libs/libswscale/libswscale.pro | 6 +
programs/mythbackend/main.cpp | 7 +
programs/mythcommflag/main.cpp | 35 +++++++-
programs/mythtv-setup/main.cpp | 2
settings.pro | 2
version.pro | 2
53 files changed, 221 insertions(+), 139 deletions(-)
Index: mythtv-0.23-svnfixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythtv-0.23-svnfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.23-svnfixes.patch 29 May 2010 04:25:35 -0000 1.1
+++ mythtv-0.23-svnfixes.patch 8 Jun 2010 19:15:42 -0000 1.2
@@ -187,7 +187,7 @@
dtv_multiplex.sourceid AS dtv_sourceid,
diff -Naurp mythtv-0.23-release/bindings/python/MythTV/MythData.py mythtv-0.23/bindings/python/MythTV/MythData.py
--- mythtv-0.23-release/bindings/python/MythTV/MythData.py 2010-04-21 00:46:55.000000000 -0400
-+++ mythtv-0.23/bindings/python/MythTV/MythData.py 2010-05-19 23:43:41.152467000 -0400
++++ mythtv-0.23/bindings/python/MythTV/MythData.py 2010-06-06 20:03:02.104550000 -0400
@@ -175,7 +175,7 @@ class FileTransfer( MythBEConn ):
if not self.open:
return
@@ -197,6 +197,15 @@
self.socket.shutdown(1)
self.socket.close()
self.open = False
+@@ -526,6 +526,8 @@ class Program( DictData ):
+ if type != 'r':
+ raise MythFileError(MythError.FILE_FAILED_WRITE, self.filename,
+ 'Program () objects cannot be opened for writing')
++ if not self.filename.startswith('myth://'):
++ self.filename = 'myth://%s/%s' % (self.hostname, self.filename)
+ return ftopen(self.filename, 'r')
+
+ class Record( DBDataWrite ):
diff -Naurp mythtv-0.23-release/bindings/python/MythTV/MythFunc.py mythtv-0.23/bindings/python/MythTV/MythFunc.py
--- mythtv-0.23-release/bindings/python/MythTV/MythFunc.py 2010-03-31 15:07:44.000000000 -0400
+++ mythtv-0.23/bindings/python/MythTV/MythFunc.py 2010-05-23 15:52:40.992320000 -0400
@@ -397,6 +406,29 @@
QMAKE_CFLAGS_SHLIB =
}
+diff -Naurp mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp mythtv-0.23/libs/libmyth/audiooutputpulse.cpp
+--- mythtv-0.23-release/libs/libmyth/audiooutputpulse.cpp 2009-11-16 11:18:35.000000000 -0500
++++ mythtv-0.23/libs/libmyth/audiooutputpulse.cpp 2010-06-07 23:31:50.923907000 -0400
+@@ -554,9 +554,16 @@ bool AudioOutputPulseAudio::ConnectPlayb
+ else
+ pa_cvolume_reset(&volume_control, audio_channels);
+
+- // set myth sizes and pa buffer metrics
+- fragment_size = (float)sample_rate * 0.020f * // 20msec
+- (float)(audio_bits / 8 * audio_channels);
++ // set myth sizes and pa buffer metrics (20 ms)
++ // Note: The 20 is an unsigned long (at least 32 bits).
++ // sample_rate, audio_bits and audio_channels are at least
++ // that size, so the math will be done with a range of at
++ // least 2 billion. If we assume a max audio_bits of 32,
++ // audio_channels of 16 and sample_rate of <= 448000, then
++ // the largest number will be 230 million, well within range.
++ fragment_size = 20UL * sample_rate * audio_bits * audio_channels
++ / 8 /* 8 bits per byte */ / 1000 /* 1000 ms per second */;
++
+ soundcard_buffer_size = 16 * fragment_size;
+ buffer_settings.maxlength = soundcard_buffer_size;
+ buffer_settings.tlength = fragment_size * 4;
diff -Naurp mythtv-0.23-release/libs/libmyth/mythcontext.cpp mythtv-0.23/libs/libmyth/mythcontext.cpp
--- mythtv-0.23-release/libs/libmyth/mythcontext.cpp 2010-03-23 20:43:43.000000000 -0400
+++ mythtv-0.23/libs/libmyth/mythcontext.cpp 2010-05-14 18:39:42.189261000 -0400
@@ -425,20 +457,24 @@
}
diff -Naurp mythtv-0.23-release/libs/libmyth/schemawizard.cpp mythtv-0.23/libs/libmyth/schemawizard.cpp
--- mythtv-0.23-release/libs/libmyth/schemawizard.cpp 2010-01-22 12:12:23.000000000 -0500
-+++ mythtv-0.23/libs/libmyth/schemawizard.cpp 2010-05-23 19:30:49.920201000 -0400
-@@ -261,6 +261,11 @@ SchemaUpgradeWizard::PromptForUpgrade(co
++++ mythtv-0.23/libs/libmyth/schemawizard.cpp 2010-06-06 00:54:24.555359000 -0400
+@@ -261,6 +261,15 @@ SchemaUpgradeWizard::PromptForUpgrade(co
return MYTH_SCHEMA_USE_EXISTING;
#endif
-+ // Only back up the database if it's old/about to be upgraded
-+ // (not if it's too new)
-+ // or if a user is doing something they probably shouldn't ("expert mode")
-+ if ((upgradeAllowed && (versionsBehind > 0)) || m_expertMode)
++ // Only back up the database if we haven't already successfully made a
++ // backup and the database is old/about to be upgraded (not if it's too
++ // new) or if a user is doing something they probably shouldn't ("expert
++ // mode")
++ if (((backupStatus == kDB_Backup_Unknown) ||
++ (backupStatus == kDB_Backup_Failed)) &&
++ ((upgradeAllowed && (versionsBehind > 0)) ||
++ m_expertMode))
+ BackupDB();
connections = CountClients() > 1;
gui = GetMythUI()->IsScreenSetup() && gContext->GetMainWindow();
-@@ -314,6 +319,14 @@ SchemaUpgradeWizard::PromptForUpgrade(co
+@@ -314,6 +323,14 @@ SchemaUpgradeWizard::PromptForUpgrade(co
return MYTH_SCHEMA_EXIT;
}
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-12/mythtv.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mythtv.spec 29 May 2010 04:25:35 -0000 1.67
+++ mythtv.spec 8 Jun 2010 19:15:43 -0000 1.68
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r24896
+%define _svnrev r25048
%define branch release-0-23-fixes
#
@@ -81,7 +81,7 @@
%if "%{branch}" == "trunk"
Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -132,7 +132,6 @@
Patch0: mythtv-%{version}-svnfixes.patch
Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
Patch1: mythplugins-%{version}-svnfixes.patch
-Patch2: mythtv-version.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
Source102: mythbackend.init
@@ -842,7 +841,6 @@
cd mythtv-%{version}
%patch0 -p1
-%patch2 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -980,7 +978,7 @@
--enable-debug
# Insert rpm version-release for mythbackend --version output
- sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh
+ echo 'SOURCE_VERSION="%{version}-%{release} (%_svnrev)"' > VERSION
# Make
make %{?_smp_mflags}
@@ -1479,6 +1477,12 @@
################################################################################
%changelog
+* Tue Jun 08 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-3
+- Update to release-0-23-fixes branch, svn revision 25048
+- Includes pulseaudio white noise and seeking fixes (rpmfusion bz#1260)
+- Wire up improved support for running the backend as a non-root user,
+ must be enabled by the user, see caveats in /etc/sysconfig/mythbackend
+
* Sat May 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-2
- Update to release-0-23-fixes branch, svn revision 24896
--- mythtv-version.patch DELETED ---
13 years, 11 months
- 1
- 0
rpms/mythtv/F-13 mythtv.spec, 1.82, 1.83 mythtv-version.patch, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22241
Modified Files:
mythtv.spec
Removed Files:
mythtv-version.patch
Log Message:
Remove no longer necessary version patch (doing it a cleaner way in the spec now, per a pointer from upstream)
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mythtv.spec 8 Jun 2010 14:40:56 -0000 1.82
+++ mythtv.spec 8 Jun 2010 19:14:57 -0000 1.83
@@ -132,7 +132,6 @@
Patch0: mythtv-%{version}-svnfixes.patch
Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
Patch1: mythplugins-%{version}-svnfixes.patch
-Patch2: mythtv-version.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig
Source102: mythbackend.init
@@ -842,7 +841,6 @@
cd mythtv-%{version}
%patch0 -p1
-#patch2 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -981,7 +979,6 @@
# Insert rpm version-release for mythbackend --version output
echo 'SOURCE_VERSION="%{version}-%{release} (%_svnrev)"' > VERSION
- #sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh
# Make
make %{?_smp_mflags}
--- mythtv-version.patch DELETED ---
13 years, 11 months
- 1
- 0