summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2006-03-21 14:22:04 +0000
committerJoerg Bornkessel <hd_brummy@gentoo.org>2006-03-21 14:22:04 +0000
commit2152e595def45e80f59abf652efae81057914012 (patch)
treebf9cc57e4fdb4556ef6ff36b8436d7cf801b8784 /media-plugins/vdr-cdda/files
parentchanged depend - also compiles with vdr-1.2.6 (diff)
downloadhistorical-2152e595def45e80f59abf652efae81057914012.tar.gz
historical-2152e595def45e80f59abf652efae81057914012.tar.bz2
historical-2152e595def45e80f59abf652efae81057914012.zip
added new patch; included fix problems on cStatus, reported, fixed by L.Muresan
Package-Manager: portage-2.0.54
Diffstat (limited to 'media-plugins/vdr-cdda/files')
-rw-r--r--media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.05
-rw-r--r--media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff11
-rw-r--r--media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch41
3 files changed, 41 insertions, 16 deletions
diff --git a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0 b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
index 7800bdeda2da..fd15e09bbeeb 100644
--- a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
+++ b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
@@ -1,6 +1 @@
-MD5 654b9e6b0fa5e509c9d623cd1ddc9abe cdda-0.1.0.patch 782
-RMD160 4d6baf996a951af583f01ac8d3e9553461053d7b cdda-0.1.0.patch 782
-SHA256 56cdfaaf1c2444859a959e4d798599976d1bf7d5b90f100ef7a03d10219d15a9 cdda-0.1.0.patch 782
MD5 fc49e48dd7d3f68d3451ad5f589f74cf vdr-cdda-0.1.0.tar.gz 43589
-RMD160 8bb2210252134b7bd4940e36c56f70cae3be00a9 vdr-cdda-0.1.0.tar.gz 43589
-SHA256 c68a9ff70bc8c794e582fd8702ffc30bf6c308209c0b0f4ca0136b7fac43c24c vdr-cdda-0.1.0.tar.gz 43589
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff
deleted file mode 100644
index 16e0926918eb..000000000000
--- a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdda-0.1.0/cdda_menu.h-orig 2006-03-09 18:46:52.657736750 +0100
-+++ cdda-0.1.0/cdda_menu.h 2006-03-09 18:48:37.752304750 +0100
-@@ -60,7 +60,7 @@
- char *mp_newCddbServerFqdn;
- int m_newCddbServerPort;
- int m_newInfoView;
-- const char *m_cddbPrioTxt[3];
-+ const char *m_cddbPrioTxt[4];
- protected:
- void Store(void);
- public:
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
new file mode 100644
index 000000000000..e8bac559f12d
--- /dev/null
+++ b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
@@ -0,0 +1,41 @@
+Lucian Muresan <lucianm@users.sourceforge.net> ( 21 Mar 2006 )
+modified in cStatus::MsgReplaying
+diff -u cdda-0.1.0.org/audio_player.c cdda-0.1.0/audio_player.c
+--- cdda-0.1.0.org/audio_player.c 2006-03-09 09:26:16.000000000 +0100
++++ cdda-0.1.0/audio_player.c 2006-03-09 09:26:35.000000000 +0100
+@@ -368,7 +368,11 @@
+ }
+
+ cAudioControl::~cAudioControl() {
++#if VDRVERSNUM >= 10338
++ cStatus::MsgReplaying(this, "cdda", NULL, false);
++#else
+ cStatus::MsgReplaying(this, NULL);
++#endif
+ free(mp_replayDescription);
+
+ delete player;
+@@ -469,7 +473,11 @@
+ mp_replayDescription = p_str;
+ p_str = NULL;
+
++#if VDRVERSNUM >= 10338
++ cStatus::MsgReplaying(this, mp_replayDescription, NULL, true);
++#else
+ cStatus::MsgReplaying(this, mp_replayDescription);
++#endif
+ } else
+ free(p_str);
+
+diff -u cdda-0.1.0.org/cdda_menu.h cdda-0.1.0/cdda_menu.h
+--- cdda-0.1.0.org/cdda_menu.h 2006-03-09 09:26:16.000000000 +0100
++++ cdda-0.1.0/cdda_menu.h 2006-03-09 09:27:43.000000000 +0100
+@@ -60,7 +60,7 @@
+ char *mp_newCddbServerFqdn;
+ int m_newCddbServerPort;
+ int m_newInfoView;
+- const char *m_cddbPrioTxt[3];
++ const char *m_cddbPrioTxt[4];
+ protected:
+ void Store(void);
+ public: