rpms/xorg-x11-drv-nvidia/F-11 blacklist-nouveau.conf, NONE, 1.1 xorg-x11-drv-nvidia.spec, 1.22, 1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25294/xorg-x11-drv-nvidia/F-11
Modified Files:
xorg-x11-drv-nvidia.spec
Added Files:
blacklist-nouveau.conf
Log Message:
Fix BZ 670#c4
--- NEW FILE blacklist-nouveau.conf ---
# RPM Fusion blacklist for nouveau driver - you need to run as root:
# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drv-nvidia.spec 22 Apr 2009 07:52:59 -0000 1.22
+++ xorg-x11-drv-nvidia.spec 1 Jul 2009 16:59:27 -0000 1.23
@@ -7,8 +7,8 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 180.51
-Release: 1%{?dist}
+Version: 185.18.14
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -18,6 +18,7 @@
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4: nvidia-settings.desktop
Source5: nvidia-init
+Source6: blacklist-nouveau.conf
Source10: nvidia-config-display
Source11: nvidia-README.Fedora
# So we don't pull other nvidia variants
@@ -229,6 +230,10 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+#Blacklist nouveau by F-11
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
@@ -264,6 +269,7 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
%{_bindir}/*
%{_sbindir}/*
@@ -282,6 +288,7 @@
%dir %{nvidialibdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
+%{nvidialibdir}/libcuda.so
%{nvidialibdir}/libGLcore.so
%{nvidialibdir}/libvdpau_nvidia.so
%{nvidialibdir}/libvdpau_trace.so
@@ -297,13 +304,23 @@
%{_includedir}/nvidia/cuda/*.h
%{_includedir}/nvidia/vdpau/*.h
%exclude %{nvidialibdir}/libXvMCNVIDIA.a
-%{nvidialibdir}/libcuda.so
+%exclude %{nvidialibdir}/libcuda.so
%{nvidialibdir}/libGL.so
%{nvidialibdir}/libvdpau.so
%{nvidialibdir}/libXvMCNVIDIA.so
%changelog
+* Wed Jul 1 2009 kwizart < kwizart at gmail.com > - 185.18.14-3
+- Fix libcuda.so runtime usage - BZ 670#c4
+ Workaround for cudart.so wrong behaviour
+
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 185.18.14-2
+- blacklist nouveau by default.
+
+* Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 185.18.14-1
+- Update to 185.18.14 (final)
+
* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1
- Update to 180.51 (stable)
- Add 71xx/beta/catalyst Conflicts
14 years, 10 months
rpms/xorg-x11-drv-nvidia/F-10 xorg-x11-drv-nvidia.spec,1.16,1.17
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25294/xorg-x11-drv-nvidia/F-10
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix BZ 670#c4
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-nvidia.spec 22 Apr 2009 07:53:00 -0000 1.16
+++ xorg-x11-drv-nvidia.spec 1 Jul 2009 16:59:26 -0000 1.17
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 180.51
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -282,6 +282,7 @@
%dir %{nvidialibdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
+%{nvidialibdir}/libcuda.so
%{nvidialibdir}/libGLcore.so
%{nvidialibdir}/libvdpau_nvidia.so
%{nvidialibdir}/libvdpau_trace.so
@@ -297,13 +298,17 @@
%{_includedir}/nvidia/cuda/*.h
%{_includedir}/nvidia/vdpau/*.h
%exclude %{nvidialibdir}/libXvMCNVIDIA.a
-%{nvidialibdir}/libcuda.so
+%exclude %{nvidialibdir}/libcuda.so
%{nvidialibdir}/libGL.so
%{nvidialibdir}/libvdpau.so
%{nvidialibdir}/libXvMCNVIDIA.so
%changelog
+* Wed Jul 1 2009 kwizart < kwizart at gmail.com > - 180.51-2
+- Fix libcuda.so runtime usage - BZ 670#c4
+ Workaround for cudart.so wrong behaviour
+
* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1
- Update to 180.51 (stable)
- Add 71xx/beta/catalyst Conflicts
14 years, 10 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.24,1.25
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25294/xorg-x11-drv-nvidia/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix BZ 670#c4
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-nvidia.spec 7 Jun 2009 09:23:23 -0000 1.24
+++ xorg-x11-drv-nvidia.spec 1 Jul 2009 16:59:27 -0000 1.25
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 185.18.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -288,6 +288,7 @@
%dir %{nvidialibdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
+%{nvidialibdir}/libcuda.so
%{nvidialibdir}/libGLcore.so
%{nvidialibdir}/libvdpau_nvidia.so
%{nvidialibdir}/libvdpau_trace.so
@@ -303,13 +304,17 @@
%{_includedir}/nvidia/cuda/*.h
%{_includedir}/nvidia/vdpau/*.h
%exclude %{nvidialibdir}/libXvMCNVIDIA.a
-%{nvidialibdir}/libcuda.so
+%exclude %{nvidialibdir}/libcuda.so
%{nvidialibdir}/libGL.so
%{nvidialibdir}/libvdpau.so
%{nvidialibdir}/libXvMCNVIDIA.so
%changelog
+* Wed Jul 1 2009 kwizart < kwizart at gmail.com > - 185.18.14-3
+- Fix libcuda.so runtime usage - BZ 670#c4
+ Workaround for cudart.so wrong behaviour
+
* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 185.18.14-2
- blacklist nouveau by default.
14 years, 10 months
rpms/gnome-mplayer/F-11 gnome-mplayer.spec,1.19,1.20
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22910
Modified Files:
gnome-mplayer.spec
Log Message:
* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
- Fixed screensaver inhibition
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-11/gnome-mplayer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-mplayer.spec 1 Jul 2009 16:17:53 -0000 1.19
+++ gnome-mplayer.spec 1 Jul 2009 16:18:40 -0000 1.20
@@ -11,7 +11,6 @@
Patch0: gnome-mplayer-flatvolume.patch
Patch1: gnome-mplayer-inhibit.patch
%endif
-Patch1: gnome-mplayer-inhibit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
14 years, 10 months
rpms/gnome-mplayer/devel gnome-mplayer.spec,1.20,1.21
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22834
Modified Files:
gnome-mplayer.spec
Log Message:
* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
- Fixed screensaver inhibition
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-mplayer.spec 1 Jul 2009 16:17:48 -0000 1.20
+++ gnome-mplayer.spec 1 Jul 2009 16:18:34 -0000 1.21
@@ -11,7 +11,6 @@
Patch0: gnome-mplayer-flatvolume.patch
Patch1: gnome-mplayer-inhibit.patch
%endif
-Patch1: gnome-mplayer-inhibit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
14 years, 10 months
rpms/gnome-mplayer/F-11 gnome-mplayer-inhibit.patch, NONE, 1.1 gnome-mplayer.spec, 1.18, 1.19
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22518
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-inhibit.patch
Log Message:
* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
- Fixed screensaver inhibition
gnome-mplayer-inhibit.patch:
--- NEW FILE gnome-mplayer-inhibit.patch ---
Index: src/dbus-interface.h
===================================================================
--- src/dbus-interface.h (wersja 1365)
+++ src/dbus-interface.h (wersja 1366)
@@ -30,5 +30,6 @@
#include "support.h"
DBusConnection *connection;
-uint cookie;
+uint ss_cookie;
+uint sm_cookie;
gboolean dbus_hookup(gint windowid, gint controlid);
Index: src/dbus-interface.c
===================================================================
--- src/dbus-interface.c (wersja 1365)
+++ src/dbus-interface.c (wersja 1366)
@@ -1163,17 +1163,9 @@
void dbus_unhook()
{
-
- DBusMessage *message;
-
if (connection != NULL) {
- message =
- dbus_message_new_method_call("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver",
- "org.gnome.ScreenSaver", "UnInhibit");
- dbus_message_append_args(message, DBUS_TYPE_INT32, &cookie, DBUS_TYPE_INVALID);
- dbus_connection_send(connection, message, NULL);
- dbus_message_unref(message);
- // dbus_connection_close(connection);
+ dbus_enable_screensaver();
+ // dbus_connection_close(connection);
dbus_connection_unref(connection);
connection = NULL;
}
@@ -1184,13 +1176,22 @@
DBusMessage *message;
if (connection != NULL) {
- message =
- dbus_message_new_method_call("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver",
- "org.gnome.ScreenSaver", "UnInhibit");
- dbus_message_append_args(message, DBUS_TYPE_INT32, &cookie, DBUS_TYPE_INVALID);
+ message =
+ dbus_message_new_method_call("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver",
+ "org.gnome.ScreenSaver", "UnInhibit");
+ dbus_message_append_args(message, DBUS_TYPE_INT32, &ss_cookie, DBUS_TYPE_INVALID);
dbus_connection_send(connection, message, NULL);
dbus_message_unref(message);
- }
+
+ message =
+ dbus_message_new_method_call("org.gnome.SessionManager", "/org/gnome/SessionManager",
+ "org.gnome.SessionManager", "UnInhibit");
+ dbus_message_append_args(message, DBUS_TYPE_INT32, &sm_cookie, DBUS_TYPE_INVALID);
+ dbus_connection_send(connection, message, NULL);
+ dbus_message_unref(message);
+
+
+ }
}
void dbus_disable_screensaver()
@@ -1200,6 +1201,7 @@
DBusMessage *message;
const gchar *app;
const gchar *reason;
+ gint flags;
if (connection != NULL) {
dbus_error_init(&error);
@@ -1211,12 +1213,34 @@
dbus_message_append_args(message, DBUS_TYPE_STRING, &app, DBUS_TYPE_STRING, &reason,
DBUS_TYPE_INVALID);
reply_message = dbus_connection_send_with_reply_and_block(connection, message, 200, &error);
+
if (reply_message) {
- dbus_message_get_args(reply_message, &error, DBUS_TYPE_INT32, &cookie, NULL);
+ dbus_message_get_args(reply_message, &error, DBUS_TYPE_INT32, &ss_cookie, NULL);
dbus_message_unref(reply_message);
}
-
+
dbus_message_unref(message);
dbus_error_free(&error);
+
+
+ message =
+ dbus_message_new_method_call("org.gnome.SessionManager", "/org/gnome/SessionManager",
+ "org.gnome.SessionManager", "Inhibit");
+ app = g_strdup_printf("gnome-mplayer");
+ reason = g_strdup_printf("playback");
+ flags = 8;
+ dbus_message_append_args(message, DBUS_TYPE_STRING, &app, DBUS_TYPE_UINT32, &(idledata->windowid),
+ DBUS_TYPE_STRING, &reason, DBUS_TYPE_UINT32, &flags,
+ DBUS_TYPE_INVALID);
+ reply_message = dbus_connection_send_with_reply_and_block(connection, message, 200, &error);
+
+ if (reply_message) {
+ dbus_message_get_args(reply_message, &error, DBUS_TYPE_INT32, &sm_cookie, NULL);
+ dbus_message_unref(reply_message);
+ }
+
+ dbus_message_unref(message);
+ dbus_error_free(&error);
+
}
}
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-11/gnome-mplayer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-mplayer.spec 5 Jun 2009 18:49:02 -0000 1.18
+++ gnome-mplayer.spec 1 Jul 2009 16:17:53 -0000 1.19
@@ -1,6 +1,6 @@
Name: gnome-mplayer
Version: 0.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
@@ -9,7 +9,9 @@
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
%if 0%{?fedora} >= 11
Patch0: gnome-mplayer-flatvolume.patch
+Patch1: gnome-mplayer-inhibit.patch
%endif
+Patch1: gnome-mplayer-inhibit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -94,9 +96,11 @@
%if 0%{?fedora} >= 11
pushd generic
%patch0 -p0 -b .flatvolume
+%patch1 -p0 -b .inhibit
popd
pushd minimal
%patch0 -p0 -b .flatvolume
+%patch1 -p0 -b .inhibit
popd
%endif
@@ -200,6 +204,9 @@
%changelog
+* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
+- Fixed screensaver inhibition
+
* Sun Jun 05 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-1
- Updated to 0.9.6
- Dropped upstreamed patches
14 years, 10 months
rpms/gnome-mplayer/devel gnome-mplayer.spec,1.19,1.20
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22452
Modified Files:
gnome-mplayer.spec
Log Message:
* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
- Fixed screensaver inhibition
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-mplayer.spec 1 Jul 2009 16:16:53 -0000 1.19
+++ gnome-mplayer.spec 1 Jul 2009 16:17:48 -0000 1.20
@@ -9,6 +9,7 @@
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
%if 0%{?fedora} >= 11
Patch0: gnome-mplayer-flatvolume.patch
+Patch1: gnome-mplayer-inhibit.patch
%endif
Patch1: gnome-mplayer-inhibit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,11 +96,11 @@
%if 0%{?fedora} >= 11
pushd generic
%patch0 -p0 -b .flatvolume
-%patch2 -p0 -b .inhibit
+%patch1 -p0 -b .inhibit
popd
pushd minimal
%patch0 -p0 -b .flatvolume
-%patch2 -p0 -b .inhibit
+%patch1 -p0 -b .inhibit
popd
%endif
14 years, 10 months
rpms/gnome-mplayer/devel gnome-mplayer-inhibit.patch, NONE, 1.1 gnome-mplayer.spec, 1.18, 1.19
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22366
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-inhibit.patch
Log Message:
* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
- Fixed screensaver inhibition
gnome-mplayer-inhibit.patch:
--- NEW FILE gnome-mplayer-inhibit.patch ---
Index: src/dbus-interface.h
===================================================================
--- src/dbus-interface.h (wersja 1365)
+++ src/dbus-interface.h (wersja 1366)
@@ -30,5 +30,6 @@
#include "support.h"
DBusConnection *connection;
-uint cookie;
+uint ss_cookie;
+uint sm_cookie;
gboolean dbus_hookup(gint windowid, gint controlid);
Index: src/dbus-interface.c
===================================================================
--- src/dbus-interface.c (wersja 1365)
+++ src/dbus-interface.c (wersja 1366)
@@ -1163,17 +1163,9 @@
void dbus_unhook()
{
-
- DBusMessage *message;
-
if (connection != NULL) {
- message =
- dbus_message_new_method_call("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver",
- "org.gnome.ScreenSaver", "UnInhibit");
- dbus_message_append_args(message, DBUS_TYPE_INT32, &cookie, DBUS_TYPE_INVALID);
- dbus_connection_send(connection, message, NULL);
- dbus_message_unref(message);
- // dbus_connection_close(connection);
+ dbus_enable_screensaver();
+ // dbus_connection_close(connection);
dbus_connection_unref(connection);
connection = NULL;
}
@@ -1184,13 +1176,22 @@
DBusMessage *message;
if (connection != NULL) {
- message =
- dbus_message_new_method_call("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver",
- "org.gnome.ScreenSaver", "UnInhibit");
- dbus_message_append_args(message, DBUS_TYPE_INT32, &cookie, DBUS_TYPE_INVALID);
+ message =
+ dbus_message_new_method_call("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver",
+ "org.gnome.ScreenSaver", "UnInhibit");
+ dbus_message_append_args(message, DBUS_TYPE_INT32, &ss_cookie, DBUS_TYPE_INVALID);
dbus_connection_send(connection, message, NULL);
dbus_message_unref(message);
- }
+
+ message =
+ dbus_message_new_method_call("org.gnome.SessionManager", "/org/gnome/SessionManager",
+ "org.gnome.SessionManager", "UnInhibit");
+ dbus_message_append_args(message, DBUS_TYPE_INT32, &sm_cookie, DBUS_TYPE_INVALID);
+ dbus_connection_send(connection, message, NULL);
+ dbus_message_unref(message);
+
+
+ }
}
void dbus_disable_screensaver()
@@ -1200,6 +1201,7 @@
DBusMessage *message;
const gchar *app;
const gchar *reason;
+ gint flags;
if (connection != NULL) {
dbus_error_init(&error);
@@ -1211,12 +1213,34 @@
dbus_message_append_args(message, DBUS_TYPE_STRING, &app, DBUS_TYPE_STRING, &reason,
DBUS_TYPE_INVALID);
reply_message = dbus_connection_send_with_reply_and_block(connection, message, 200, &error);
+
if (reply_message) {
- dbus_message_get_args(reply_message, &error, DBUS_TYPE_INT32, &cookie, NULL);
+ dbus_message_get_args(reply_message, &error, DBUS_TYPE_INT32, &ss_cookie, NULL);
dbus_message_unref(reply_message);
}
-
+
dbus_message_unref(message);
dbus_error_free(&error);
+
+
+ message =
+ dbus_message_new_method_call("org.gnome.SessionManager", "/org/gnome/SessionManager",
+ "org.gnome.SessionManager", "Inhibit");
+ app = g_strdup_printf("gnome-mplayer");
+ reason = g_strdup_printf("playback");
+ flags = 8;
+ dbus_message_append_args(message, DBUS_TYPE_STRING, &app, DBUS_TYPE_UINT32, &(idledata->windowid),
+ DBUS_TYPE_STRING, &reason, DBUS_TYPE_UINT32, &flags,
+ DBUS_TYPE_INVALID);
+ reply_message = dbus_connection_send_with_reply_and_block(connection, message, 200, &error);
+
+ if (reply_message) {
+ dbus_message_get_args(reply_message, &error, DBUS_TYPE_INT32, &sm_cookie, NULL);
+ dbus_message_unref(reply_message);
+ }
+
+ dbus_message_unref(message);
+ dbus_error_free(&error);
+
}
}
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-mplayer.spec 5 Jun 2009 18:48:59 -0000 1.18
+++ gnome-mplayer.spec 1 Jul 2009 16:16:53 -0000 1.19
@@ -1,6 +1,6 @@
Name: gnome-mplayer
Version: 0.9.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
@@ -10,6 +10,7 @@
%if 0%{?fedora} >= 11
Patch0: gnome-mplayer-flatvolume.patch
%endif
+Patch1: gnome-mplayer-inhibit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -94,9 +95,11 @@
%if 0%{?fedora} >= 11
pushd generic
%patch0 -p0 -b .flatvolume
+%patch2 -p0 -b .inhibit
popd
pushd minimal
%patch0 -p0 -b .flatvolume
+%patch2 -p0 -b .inhibit
popd
%endif
@@ -200,6 +203,9 @@
%changelog
+* Wed Jul 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-2
+- Fixed screensaver inhibition
+
* Sun Jun 05 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.6-1
- Updated to 0.9.6
- Dropped upstreamed patches
14 years, 10 months
rpms/mpd/F-11 .cvsignore,1.4,1.5 mpd.spec,1.9,1.10 sources,1.4,1.5
by Adrian Reber
Author: adrian
Update of /cvs/free/rpms/mpd/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21330
Modified Files:
.cvsignore mpd.spec sources
Log Message:
* Mon Jun 29 2009 Adrian Reber <adrian(a)lisas.de> - 0.15-1
- updated to 0.15
- added "Conflicts: mpich2" (#593)
- added BR libmms-devel, libmodplug-devel, libsidplay-devel, bzip2-devel
zziplib-devel, sqlite-devel
- changed BR avahi-devel to avahi-glib-devel
- adapted config file fixups to newest config file layout
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 20 Feb 2009 21:52:11 -0000 1.4
+++ .cvsignore 1 Jul 2009 07:28:07 -0000 1.5
@@ -1 +1 @@
-mpd-0.14.2.tar.bz2
+mpd-0.15.tar.bz2
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-11/mpd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mpd.spec 29 Mar 2009 13:48:43 -0000 1.9
+++ mpd.spec 1 Jul 2009 07:28:08 -0000 1.10
@@ -1,11 +1,11 @@
Name: mpd
-Version: 0.14.2
-Release: 2%{?dist}
+Version: 0.15
+Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
URL: http://mpd.wikia.com/
-Source: http://downloads.sourceforge.net/musicpd/mpd-0.14.2.tar.bz2
+Source: http://downloads.sourceforge.net/musicpd/mpd-0.15.tar.bz2
Source1: mpd.init
Source2: 95-grant-audio-devices-to-mpd.fdi
@@ -24,7 +24,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: pulseaudio-lib-devel
BuildRequires: libsamplerate-devel
-BuildRequires: avahi-devel
+BuildRequires: avahi-glib-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: faad2-devel
BuildRequires: libmad-devel
@@ -32,11 +32,19 @@
BuildRequires: ffmpeg-devel
BuildRequires: wavpack-devel
BuildRequires: libcurl-devel
+BuildRequires: libmms-devel
+BuildRequires: libmodplug-devel
+BuildRequires: libsidplay-devel
+BuildRequires: bzip2-devel
+BuildRequires: zziplib-devel
+BuildRequires: sqlite-devel
Requires(pre): shadow-utils
Requires(post): chkconfig
Requires(preun): chkconfig /sbin/service
Requires(postun): /sbin/service
+Conflicts: mpich2
+
%description
Music Player Daemon (MPD) allows remote access for playing music (MP3, Ogg
Vorbis, FLAC, Mod, AAC and wave files) and managing playlists. MPD is designed
@@ -48,7 +56,7 @@
%setup -q
%build
-%configure --enable-mod
+%configure --enable-mikmod --enable-bzip2 --enable-zip
make %{?_smp_mflags}
%install
@@ -73,7 +81,11 @@
%{__sed} -i -e "s,~/.mpd/database,%{_localstatedir}/lib/%{name}/mpd.db,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
%{__sed} -i -e "s,~/.mpd/state,%{_localstatedir}/lib/%{name}/mpdstate,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
%{__sed} -i -e "s,#state_file,state_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e 's,#user "nobody",user "mpd",g' $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
+%{__sed} -i -e "s,#music_directory,music_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
+%{__sed} -i -e "s,#playlist_directory,playlist_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
+%{__sed} -i -e "s,#db_file,db_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
+%{__sed} -i -e "s,#log_file,log_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
+%{__sed} -i -e 's,#user.*"nobody",user "mpd",g' $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
%{__sed} -e "s,@bindir@,%{_bindir},g;s,@var@,%{_localstatedir},g" %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
@@ -137,6 +149,14 @@
%ghost %{_localstatedir}/lib/%{name}/mpdstate
%changelog
+* Mon Jun 29 2009 Adrian Reber <adrian(a)lisas.de> - 0.15-1
+- updated to 0.15
+- added "Conflicts: mpich2" (#593)
+- added BR libmms-devel, libmodplug-devel, libsidplay-devel, bzip2-devel
+ zziplib-devel, sqlite-devel
+- changed BR avahi-devel to avahi-glib-devel
+- adapted config file fixups to newest config file layout
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.14.2-2
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 20 Feb 2009 21:52:11 -0000 1.4
+++ sources 1 Jul 2009 07:28:08 -0000 1.5
@@ -1 +1 @@
-66817a4b4c05454e6488f6b821f2a6a3 mpd-0.14.2.tar.bz2
+2ed93a60bd703ba46d6794e12cfb5f1d mpd-0.15.tar.bz2
14 years, 10 months