[arch-commits] Commit in eq10q/trunk (4 files)

David Runge dvzrv at gemini.archlinux.org
Sun Aug 1 12:00:17 UTC 2021


    Date: Sunday, August 1, 2021 @ 12:00:16
  Author: dvzrv
Revision: 991952

upgpkg: eq10q 2.2-4: Rebuild to fix various issues.

Replace sed calls to fix issues with the CMakeLists.txt with a patch.
Replace sed calls to replace pow10 calls with exp10 calls with a patch.
Add a patch to allow building against lv2 >= 1.18.
Apply latest cmake package guidelines.
Update maintainer info.

Added:
  eq10q/trunk/eq10q-2.2-cmakelists.patch
  eq10q/trunk/eq10q-2.2-lv2.patch
  eq10q/trunk/eq10q-2.2-replace_pow10.patch
Modified:
  eq10q/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   54 ++++++++++++++++++++----------
 eq10q-2.2-cmakelists.patch    |   41 +++++++++++++++++++++++
 eq10q-2.2-lv2.patch           |   55 ++++++++++++++++++++++++++++++
 eq10q-2.2-replace_pow10.patch |   71 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 204 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-01 11:38:30 UTC (rev 991951)
+++ PKGBUILD	2021-08-01 12:00:16 UTC (rev 991952)
@@ -1,36 +1,56 @@
-# Maintainer: David Runge <dave at sleepmap.de>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
 pkgname=eq10q
 pkgver=2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Audio plugin bundle over the LV2 standard for Linux"
 arch=('x86_64')
 url="http://eq10q.sourceforge.net/"
 license=('GPL3')
 groups=('lv2-plugins' 'pro-audio')
-depends=('fftw' 'gtkmm')
+depends=('atkmm' 'libatkmm-1.6.so' 'cairomm' 'libcairomm-1.0.so' 'gcc-libs'
+'glibc' 'fftw' 'libfftw3.so' 'glibmm' 'libglibmm-2.4.so' 'gtkmm' 'libsigc++'
+'libsigc-2.0.so')
 makedepends=('cmake' 'lv2')
-source=("https://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('4c6a79e9f1faeb431abd4e94b6bfa153b1ff5f55b3c2734d35a865ba23e3a7786ee45ee122cdcc26c9a8de915f1c4e2ec588a4c219ad6daf0ccf4a2b474b1e24')
+source=("https://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz"
+  "${pkgname}-2.2-replace_pow10.patch"
+  "${pkgname}-2.2-lv2.patch"
+  "${pkgname}-2.2-cmakelists.patch"
+)
+sha512sums=('4c6a79e9f1faeb431abd4e94b6bfa153b1ff5f55b3c2734d35a865ba23e3a7786ee45ee122cdcc26c9a8de915f1c4e2ec588a4c219ad6daf0ccf4a2b474b1e24'
+            '40b3315597bfeccb5d34c5ff96ad300336f9da2e432d3278fbb371eb2cc33c0ac82a5b3d655f0a33e1868e993ffdb2b326891c37ed8ba8856d4ef52ef2a2f8f6'
+            '2e6ab8022413f28bd04f342c5d68608126f83c54fced1032863b11aaa809e4e931ba6257e71c48ffe18832acda33ba4091e83b159bad226ea0ac7e37bdee502d'
+            '62148cab1e0960740bc67acda7db8bcaf81ad12a4b2c283142d4cc93282e21d21195f103f3adadf956f95293e6324a279fae5b268d8f7bc70ff4eb477efe2994')
+b2sums=('453cf8e0dcb330e92dfa6be65a83c63c05450956ea9dcef49206d83758c8ea0746cde7d26932e709116a44eb2ce30bb29fa5a4753f5597e71128767b462cb024'
+        'd2396bd6880611181fde97a2eb009c14fc055b5b3dbee146cad9000b5ad38029fb33f5d28b3213e74da48867cdd44cc8adebd07072c264f89565b023103d24a5'
+        'ccd78f5751cc48acd63bcafd5cb714f6f4742a6725fc428485b69271585fc39edbaa60726528c10dfa5491a1b67541003adeda38e497b94995acd6cd4ffa376d'
+        '87d79c291e2da46626344bf8b7bebfb1eb9c8200b9818314db4d0fc732f17285338c9661bb3fb3a9c22963bff864f6ad51ee37e4d2cb816738056bf45805c755')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  # replacing use of deprecated pow10 with standardized exp10:
+  # replace use of deprecated pow10 with standardized exp10:
   # https://sourceforge.net/p/eq10q/bugs/13/
-  sed -e 's/pow10/exp10/g' -i gui/widgets/{bandctl,bodeplot}.cpp
-  # fix install location: https://sourceforge.net/p/eq10q/bugs/20/
-  sed -e '/CMAKE_INSTALL_PREFIX/d' \
-      -e 's|sapista|lib/lv2/sapista|g' -i CMakeLists.txt
-  mkdir -v build
+  patch -Np1 -i ../"${pkgname}-2.2-replace_pow10.patch"
+  # fix for lv2 >= 1.18:
+  # https://sourceforge.net/p/eq10q/bugs/23/
+  patch -Np1 -i ../"${pkgname}-2.2-lv2.patch"
+  # fix install location:
+  # https://sourceforge.net/p/eq10q/bugs/20/
+  patch -Np1 -i ../"${pkgname}-2.2-cmakelists.patch"
 }
 
 build() {
-  cd "$pkgname-$pkgver/build"
-  cmake .. \
-        -DCMAKE_INSTALL_PREFIX=/usr
+  cd "$pkgname-$pkgver"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE='None' \
+        -Wno-dev \
+        -B build \
+        -S .
+  make VERBOSE=1 -C build
 }
 
 package() {
-  cd "$pkgname-$pkgver/build"
-  make DESTDIR="$pkgdir/" install
-  install -vDm 644 ../README -t "${pkgdir}/usr/share/doc/${pkgname}"
+  cd "$pkgname-$pkgver"
+  make -C build DESTDIR="$pkgdir/" install
+  install -vDm 644 README -t "${pkgdir}/usr/share/doc/${pkgname}"
 }

