~tenacity/tenacity-dev

tenacity: Use wxWidgets 3.0 in Arch and Alpine builds v1 APPLIED

Sol Fisher Romanoff <sol@solfisher.com>
3 years ago 
Sol Fisher Romanoff: 1
 Use wxWidgets 3.0 in Arch and Alpine builds

 2 files changed, 15 insertions(+), 37 deletions(-)
#586535 alpine.yml success
#586536 archlinux.yml success
#586537 freebsd.yml success
Emily Mabrey <emabrey@tenacityaudio.org>
3 years ago 
Looks good to me

Emily Mabrey
emabrey@tenacityaudio.org
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git: 

curl -s https://lists.sr.ht/~tenacity/tenacity-dev/patches/25130/mbox | git am -3
Learn more about email & git
Reply to thread View this thread in the archives

[PATCH tenacity] Use wxWidgets 3.0 in Arch and Alpine builds Export this patch

Sol Fisher Romanoff <sol@solfisher.com>
3 years ago 
Signed-off-by: Sol Fisher Romanoff <sol@solfisher.com>
---
 .builds/alpine.yml    | 19 +++----------------
 .builds/archlinux.yml | 33 ++++++++++++---------------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index bf86a5ce7..e98108966 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -12,24 +12,11 @@ packages:
  - soundtouch-dev
  - soxr-dev
  - sqlite-dev

  - expat-dev
  - gtk+3.0-dev
  - libjpeg-turbo-dev
  - libpng-dev
  - tiff-dev
  - zlib-dev
  - wxgtk3-dev
environment:
  WX_CONFIG: /usr/bin/wx-config-gtk3
sources:
  - https://git.sr.ht/~tenacity/tenacity
tasks:
  - wxwidgets3-1: |
      git clone https://github.com/wxWidgets/wxWidgets.git
      cd wxWidgets
      git checkout v3.1.5
      git submodule update --init 3rdparty/catch
      mkdir buildgtk && cd buildgtk
      ../configure --with-gtk --disable-xlocale
      make -j2
      sudo make install
  - configure: cmake -G Ninja -S tenacity -B build
  - build: cmake --build build
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index e55ae9278..ed13dc2e9 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -1,40 +1,31 @@
image: archlinux
packages:
  - cmake
  - ninja

  - expat
  - gcc-libs
  - gdk-pixbuf2
  - glibc
  - ffmpeg
  - flac
  - gdk-pixbuf2
  - gtk3
  - glib2
  - libid3tag
  - lilv
  - libmad
  - libogg
  - libsndfile
  - libsoxr
  - libvorbis
  - lilv
  - ninja
  - portaudio
  - portmidi
  - portsmf
  - libsndfile
  - libsoxr
  - soundtouch
  - suil
  - twolame
  - vamp-plugin-sdk
  - libvorbis
  - soundtouch
  - ffmpeg

  - webkit2gtk
  - wxgtk3
environment:
  WX_CONFIG: /usr/bin/wx-config-gtk3
sources:
  - https://git.sr.ht/~tenacity/tenacity
tasks:
  - wxwidgets3-1: |
      git clone https://github.com/wxWidgets/wxWidgets.git
      cd wxWidgets
      git checkout v3.1.5
      cmake -G Ninja -S . -B cmake_build
      cmake --build cmake_build
      sudo cmake --install cmake_build
  - configure: cmake -G Ninja -S tenacity -B build
  - build: cmake --build build
-- 
2.33.0
builds.sr.ht <builds@sr.ht>
3 years ago 
tenacity/patches: SUCCESS in 29m38s

[Use wxWidgets 3.0 in Arch and Alpine builds][0] from [Sol Fisher Romanoff][1]

[0]: https://lists.sr.ht/~tenacity/tenacity-dev/patches/25130
[1]: mailto:sol@solfisher.com

✓ #586537 SUCCESS tenacity/patches/freebsd.yml   https://builds.sr.ht/~tenacity/job/586537
✓ #586536 SUCCESS tenacity/patches/archlinux.yml https://builds.sr.ht/~tenacity/job/586536
✓ #586535 SUCCESS tenacity/patches/alpine.yml    https://builds.sr.ht/~tenacity/job/586535
Sol Fisher Romanoff <sol@solfisher.com>
3 years ago 
Pushed upstream.

To git@github.com:tenacityteam/tenacity.git
   09df1ab06..400ef4096  master -> master