!21 [sync] PR-19: Remove rpath
From: @openeuler-sync-bot Reviewed-by: @wk333 Signed-off-by: @wk333
This commit is contained in:
openeuler-ci-bot
Gitee
commit
505478beda
@ -1,24 +0,0 @@
|
||||
--- xmms-1.2.10/General/ir/ir.h.orig 2001-03-05 23:17:44.000000000 +1000
|
||||
+++ xmms-1.2.10/General/ir/ir.h 2005-03-24 20:48:31.000000000 +1000
|
||||
@@ -49,8 +49,6 @@
|
||||
}
|
||||
irConfig;
|
||||
|
||||
-extern pthread_t irapp_thread;
|
||||
-extern gboolean keepGoing;
|
||||
extern irConfig ircfg;
|
||||
extern gboolean irconf_is_going;
|
||||
|
||||
--- xmms-1.2.10/xmms/sm.c.orig 2004-01-11 18:33:00.000000000 +0100
|
||||
+++ xmms-1.2.10/xmms/sm.c 2004-04-12 22:44:28.000000000 +0200
|
||||
@@ -147,8 +147,9 @@
|
||||
|
||||
#else
|
||||
|
||||
-void sm_init(int argc, char **argv, const char *previous_session_id)
|
||||
+const char * sm_init(int argc, char **argv, const char *previous_session_id)
|
||||
{
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
void sm_cleanup(void)
|
||||
@ -1,77 +0,0 @@
|
||||
--- xmms-1.2.11-20071117cvs/xmms/main.c 2008-09-02 19:08:34.000000000 +0100
|
||||
+++ xmms-1.2.11-20071117cvs/xmms/main-new.c 2008-09-02 19:16:29.000000000 +0100
|
||||
@@ -307,6 +307,40 @@
|
||||
sizeof(mainwin_general_menu_entries) /
|
||||
sizeof(mainwin_general_menu_entries[0]);
|
||||
|
||||
+#include <kde/artsc/artsc.h>
|
||||
+#include <dlfcn.h>
|
||||
+
|
||||
+/* dlopen libarts, for seeing if we should use this as the default plugin. */
|
||||
+static int arts_running(void) {
|
||||
+ void *arts_handle;
|
||||
+ int (*a_init)(void);
|
||||
+ void (*a_close)(void);
|
||||
+ int ret = 0;
|
||||
+
|
||||
+ arts_handle = dlopen("libartsc.so.0", RTLD_NOW);
|
||||
+ if (!arts_handle)
|
||||
+ return 0;
|
||||
+
|
||||
+ a_init = dlsym(arts_handle, "arts_init");
|
||||
+ a_close = dlsym(arts_handle, "arts_free");
|
||||
+ if (!a_init || !a_close) {
|
||||
+ dlclose(arts_handle);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ signal(SIGPIPE, SIG_DFL);
|
||||
+ if ((*a_init)() == 0) {
|
||||
+ ret = 1;
|
||||
+ /* there are problems with library unloading in conjunction with X11, */
|
||||
+ /* (Arts::X11GlobalComm), so we don't unload stuff here */
|
||||
+ /* (*a_close)(); */
|
||||
+ }
|
||||
+ signal(SIGPIPE, SIG_IGN);
|
||||
+ dlclose(arts_handle);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
static void make_xmms_dir(void)
|
||||
{
|
||||
gchar *filename;
|
||||
@@ -503,6 +537,19 @@
|
||||
cfg.skin = g_strdup("/usr/share/xmms/Skins/Bluecurve-xmms.zip");
|
||||
if (cfg.outputplugin == NULL)
|
||||
{
|
||||
+ /* If aRts is running and the plugin is there, use that... */
|
||||
+ if (arts_running())
|
||||
+ {
|
||||
+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
|
||||
+ if (access(cfg.outputplugin, X_OK))
|
||||
+ {
|
||||
+ g_free(cfg.outputplugin);
|
||||
+ cfg.outputplugin = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ if (cfg.outputplugin == NULL)
|
||||
+ {
|
||||
#ifdef HAVE_OSS
|
||||
cfg.outputplugin = g_strdup_printf("%s/%s/libALSA.so", PLUGIN_DIR, plugin_dir_list[0]);
|
||||
#elif defined(sun)
|
||||
@@ -515,6 +562,13 @@
|
||||
cfg.outputplugin = g_strdup("");
|
||||
#endif
|
||||
}
|
||||
+ /* Migrate users of the previous arts plugin */
|
||||
+ if (!strcmp(g_basename(cfg.outputplugin),"libartsout.so")) {
|
||||
+ if (access(cfg.outputplugin,X_OK)) {
|
||||
+ g_free(cfg.outputplugin);
|
||||
+ cfg.outputplugin = g_strdup_printf("%s/%s/libarts.so", PLUGIN_DIR, plugin_dir_list[0]);
|
||||
+ }
|
||||
+ }
|
||||
if (cfg.eqpreset_default_file == NULL)
|
||||
cfg.eqpreset_default_file = g_strdup("dir_default.preset");
|
||||
if (cfg.eqpreset_extension == NULL)
|
||||
@ -1,7 +1,7 @@
|
||||
Name: xmms
|
||||
Epoch: 1
|
||||
Version: 1.2.11
|
||||
Release: 42.20071117cvs
|
||||
Release: 43.20071117cvs
|
||||
License: GPLv2+
|
||||
Summary: XMMS is a legacy GTK+1 music player modeled after Winamp
|
||||
URL: https://git.conf.top/public/rpmbuild/src/master/xmms
|
||||
@ -13,7 +13,7 @@ Source4: xmms.desktop
|
||||
Provides: xmms-esd = 1:%{version}-%{release} xmms-gui bundled(libmpg123) xmms-mp3 = %{version}-%{release} xmms-libs = 1:%{version}-%{release}
|
||||
Obsoletes: xmms-esd < 1:18.20071117cvs xmms-mp3 < 1.2.11-8 xmms-libs < 1:%{version}-%{release}
|
||||
BuildRequires: gtk+-devel alsa-lib-devel libogg-devel libvorbis-devel mikmod-devel gettext-devel
|
||||
BuildRequires: zlib-devel libGL-devel libXt-devel libSM-devel libXxf86vm-devel desktop-file-utils gcc
|
||||
BuildRequires: zlib-devel libGL-devel libXt-devel libSM-devel libXxf86vm-devel desktop-file-utils gcc chrpath
|
||||
Requires: unzip libcanberra-gtk2 gtk2
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
@ -76,6 +76,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
|
||||
install -Dpm 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm
|
||||
install -Dpm 644 xmms.pc %{buildroot}%{_libdir}/pkgconfig/xmms.pc
|
||||
%find_lang xmms
|
||||
chrpath -d %{buildroot}/%{_libexecdir}/*
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%postun
|
||||
@ -102,6 +104,9 @@ install -Dpm 644 xmms.pc %{buildroot}%{_libdir}/pkgconfig/xmms.pc
|
||||
%{_mandir}/man1/*xmms.1*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 12 2024 wangkai <13474090681@163.com> - 1:1.2.11-43.20071117cvs
|
||||
- Remove rpath
|
||||
|
||||
* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 1:1.2.11-42.20071117cvs
|
||||
- Add sw64 architecture
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user