[qmmp-plugins-freeworld] version bump to 1.2.2
by Karel Volný
commit 3146fe2e6a1c600018325a91309811df6a8cbf23
Author: Karel Volny <kvolny(a)redhat.com>
Date: Mon Jun 4 10:40:17 2018 +0200
version bump to 1.2.2
.gitignore | 1 +
ffmpeg35_buildfix.patch | 12 ------------
qmmp-plugins-freeworld.spec | 18 +++++++++++++-----
sources | 2 +-
4 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0220cd..23526f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ qmmp-0.9.6.tar.bz2
/qmmp-1.1.9.tar.bz2
/qmmp-1.1.10.tar.bz2
/qmmp-1.1.12.tar.bz2
+/qmmp-1.2.2.tar.bz2
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index c2ff299..ce6be70 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
-Version: 1.1.12
-Release: 4%{?dist}
+Version: 1.2.2
+Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -8,7 +8,6 @@ License: GPLv2+
URL: http://qmmp.ylsoftware.com/
Source: http://qmmp.ylsoftware.com/files/qmmp-%{version}.tar.bz2
Source2: qmmp-filter-provides.sh
-Patch0: ffmpeg35_buildfix.patch
%define _use_internal_dependency_generator 0
%define __find_provides %{_builddir}/%{buildsubdir}/qmmp-filter-provides.sh
@@ -27,13 +26,12 @@ Supplements: qmmp
%description
Qmmp is an audio-player, written with help of Qt library.
-This package contains plugins needed to play AAC, MPEG (.mp3) and WMA files,
+This package contains plugins needed to play AAC and WMA files,
and also the mplayer plugin for video playback.
%prep
%setup -q -n qmmp-%{version}
-%patch0 -p1
cp %{SOURCE2} .
chmod +x qmmp-filter-provides.sh
# adjust includes for the header move in latest ffmpeg
@@ -65,6 +63,7 @@ sed -i \
-D USE_GME:BOOL=FALSE \
-D USE_OPUS:BOOL=FALSE \
-D USE_SID:BOOL=FALSE \
+ -D USE_ARCHIVE:BOOL=FALSE \
\
-D USE_ALSA:BOOL=FALSE \
-D USE_JACK:BOOL=FALSE \
@@ -73,12 +72,14 @@ sed -i \
-D USE_PULSE:BOOL=FALSE \
-D USE_NULL:BOOL=FALSE \
-D USE_WAVEOUT:BOOL=FALSE \
+ -D USE_SHOUT:BOOL=FALSE \
\
-D USE_SRC:BOOL=FALSE \
-D USE_BS2B:BOOL=FALSE \
-D USE_LADSPA:BOOL=FALSE \
-D USE_CROSSFADE:BOOL=FALSE \
-D USE_STEREO:BOOL=FALSE \
+ -D USE_FILEWRITER:BOOL=FALSE \
\
-D USE_ANALYZER:BOOL=FALSE \
-D USE_PROJECTM:BOOL=FALSE \
@@ -175,6 +176,13 @@ fi
%changelog
+* Mon Jun 04 2018 Karel Volný <kvolny(a)redhat.com> 1.2.2-1
+- version bump to 1.2.2
+
+* Fri Apr 20 2018 Karel Volný <kvolny(a)redhat.com> 1.2.1-1
+- version bump to 1.2.1
+- removed patch to compile with newer ffmpeg (ffmpeg35_buildfix.patch)
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.1.12-4
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index f79cd82..dd7603f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93d77db6cb5a5020c1f76a26a82d384e qmmp-1.1.12.tar.bz2
+42e6a4cfc315ed893554c2df99ba1b4b qmmp-1.2.2.tar.bz2
5 years, 11 months
[amule/el7] (26 commits) ...el7 compat
by Sérgio M. Basto
Summary of changes:
ab8df67... Fix build (*)
38a5282... Fix docs (*)
02d347a... Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mas (*)
234f3c7... Clean spec file (*)
a9ed14b... Fix build on koji (*)
3f18770... Fixup for docdir (*)
4da8090... New upstream release (*)
22bd7ed... Uploading: amule-2.3.2.tar.gz (*)
ac98bd0... Restore %{?dist} (*)
c69addb... with-wx-config=/usr/bin/wx-config-3.0 (*)
b54ba55... Update changelog. (*)
99792e6... Back to wxGTK 2.8.12, wxGTK3.0 give me some problems. (*)
e2271e1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
3eb96b9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
a0be9aa... Disable xchat amule (*)
f75a6f0... Update changelog (*)
b7de23a... Add obsoletes/provides (*)
3f20d90... Clean up spec (*)
cbd1363... Spec clean-up and rebuilt for cryptopp (*)
8dc2b52... Update changelog (*)
c20b7c4... Add https://github.com/amule-project/amule/pull/120 (*)
3805843... git add 120.patch (*)
572fb11... Fix FTBFS with crypto++ 6.0.0 (*)
068ea36... Rebuilt for libupnp (*)
6705cbe... Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp (*)
872b1ec... el7 compat (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[amule/f27] (6 commits) ...el7 compat
by Sérgio M. Basto
Summary of changes:
c20b7c4... Add https://github.com/amule-project/amule/pull/120 (*)
3805843... git add 120.patch (*)
572fb11... Fix FTBFS with crypto++ 6.0.0 (*)
068ea36... Rebuilt for libupnp (*)
6705cbe... Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp (*)
872b1ec... el7 compat (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[amule/f28] (3 commits) ...el7 compat
by Sérgio M. Basto
Summary of changes:
068ea36... Rebuilt for libupnp (*)
6705cbe... Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp (*)
872b1ec... el7 compat (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 11 months
[amule] el7 compat
by Sérgio M. Basto
commit 872b1ec158af4cffd8c6d9300250344f0c1e102d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 3 18:34:49 2018 +0100
el7 compat
amule.spec | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/amule.spec b/amule.spec
index 65f77e0..c8636d2 100644
--- a/amule.spec
+++ b/amule.spec
@@ -7,7 +7,7 @@
Name: amule
Version: 2.3.2
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
@@ -15,7 +15,11 @@ Patch1: https://github.com/amule-project/amule/pull/120.patch
Patch2: libupnp1.8.patch
URL: http://amule.org
# See http://www.amule.org/wiki/index.php/Requirements
+%if 0%{?fedora} > 27 || 0%{?rhel} > 7
BuildRequires: compat-wxGTK3-gtk2-devel
+%else
+BuildRequires: wxGTK-devel >= 0:2.8.7
+%endif
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: gd-devel >= 2.0.0
@@ -49,7 +53,11 @@ It is useful for servers which don't have Xorg.
%prep
-%autosetup -p1
+%setup -q
+%patch1 -p1
+%if 0%{?fedora}
+%patch2 -p1 -b .libupnp1.8
+%endif
%build
./autogen.sh
@@ -152,6 +160,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%changelog
+* Sun Jun 03 2018 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-13
+- el7 compat
+
* Sun Jun 03 2018 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-12
- Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp1.8
5 years, 11 months
[amule] Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp1.8
by Sérgio M. Basto
commit 6705cbe12cc9cdd5da2fcbebad6a3b451b5b6eb5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 3 04:07:17 2018 +0100
Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp1.8
amule.spec | 24 ++++--
libupnp1.8.patch | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 248 insertions(+), 6 deletions(-)
---
diff --git a/amule.spec b/amule.spec
index 0d3146b..65f77e0 100644
--- a/amule.spec
+++ b/amule.spec
@@ -7,20 +7,29 @@
Name: amule
Version: 2.3.2
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
-Patch1 https://github.com/amule-project/amule/pull/120.patch
+Patch1: https://github.com/amule-project/amule/pull/120.patch
+Patch2: libupnp1.8.patch
URL: http://amule.org
# See http://www.amule.org/wiki/index.php/Requirements
-BuildRequires: wxGTK-devel >= 0:2.8.7, desktop-file-utils, expat-devel
-BuildRequires: gd-devel >= 2.0.0, libpng-devel
-BuildRequires: gettext-devel flex bison
-BuildRequires: readline-devel cryptopp-devel libupnp-devel
+BuildRequires: compat-wxGTK3-gtk2-devel
+BuildRequires: desktop-file-utils
+BuildRequires: expat-devel
+BuildRequires: gd-devel >= 2.0.0
+BuildRequires: libpng-devel
+BuildRequires: gettext-devel
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: readline-devel
+BuildRequires: cryptopp-devel
+BuildRequires: libupnp-devel
BuildRequires: binutils-devel
BuildRequires: GeoIP-devel
BuildRequires: libtool
+
Requires: %{name}-nogui
%description
@@ -143,6 +152,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%changelog
+* Sun Jun 03 2018 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-12
+- Move to compat-wxGTK3-gtk2 and add Debian patch for libupnp1.8
+
* Tue Apr 17 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.2-11
- Rebuilt for libupnp
diff --git a/libupnp1.8.patch b/libupnp1.8.patch
new file mode 100644
index 0000000..4317a66
--- /dev/null
+++ b/libupnp1.8.patch
@@ -0,0 +1,230 @@
+--- a/src/UPnPBase.cpp
++++ b/src/UPnPBase.cpp
+@@ -29,22 +29,12 @@
+
+ #ifdef ENABLE_UPNP
+
+-// check for broken Debian-hacked libUPnP
+ #include <upnp.h>
+-#ifdef STRING_H // defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better.
+-#define BROKEN_DEBIAN_LIBUPNP
+-#endif
+
+ #include "UPnPBase.h"
+
+ #include <algorithm> // For transform()
+
+-#ifdef BROKEN_DEBIAN_LIBUPNP
+- #define GET_UPNP_STRING(a) UpnpString_get_String(a)
+-#else
+- #define GET_UPNP_STRING(a) (a)
+-#endif
+-
+ std::string stdEmptyString;
+
+ const char s_argument[] = "argument";
+@@ -1127,7 +1117,7 @@
+
+
+ // This function is static
+-int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)
++int CUPnPControlPoint::Callback(Upnp_EventType EventType, const void *Event, void * /*Cookie*/)
+ {
+ std::ostringstream msg;
+ std::ostringstream msg2;
+@@ -1149,24 +1139,24 @@
+ msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
+ // UPnP Discovery
+ upnpDiscovery:
+- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
++ UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
+ IXML_Document *doc = NULL;
+ int ret;
+- if (d_event->ErrCode != UPNP_E_SUCCESS) {
+- msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";
++ if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) {
++ msg << UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(d_event)) << ".";
+ AddDebugLogLineC(logUPnP, msg);
+ }
+ // Get the XML tree device description in doc
+- ret = UpnpDownloadXmlDoc(d_event->Location, &doc);
++ ret = UpnpDownloadXmlDoc(UpnpDiscovery_get_Location_cstr(d_event), &doc);
+ if (ret != UPNP_E_SUCCESS) {
+ msg << "Error retrieving device description from " <<
+- d_event->Location << ": " <<
++ UpnpDiscovery_get_Location_cstr(d_event) << ": " <<
+ UpnpGetErrorMessage(ret) <<
+ "(" << ret << ").";
+ AddDebugLogLineC(logUPnP, msg);
+ } else {
+ msg2 << "Retrieving device description from " <<
+- d_event->Location << ".";
++ UpnpDiscovery_get_Location_cstr(d_event) << ".";
+ AddDebugLogLineN(logUPnP, msg2);
+ }
+ if (doc) {
+@@ -1195,7 +1185,7 @@
+ }
+ // Add the root device to our list
+ upnpCP->AddRootDevice(rootDevice, urlBase,
+- d_event->Location, d_event->Expires);
++ UpnpDiscovery_get_Location_cstr(d_event), UpnpDiscovery_get_Expires(d_event));
+ }
+ // Free the XML doc tree
+ IXML::Document::Free(doc);
+@@ -1216,28 +1206,28 @@
+ case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
+ //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
+ // UPnP Device Removed
+- struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;
+- if (dab_event->ErrCode != UPNP_E_SUCCESS) {
++ UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
++ if (UpnpDiscovery_get_ErrCode(dab_event) != UPNP_E_SUCCESS) {
+ msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
+- UpnpGetErrorMessage(dab_event->ErrCode) <<
++ UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(dab_event)) <<
+ ".";
+ AddDebugLogLineC(logUPnP, msg);
+ }
+- std::string devType = dab_event->DeviceType;
++ std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);
+ // Check for an InternetGatewayDevice and removes it from the list
+ std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
+ if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
+- upnpCP->RemoveRootDevice(dab_event->DeviceId);
++ upnpCP->RemoveRootDevice(UpnpDiscovery_get_DeviceID_cstr(dab_event));
+ }
+ break;
+ }
+ case UPNP_EVENT_RECEIVED: {
+ //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
+ // Event reveived
+- struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+- const std::string Sid = e_event->Sid;
++ UpnpEvent *e_event = (UpnpEvent *)Event;
++ const std::string Sid = UpnpEvent_get_SID_cstr(e_event);
+ // Parses the event
+- upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);
++ upnpCP->OnEventReceived(Sid, UpnpEvent_get_EventKey(e_event), UpnpEvent_get_ChangedVariables(e_event));
+ break;
+ }
+ case UPNP_EVENT_SUBSCRIBE_COMPLETE:
+@@ -1252,16 +1242,15 @@
+ //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
+ msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
+ upnpEventRenewalComplete:
+- struct Upnp_Event_Subscribe *es_event =
+- (struct Upnp_Event_Subscribe *)Event;
+- if (es_event->ErrCode != UPNP_E_SUCCESS) {
++ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
++ if (UpnpEventSubscribe_get_ErrCode(es_event) != UPNP_E_SUCCESS) {
+ msg << "Error in Event Subscribe Callback";
+ UPnP::ProcessErrorMessage(
+- msg.str(), es_event->ErrCode, NULL, NULL);
++ msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
+ } else {
+ #if 0
+ TvCtrlPointHandleSubscribeUpdate(
+- GET_UPNP_STRING(es_event->PublisherUrl),
++ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
+ es_event->Sid,
+ es_event->TimeOut );
+ #endif
+@@ -1280,29 +1269,29 @@
+ msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
+ msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
+ upnpEventSubscriptionExpired:
+- struct Upnp_Event_Subscribe *es_event =
+- (struct Upnp_Event_Subscribe *)Event;
++ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+ Upnp_SID newSID;
+ memset(newSID, 0, sizeof(Upnp_SID));
+ int TimeOut = 1801;
+ int ret = UpnpSubscribe(
+ upnpCP->m_UPnPClientHandle,
+- GET_UPNP_STRING(es_event->PublisherUrl),
++
++ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
+ &TimeOut,
+ newSID);
+ if (ret != UPNP_E_SUCCESS) {
+ msg << "Error Subscribing to EventURL";
+ UPnP::ProcessErrorMessage(
+- msg.str(), es_event->ErrCode, NULL, NULL);
++ msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
+ } else {
+ ServiceMap::iterator it =
+- upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl));
++ upnpCP->m_ServiceMap.find(UpnpEventSubscribe_get_PublisherUrl_cstr(es_event));
+ if (it != upnpCP->m_ServiceMap.end()) {
+ CUPnPService &service = *(it->second);
+ service.SetTimeout(TimeOut);
+ service.SetSID(newSID);
+ msg2 << "Re-subscribed to EventURL '" <<
+- GET_UPNP_STRING(es_event->PublisherUrl) <<
++ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event) <<
+ "' with SID == '" <<
+ newSID << "'.";
+ AddDebugLogLineC(logUPnP, msg2);
+@@ -1321,17 +1310,16 @@
+ case UPNP_CONTROL_ACTION_COMPLETE: {
+ //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
+ // This is here if we choose to do this asynchronously
+- struct Upnp_Action_Complete *a_event =
+- (struct Upnp_Action_Complete *)Event;
+- if (a_event->ErrCode != UPNP_E_SUCCESS) {
++ UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
++ if (UpnpActionComplete_get_ErrCode(a_event) != UPNP_E_SUCCESS) {
+ UPnP::ProcessErrorMessage(
+ "UpnpSendActionAsync",
+- a_event->ErrCode, NULL,
+- a_event->ActionResult);
++ UpnpActionComplete_get_ErrCode(a_event), NULL,
++ UpnpActionComplete_get_ActionResult(a_event));
+ } else {
+ // Check the response document
+ UPnP::ProcessActionResponse(
+- a_event->ActionResult,
++ UpnpActionComplete_get_ActionResult(a_event),
+ "<UpnpSendActionAsync>");
+ }
+ /* No need for any processing here, just print out results.
+@@ -1342,12 +1330,11 @@
+ case UPNP_CONTROL_GET_VAR_COMPLETE: {
+ //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
+ msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
+- struct Upnp_State_Var_Complete *sv_event =
+- (struct Upnp_State_Var_Complete *)Event;
+- if (sv_event->ErrCode != UPNP_E_SUCCESS) {
++ UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
++ if (UpnpStateVarComplete_get_ErrCode(sv_event) != UPNP_E_SUCCESS) {
+ msg << "m_UpnpGetServiceVarStatusAsync";
+ UPnP::ProcessErrorMessage(
+- msg.str(), sv_event->ErrCode, NULL, NULL);
++ msg.str(), UpnpStateVarComplete_get_ErrCode(sv_event), NULL, NULL);
+ } else {
+ #if 0
+ // Warning: The use of UpnpGetServiceVarStatus and
+--- a/src/UPnPBase.h
++++ b/src/UPnPBase.h
+@@ -490,9 +490,19 @@
+ // Callback function
+ static int Callback(
+ Upnp_EventType EventType,
+- void* Event,
++ const void* Event,
+ void* Cookie);
+
++#if UPNP_VERSION < 10800
++ /* in libupnp 1.6 Event is not const */
++ static int Callback(
++ Upnp_EventType EventType,
++ void* Event,
++ void* Cookie) {
++ return Callback(EventType, (const void *)Event, Cookie);
++ }
++#endif
++
+ private:
+ void OnEventReceived(
+ const std::string &Sid,
5 years, 11 months
