* [PR PATCH] cabbage: remove package.
@ 2021-02-20 20:39 ericonr
2021-02-20 22:30 ` Chocimier
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: ericonr @ 2021-02-20 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages cabba
https://github.com/void-linux/void-packages/pull/28942
cabbage: remove package.
Has been broken since the start of 2020 and has never been updated.
@laserbat Feel free to make a PR updating this instead :)
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28942.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cabba-28942.patch --]
[-- Type: text/x-diff, Size: 12890 bytes --]
From d3d9f1ee5b1bf52a57ce23bffa9831801d3c69f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 17:37:58 -0300
Subject: [PATCH] cabbage: remove package.
Has been broken since the start of 2020 and has never been updated.
---
srcpkgs/cabbage/patches/gcc9.patch | 134 ---------------------------
srcpkgs/cabbage/template | 139 -----------------------------
srcpkgs/cabbage/update | 2 -
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 275 deletions(-)
delete mode 100644 srcpkgs/cabbage/patches/gcc9.patch
delete mode 100644 srcpkgs/cabbage/template
delete mode 100644 srcpkgs/cabbage/update
diff --git a/srcpkgs/cabbage/patches/gcc9.patch b/srcpkgs/cabbage/patches/gcc9.patch
deleted file mode 100644
index 0ee949257c4..00000000000
--- a/srcpkgs/cabbage/patches/gcc9.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-commit 1d53d416b47aee20b0d093e319b7bc9131b85adc
-Author: q66 <daniel@octaforge.org>
-Date: Sat Jan 4 23:52:36 2020 +0100
-
- fix build with gcc9, adapted from upstream
-
-diff --git JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h
-index 4b1ba87..f77b885 100644
---- JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h
-+++ JUCE-5.3.2/modules/juce_graphics/colour/juce_PixelFormats.h
-@@ -111,19 +111,6 @@ public:
- forcedinline uint8 getGreen() const noexcept { return components.g; }
- forcedinline uint8 getBlue() const noexcept { return components.b; }
-
-- #if JUCE_GCC
-- // NB these are here as a workaround because GCC refuses to bind to packed values.
-- forcedinline uint8& getAlpha() noexcept { return comps [indexA]; }
-- forcedinline uint8& getRed() noexcept { return comps [indexR]; }
-- forcedinline uint8& getGreen() noexcept { return comps [indexG]; }
-- forcedinline uint8& getBlue() noexcept { return comps [indexB]; }
-- #else
-- forcedinline uint8& getAlpha() noexcept { return components.a; }
-- forcedinline uint8& getRed() noexcept { return components.r; }
-- forcedinline uint8& getGreen() noexcept { return components.g; }
-- forcedinline uint8& getBlue() noexcept { return components.b; }
-- #endif
--
- //==============================================================================
- /** Copies another pixel colour over this one.
-
-@@ -342,9 +329,6 @@ private:
- {
- uint32 internal;
- Components components;
-- #if JUCE_GCC
-- uint8 comps[4]; // helper struct needed because gcc does not allow references to packed union members
-- #endif
- };
- }
- #ifndef DOXYGEN
-@@ -433,10 +417,6 @@ public:
- forcedinline uint8 getGreen() const noexcept { return g; }
- forcedinline uint8 getBlue() const noexcept { return b; }
-
-- forcedinline uint8& getRed() noexcept { return r; }
-- forcedinline uint8& getGreen() noexcept { return g; }
-- forcedinline uint8& getBlue() noexcept { return b; }
--
- //==============================================================================
- /** Copies another pixel colour over this one.
-
-@@ -652,7 +632,6 @@ public:
-
- //==============================================================================
- forcedinline uint8 getAlpha() const noexcept { return a; }
-- forcedinline uint8& getAlpha() noexcept { return a; }
-
- forcedinline uint8 getRed() const noexcept { return 0; }
- forcedinline uint8 getGreen() const noexcept { return 0; }
-diff --git JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h
-index 9ac3ae2..9f41084 100644
---- JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h
-+++ JUCE-5.3.2/modules/juce_graphics/native/juce_RenderingHelpers.h
-@@ -585,10 +585,6 @@ namespace EdgeTableFillers
- {
- areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen()
- && sourceColour.getGreen() == sourceColour.getBlue();
-- filler[0].set (sourceColour);
-- filler[1].set (sourceColour);
-- filler[2].set (sourceColour);
-- filler[3].set (sourceColour);
- }
- else
- {
-@@ -675,7 +671,6 @@ namespace EdgeTableFillers
- const Image::BitmapData& destData;
- PixelType* linePixels;
- PixelARGB sourceColour;
-- PixelRGB filler[4];
- bool areRGBComponentsEqual;
-
- forcedinline PixelType* getPixel (int x) const noexcept
-@@ -690,47 +685,10 @@ namespace EdgeTableFillers
-
- forcedinline void replaceLine (PixelRGB* dest, PixelARGB colour, int width) const noexcept
- {
-- if (destData.pixelStride == sizeof (*dest))
-- {
-- if (areRGBComponentsEqual) // if all the component values are the same, we can cheat..
-- {
-- memset (dest, colour.getRed(), (size_t) width * 3);
-- }
-- else
-- {
-- if (width >> 5)
-- {
-- auto intFiller = reinterpret_cast<const int*> (filler);
--
-- while (width > 8 && (((pointer_sized_int) dest) & 7) != 0)
-- {
-- dest->set (colour);
-- ++dest;
-- --width;
-- }
--
-- while (width > 4)
-- {
-- auto d = reinterpret_cast<int*> (dest);
-- *d++ = intFiller[0];
-- *d++ = intFiller[1];
-- *d++ = intFiller[2];
-- dest = reinterpret_cast<PixelRGB*> (d);
-- width -= 4;
-- }
-- }
--
-- while (--width >= 0)
-- {
-- dest->set (colour);
-- ++dest;
-- }
-- }
-- }
-- else
-- {
-- JUCE_PERFORM_PIXEL_OP_LOOP (set (colour))
-- }
-+ if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual)
-+ memset ((void*) dest, colour.getRed(), (size_t) width * 3); // if all the component values are the same, we can cheat..
-+ else
-+ JUCE_PERFORM_PIXEL_OP_LOOP (set (colour));
- }
-
- forcedinline void replaceLine (PixelAlpha* dest, const PixelARGB colour, int width) const noexcept
diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template
deleted file mode 100644
index 4bf1093d070..00000000000
--- a/srcpkgs/cabbage/template
+++ /dev/null
@@ -1,139 +0,0 @@
-# Template file for 'cabbage'
-pkgname=cabbage
-version=2.0.03
-revision=2
-_jucever=5.3.2
-create_wrksrc=yes
-build_wrksrc="${pkgname}-${version}"
-hostmakedepends="unzip pkg-config xorg-server-xvfb"
-makedepends="libfreeglut-devel libcurl-devel jack-devel libXcomposite-devel
- libXrandr-devel libXcursor-devel libX11-devel libXinerama-devel MesaLib-devel
- gtk+3-devel webkit2gtk-devel csound alsa-lib-devel libsndfile-devel"
-depends="csound"
-short_desc="Framework for audio software development"
-maintainer="Olga U <me@laserbat.pw>"
-license="GPL-3.0-or-later"
-homepage="http://cabbageaudio.com/"
-distfiles="https://github.com/WeAreROLI/JUCE/archive/${_jucever}.tar.gz
- https://github.com/rorywalsh/cabbage/archive/v${version}.tar.gz
- http://www.steinberg.net/sdk_downloads/vstsdk367_03_03_2017_build_352.zip"
-checksum="b7c604bb6a7f9752934f89d72133713f7a65e82478bba80ccb4709d0edb58033
- 80f36d010a1f9bb14469fba70e12a5df7e24e92bec511c7157d5a1e90c0314d3
- 5e8f1058177472f6dd3b5c1e7f8e0e76f37c5f751fed65936e04ff2441ce831a"
-broken="undefined reference to ComponentLayoutEditor::..."
-
-# without TARGET_ARCH, the build system will assume -march=native,
-# which is wrong as we're building a generic package and -march does
-# not even always work
-case "$XBPS_TARGET_MACHINE" in
- i686*) _tarch="-mtune=i686";;
- x86_64*) _tarch="-march=x86-64";;
- aarch64*) _tarch="-march=armv8-a";;
- armv5te*) _tarch="-march=armv5te";;
- armv6*) _tarch="-march=armv6";;
- armv7*) _tarch="-march=armv7-a";;
- ppc64le*) _tarch="-mcpu=powerpc64le";;
- ppc64*) _tarch="-mcpu=970";;
- ppc*) _tarch="-mcpu=powerpc";;
- mips*) _tarch="-mtune=mips32r2";;
- *) broken="Unsupported architecture";;
-esac
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) makedepends+=" libexecinfo-devel"
- broken="error: '_NL_IDENTIFICATION_LANGUAGE' was not declared in this scope" ;;
-esac
-
-Projucer() {
- # This is needed as a workaround for a bug in Projucer
- # https://github.com/WeAreROLI/JUCE/issues/422
- # The HOME variable is spoofed because it looks for headers in
- # ~/SDKs/ (path hardcoded)
- # TODO: use xvfb-run script for testing
-
- Xvfb :999 &
- XVFB_PID=$!
- HOME=${wrksrc} DISPLAY=":999" "${wrksrc}/JUCE-${_jucever}/extras/Projucer/Builds/LinuxMakefile/build/Projucer" "$@"
- kill $XVFB_PID || true
-}
-
-post_extract() {
- mkdir SDKs
- mv VST_SDK SDKs
- cd "${wrksrc}/cabbage-${version}"
-
- # There are lots of hardcoded paths that need to be rewritten
- vsed -e 's@sourcecode/@@' -i CabbageLite.jucer
-
- for f in *jucer; do
- vsed -e "s@/usr/local/include/csound@/usr/include/csound@g" \
- -e "s@/usr/local/lib@/usr/lib@g" \
- -e "s@../JUCE@../JUCE-${_jucever}@" \
- -i "$f"
- done
-
- vsed -e "s|/usr/local/include/csound|/usr/include/csound|g" \
- -i Builds/LinuxMakefile/buildCabbage
-
- vsed -e '/opcodeFile\ +=/s#/#/../share/doc/cabbage/#' \
- -i Source/CodeEditor/CabbageCodeEditor.cpp
-
- vsed -e '/CabbagePlugin\(Synth\|Effect\)/s#"/#"/../lib/vst/#' \
- -i Source/Utilities/CabbageExportPlugin.cpp
-
- # Fix compilation on i686
- vsed -e 's/__sigemptyset/sigemptyset/' \
- -i ../JUCE-${_jucever}/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c
-
- vsed -e "s/JUCER_ENABLE_GPL_MODE 0/JUCER_ENABLE_GPL_MODE 1/" \
- -i ../JUCE-${_jucever}/extras/Projucer/JuceLibraryCode/AppConfig.h
-}
-
-do_build() {
- cd "${wrksrc}/JUCE-${_jucever}/extras/Projucer/Builds/LinuxMakefile/"
- make ${makejobs} TARGET_ARCH="${_tarch}"
-
- cd "${wrksrc}/cabbage-${version}/Builds/LinuxMakefile"
-
- Projucer --resave ../../CabbageIDE.jucer
- mv Makefile MakeCabbageIDE
- make -f MakeCabbageIDE ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
-
- Projucer --resave ../../CabbagePlugin.jucer
- mv Makefile MakePluginEffect
- make -f MakePluginEffect ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
- mv ./build/CabbagePlugin.so ./build/CabbagePluginEffect.so
-
- Projucer --resave ../../CabbagePluginSynth.jucer
- mv Makefile MakePluginSynth
- make -f MakePluginSynth ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
- mv ./build/CabbagePlugin.so ./build/CabbagePluginSynth.so
-
- Projucer --resave ../../CabbageLite.jucer
- cp -r ../../../JUCE-5.3.2/modules/juce_audio_plugin_client/ ../../JuceLibraryCode/modules/
- mv Makefile MakeCabbageLite
- make -f MakeCabbageLite ${makejobs} CONFIG=Release TARGET_ARCH="${_tarch}"
-}
-
-do_install() {
- cd "${wrksrc}/cabbage-${version}/Builds/LinuxMakefile"
-
- find ../../Examples -name '.DS_Store' -delete
- find ../../Examples -name '*_Log.txt' -delete
-
- vbin build/Cabbage
- vbin build/CabbageLite
-
- vmkdir usr/lib/vst
- vinstall build/CabbagePluginEffect.so 755 usr/lib/vst
- vinstall build/CabbagePluginSynth.so 755 usr/lib/vst
-
- vdoc ../opcodes.txt
-
- vinstall ../../Images/cabbage.png 644 usr/share/icons/hicolor/512x512/apps/
- vinstall Cabbage.desktop 644 usr/share/applications/
- vinstall CabbageLite.desktop 644 usr/share/applications/
-
- vmkdir usr/share/doc/cabbage/examples
- vcopy '../../Examples/*' usr/share/doc/cabbage/examples/
-}
diff --git a/srcpkgs/cabbage/update b/srcpkgs/cabbage/update
deleted file mode 100644
index 215a1fcf6df..00000000000
--- a/srcpkgs/cabbage/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/rorywalsh/cabbage/releases
-pattern="Cabbage v[\d.]"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2d2338a8b9b..fc241b1c8a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -22,6 +22,7 @@ replaces="
burp-client<=1.4.40_13
bzr<=2.7.0_1
bzrtools<=2.6.0_4
+ cabbage<=2.0.03_5
caja-gksu<=1.20.2_2
california<=0.4.0_4
clamz<=0.5_4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: cabbage: remove package.
2021-02-20 20:39 [PR PATCH] cabbage: remove package ericonr
@ 2021-02-20 22:30 ` Chocimier
2021-02-21 2:44 ` ericonr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-02-20 22:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/28942#issuecomment-782759207
Comment:
It builds on x86_64, likely just nocross.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: cabbage: remove package.
2021-02-20 20:39 [PR PATCH] cabbage: remove package ericonr
2021-02-20 22:30 ` Chocimier
@ 2021-02-21 2:44 ` ericonr
2021-03-04 21:25 ` ericonr
2021-03-04 21:25 ` [PR PATCH] [Closed]: " ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-02-21 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28942#issuecomment-782785336
Comment:
Still, carrying a never-updated package feels a bit pointless. People who look for cabbage are unlikely to want to use this version, since it won't match what the online docs/tutorial show, so we just carry a complex package for no real reason...
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: cabbage: remove package.
2021-02-20 20:39 [PR PATCH] cabbage: remove package ericonr
2021-02-20 22:30 ` Chocimier
2021-02-21 2:44 ` ericonr
@ 2021-03-04 21:25 ` ericonr
2021-03-04 21:25 ` [PR PATCH] [Closed]: " ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-03-04 21:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28942#issuecomment-790954027
Comment:
Closing in favor of #29230, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: cabbage: remove package.
2021-02-20 20:39 [PR PATCH] cabbage: remove package ericonr
` (2 preceding siblings ...)
2021-03-04 21:25 ` ericonr
@ 2021-03-04 21:25 ` ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-03-04 21:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
There's a closed pull request on the void-packages repository
cabbage: remove package.
https://github.com/void-linux/void-packages/pull/28942
Description:
Has been broken since the start of 2020 and has never been updated.
@laserbat Feel free to make a PR updating this instead :)
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-04 21:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-20 20:39 [PR PATCH] cabbage: remove package ericonr
2021-02-20 22:30 ` Chocimier
2021-02-21 2:44 ` ericonr
2021-03-04 21:25 ` ericonr
2021-03-04 21:25 ` [PR PATCH] [Closed]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).