diff options
| -rw-r--r-- | deadbeef-plugin-medialib-git/.SRCINFO | 8 | ||||
| -rw-r--r-- | deadbeef-plugin-medialib-git/PKGBUILD | 13 | ||||
| -rw-r--r-- | deadbeef-plugin-medialib-git/ddb_medialib-iostream.patch | 29 | ||||
| -rw-r--r-- | deadbeef-plugin-medialib-git/ddb_medialib-makefile.patch | 14 |
4 files changed, 14 insertions, 50 deletions
diff --git a/deadbeef-plugin-medialib-git/.SRCINFO b/deadbeef-plugin-medialib-git/.SRCINFO index 7a52eb4..0b3ba2c 100644 --- a/deadbeef-plugin-medialib-git/.SRCINFO +++ b/deadbeef-plugin-medialib-git/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = deadbeef-plugin-medialib-git pkgdesc = DeaDBeeF media library plugin - pkgver = r100.g8111116 - pkgrel = 2 + pkgver = r102.ga9ae3c4 + pkgrel = 1 url = https://github.com/sgomin/ddb_medialib arch = i686 arch = x86_64 @@ -12,10 +12,8 @@ pkgbase = deadbeef-plugin-medialib-git depends = boost source = ddb_medialib::git+https://github.com/sgomin/ddb_medialib source = ddb_medialib-makefile.patch - source = ddb_medialib-iostream.patch sha256sums = SKIP - sha256sums = 979ec8cf3836a906dc70836fe2141438501a1ac450735dd2b5c3166a25c594d4 - sha256sums = 665b1f8c2571f8ad8b556856300ccdae8ce44cd256e43e2c73525ce54591ba61 + sha256sums = 38db1362fd3d6117b98b36499f508ac55bf9017f2068ad8cde38bd201f24133e pkgname = deadbeef-plugin-medialib-git diff --git a/deadbeef-plugin-medialib-git/PKGBUILD b/deadbeef-plugin-medialib-git/PKGBUILD index f9eae97..28cef44 100644 --- a/deadbeef-plugin-medialib-git/PKGBUILD +++ b/deadbeef-plugin-medialib-git/PKGBUILD @@ -4,8 +4,8 @@ _pkgname=ddb_medialib pkgname=deadbeef-plugin-medialib-git -pkgver=r100.g8111116 -pkgrel=2 +pkgver=r102.ga9ae3c4 +pkgrel=1 pkgdesc="DeaDBeeF media library plugin" arch=('i686' 'x86_64') url="https://github.com/sgomin/ddb_medialib" @@ -13,11 +13,9 @@ license=('custom') depends=('deadbeef' 'gtkmm3' 'boost') makedepends=('git') source=("${_pkgname}::git+https://github.com/sgomin/${_pkgname}" - "${_pkgname}-makefile.patch" - "${_pkgname}-iostream.patch") + "${_pkgname}-makefile.patch") sha256sums=('SKIP' - '979ec8cf3836a906dc70836fe2141438501a1ac450735dd2b5c3166a25c594d4' - '665b1f8c2571f8ad8b556856300ccdae8ce44cd256e43e2c73525ce54591ba61') + '38db1362fd3d6117b98b36499f508ac55bf9017f2068ad8cde38bd201f24133e') pkgver() { cd "${_pkgname}" @@ -31,9 +29,6 @@ prepare() { # Arch compile FLAGS patch -p1 -i ../${_pkgname}-makefile.patch - - # Fix missing iostream includes - patch -p1 -i ../${_pkgname}-iostream.patch } build() { diff --git a/deadbeef-plugin-medialib-git/ddb_medialib-iostream.patch b/deadbeef-plugin-medialib-git/ddb_medialib-iostream.patch deleted file mode 100644 index 265440c..0000000 --- a/deadbeef-plugin-medialib-git/ddb_medialib-iostream.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -r -u -N ddb_medialib/main_widget.cpp ddb_medialib-iostream/main_widget.cpp ---- ddb_medialib/main_widget.cpp 2018-09-30 22:15:22.851442464 +0200 -+++ ddb_medialib-iostream/main_widget.cpp 2018-09-30 22:14:59.861088268 +0200 -@@ -3,6 +3,7 @@ - #include "settings_dlg.hpp" - #include "medialib.h" - -+#include <iostream> - #include <fstream> - - struct ByDirectoryColumns : Gtk::TreeModel::ColumnRecord -@@ -457,4 +458,4 @@ - { - locked->onChanged(/*restart*/true); - } --} -\ No newline at end of file -+} -diff -r -u -N ddb_medialib/scan_thread.cpp ddb_medialib-iostream/scan_thread.cpp ---- ddb_medialib/scan_thread.cpp 2018-09-30 22:15:22.851442464 +0200 -+++ ddb_medialib-iostream/scan_thread.cpp 2018-09-30 22:14:59.861088268 +0200 -@@ -4,6 +4,7 @@ - #include <boost/range.hpp> - #include <boost/scope_exit.hpp> - -+#include <iostream> - #include <thread> - - namespace pl = std::placeholders; diff --git a/deadbeef-plugin-medialib-git/ddb_medialib-makefile.patch b/deadbeef-plugin-medialib-git/ddb_medialib-makefile.patch index 19d7583..bc95198 100644 --- a/deadbeef-plugin-medialib-git/ddb_medialib-makefile.patch +++ b/deadbeef-plugin-medialib-git/ddb_medialib-makefile.patch @@ -1,14 +1,14 @@ -diff -r -u -N ddb_medialib/Makefile ddb_medialib-makefile/Makefile ---- ddb_medialib/Makefile 2018-09-30 22:01:37.524776612 +0200 -+++ ddb_medialib-makefile/Makefile 2018-09-30 22:03:31.003392745 +0200 +diff -u -r -N ddb_medialib-orig/Makefile ddb_medialib-makefile/Makefile +--- ddb_medialib-orig/Makefile 2021-01-15 20:53:07.358290582 +0100 ++++ ddb_medialib-makefile/Makefile 2021-01-15 20:52:50.691678078 +0100 @@ -18,8 +18,8 @@ CXXFLAGS += -DDEBUG -ggdb3 -Wall CCFLAGS += -DDEBUG -ggdb3 -Wall else -- CXXFLAGS += -DNDEBUG -O3 -- CCFLAGS += -DNDEBUG -O3 -+ CXXFLAGS += -DNDEBUG $(CXXOPT) -+ CCFLAGS += -DNDEBUG $(COPT) +- CXXFLAGS += -DNDEBUG -O3 -fomit-frame-pointer +- CCFLAGS += -DNDEBUG -O3 -fomit-frame-pointer ++ CXXFLAGS += -DNDEBUG -O3 -fomit-frame-pointer $(COPT) ++ CCFLAGS += -DNDEBUG -O3 -fomit-frame-pointer $(COPT) endif ifdef GTK2 |