Added: eq10q-2.2-cmakelists.patch
===================================================================
--- eq10q-2.2-cmakelists.patch	                        (rev 0)
+++ eq10q-2.2-cmakelists.patch	2021-08-01 12:00:16 UTC (rev 991952)
@@ -0,0 +1,41 @@
+diff -ruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2016-12-11 13:07:48.000000000 +0100
++++ b/CMakeLists.txt	2021-08-01 13:48:17.937034619 +0200
+@@ -11,9 +11,7 @@
+ 
+ ##ADD_DEFINITIONS(-Wall -O0 -g -fPIC -DPIC) ###USED FOR DEBUG
+ 
+-#Set Install prefix
+-set (CMAKE_INSTALL_PREFIX  "/usr/local/lib/lv2") #Install prefix
+-#set (CMAKE_INSTALL_PREFIX  "$ENV{HOME}/.lv2") #Install prefix
++set(LV2_LIB_DIR "lib/lv2")
+ set (LV2_BUNDLE "sapistaEQv2.lv2") #LV2 Bundel dir
+ set(EXECUTABLE_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/bin")
+ set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/bin")
+@@ -171,8 +169,8 @@
+ 
+ ##===========================THE LV2 INSTALLER================================================
+ #INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/${LV2_BUNDLE}" DESTINATION "${LV2_BUNDLE}")
+-INSTALL( FILES "manifest.ttl" "eq1qm.ttl" "eq1qs.ttl" "eq4qm.ttl" "eq4qs.ttl" "eq6qm.ttl" "eq6qs.ttl" "eq10qm.ttl" "eq10qs.ttl" "gate.ttl" "compressor.ttl" "compressor_sc.ttl" "gate_stereo.ttl" "compressor_stereo.ttl" "compressor_stereo_sc.ttl" "bassup.ttl" "lr2ms.ttl" "ms2lr.ttl" DESTINATION "${LV2_BUNDLE}")
+-INSTALL( TARGETS eq1qm eq1qs eq4qm eq4qs eq6qm eq6qs eq10qm eq10qs gate compressor compressor_sc gate_stereo compressor_stereo compressor_stereo_sc bassup matrix_lr2ms matrix_ms2lr DESTINATION "${LV2_BUNDLE}")
++INSTALL( FILES "manifest.ttl" "eq1qm.ttl" "eq1qs.ttl" "eq4qm.ttl" "eq4qs.ttl" "eq6qm.ttl" "eq6qs.ttl" "eq10qm.ttl" "eq10qs.ttl" "gate.ttl" "compressor.ttl" "compressor_sc.ttl" "gate_stereo.ttl" "compressor_stereo.ttl" "compressor_stereo_sc.ttl" "bassup.ttl" "lr2ms.ttl" "ms2lr.ttl" DESTINATION "${LV2_LIB_DIR}/${LV2_BUNDLE}")
++INSTALL( TARGETS eq1qm eq1qs eq4qm eq4qs eq6qm eq6qs eq10qm eq10qs gate compressor compressor_sc gate_stereo compressor_stereo compressor_stereo_sc bassup matrix_lr2ms matrix_ms2lr DESTINATION "${LV2_LIB_DIR}/${LV2_BUNDLE}")
+ 
+ INCLUDE(CPack)
+ # cpack -G TGZ
+diff -ruN a/gui/CMakeLists.txt b/gui/CMakeLists.txt
+--- a/gui/CMakeLists.txt	2016-12-11 13:07:53.000000000 +0100
++++ b/gui/CMakeLists.txt	2021-08-01 13:52:19.484456051 +0200
+@@ -43,8 +43,8 @@
+ set_target_properties(eq10q_gui dynamics_gui bassup_gui matrix_ms_gui PROPERTIES PREFIX "")
+ 
+ ##=================================INSTALLER=======================================================================
+-INSTALL( TARGETS eq10q_gui dynamics_gui bassup_gui matrix_ms_gui DESTINATION "${LV2_BUNDLE}/gui")
+-INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/gui/knobs" DESTINATION "${LV2_BUNDLE}/gui")
+-INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/gui/combopix" DESTINATION "${LV2_BUNDLE}/gui")
+-INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/gui/icons" DESTINATION "${LV2_BUNDLE}/gui")
++INSTALL( TARGETS eq10q_gui dynamics_gui bassup_gui matrix_ms_gui DESTINATION "${LV2_LIB_DIR}/${LV2_BUNDLE}/gui")
++INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/gui/knobs" DESTINATION "${LV2_LIB_DIR}/${LV2_BUNDLE}/gui")
++INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/gui/combopix" DESTINATION "${LV2_LIB_DIR}/${LV2_BUNDLE}/gui")
++INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/gui/icons" DESTINATION "${LV2_LIB_DIR}/${LV2_BUNDLE}/gui")
+ 

Added: eq10q-2.2-lv2.patch
===================================================================
--- eq10q-2.2-lv2.patch	                        (rev 0)
+++ eq10q-2.2-lv2.patch	2021-08-01 12:00:16 UTC (rev 991952)
@@ -0,0 +1,55 @@
+diff -ruN a/gui/bassup_ui.cpp b/gui/bassup_ui.cpp
+--- a/gui/bassup_ui.cpp	2016-12-11 13:07:52.000000000 +0100
++++ b/gui/bassup_ui.cpp	2021-08-01 13:22:38.061730413 +0200
+@@ -38,7 +38,7 @@
+ #define BASSUP_GUI_URI "http://eq10q.sourceforge.net/bassup/gui"
+ 
+ 
+-static LV2UI_Handle instantiateBassUp_gui(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
++static LV2UI_Handle instantiateBassUp_gui(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
+ {
+   #ifdef TESTING_EQ10Q
+   cout<<"instantiateEq10q_gui Entring... ";
+@@ -116,4 +116,4 @@
+     }
+     
+ 
+-}
+\ No newline at end of file
++}
+diff -ruN a/gui/dyn_ui.cpp b/gui/dyn_ui.cpp
+--- a/gui/dyn_ui.cpp	2016-12-11 13:07:50.000000000 +0100
++++ b/gui/dyn_ui.cpp	2021-08-01 13:23:05.758472847 +0200
+@@ -37,7 +37,7 @@
+ using namespace std;
+ #endif
+ 
+-static LV2UI_Handle instantiateDyn_gui(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
++static LV2UI_Handle instantiateDyn_gui(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
+ {
+   #ifdef TESTING_EQ10Q
+   cout<<"instantiateDyn_gui Entring... ";
+diff -ruN a/gui/eq10q_ui.cpp b/gui/eq10q_ui.cpp
+--- a/gui/eq10q_ui.cpp	2016-12-11 13:07:50.000000000 +0100
++++ b/gui/eq10q_ui.cpp	2021-08-01 13:23:19.615177359 +0200
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ 
+-static LV2UI_Handle instantiateEq10q_gui(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
++static LV2UI_Handle instantiateEq10q_gui(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
+ {
+   #ifdef TESTING_EQ10Q
+   cout<<"instantiateEq10q_gui Entring... ";
+diff -ruN a/gui/midside_ui.cpp b/gui/midside_ui.cpp
+--- a/gui/midside_ui.cpp	2016-12-11 13:07:53.000000000 +0100
++++ b/gui/midside_ui.cpp	2021-08-01 13:22:16.605004934 +0200
+@@ -37,7 +37,7 @@
+ using namespace std;
+ #endif
+ 
+-static LV2UI_Handle instantiateMidSide_gui(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
++static LV2UI_Handle instantiateMidSide_gui(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features)
+ {
+   #ifdef TESTING_EQ10Q
+   cout<<"instantiateEq10q_gui Entring... ";

Added: eq10q-2.2-replace_pow10.patch
===================================================================
--- eq10q-2.2-replace_pow10.patch	                        (rev 0)
+++ eq10q-2.2-replace_pow10.patch	2021-08-01 12:00:16 UTC (rev 991952)
@@ -0,0 +1,71 @@
+diff -ruN a/gui/widgets/bandctl.cpp b/gui/widgets/bandctl.cpp
+--- a/gui/widgets/bandctl.cpp	2016-12-11 13:07:50.000000000 +0100
++++ b/gui/widgets/bandctl.cpp	2021-08-01 13:32:41.773731129 +0200
+@@ -949,7 +949,7 @@
+   if(str_k.length() > 0)
+   {
+     val_k = atof(str_k.c_str()) * 1e3;
+-    val *= pow10(3.0 - str.length());
++    val *= exp10(3.0 - str.length());
+     if(str.length() > 3)
+     {
+       //throw an error, imposible to match str > 3 with k
+@@ -960,7 +960,7 @@
+   }
+   if(str_d.length() > 0)
+   {
+-    val_d = atof(str_d.c_str())/ pow10((double)str_d.length());
++    val_d = atof(str_d.c_str())/ exp10((double)str_d.length());
+   }
+    
+   btn->value = val + val_k + val_d;
+diff -ruN a/gui/widgets/bodeplot.cpp b/gui/widgets/bodeplot.cpp
+--- a/gui/widgets/bodeplot.cpp	2016-12-11 13:07:50.000000000 +0100
++++ b/gui/widgets/bodeplot.cpp	2021-08-01 13:35:30.841075471 +0200
+@@ -194,14 +194,14 @@
+ {
+   //Compute center and span for the full range spectrum
+   double sp = log10(MAX_FREQ/MIN_FREQ);
+-  double cn = MIN_FREQ * sqrt(pow10(sp));
++  double cn = MIN_FREQ * sqrt(exp10(sp));
+   setCenterSpan(cn, sp);
+ }
+ 
+ void PlotEQCurve::setCenterSpan(double center, double span)
+ { 
+-  m_minFreq = center / sqrt(pow10(span));
+-  m_maxFreq = center * sqrt(pow10(span));
++  m_minFreq = center / sqrt(exp10(span));
++  m_maxFreq = center * sqrt(exp10(span));
+     
+   //Initalize the grid
+   const double f_grid[GRID_VERTICAL_LINES] = {20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0,
+@@ -246,8 +246,8 @@
+ {
+   //Limit center to the possible range according the current span
+   double sp = log10(m_maxFreq/m_minFreq);
+-  double cmin = MIN_FREQ * sqrt(pow10(sp));
+-  double cmax = MAX_FREQ / sqrt(pow10(sp));
++  double cmin = MIN_FREQ * sqrt(exp10(sp));
++  double cmax = MAX_FREQ / sqrt(exp10(sp));
+   
+   double cn = center;
+   cn = cn > cmax ? cmax : cn;
+@@ -259,7 +259,7 @@
+ {
+   //Limit center to the possible range according the current span
+   double sp_act = log10(m_maxFreq/m_minFreq);
+-  double cn = m_minFreq * sqrt(pow10(sp_act));
++  double cn = m_minFreq * sqrt(exp10(sp_act));
+   double smax1 = 2.0*log10(cn/MIN_FREQ);
+   double smax2= 2.0*log10(MAX_FREQ/cn);
+   double smax = smax1 < smax2 ? smax1 : smax2;
+@@ -306,7 +306,7 @@
+   double fmax = MIN_FREQ*pow((MAX_FREQ/MIN_FREQ),((local_x2 + 3.5)/((double)m_zoom_surface_ptr->get_width())));
+   
+   double sp_act = log10(fmax/fmin);
+-  double cn = fmin * sqrt(pow10(sp_act));
++  double cn = fmin * sqrt(exp10(sp_act));
+   setCenter(cn);
+ }
+ 



More information about the arch-commits mailing list