diff --git a/haiku-apps/medo/medo-1.0.0~beta1.recipe b/haiku-apps/medo/medo-1.0.0~beta1.2.recipe similarity index 82% rename from haiku-apps/medo/medo-1.0.0~beta1.recipe rename to haiku-apps/medo/medo-1.0.0~beta1.2.recipe index a8d7af798..34db8142d 100644 --- a/haiku-apps/medo/medo-1.0.0~beta1.recipe +++ b/haiku-apps/medo/medo-1.0.0~beta1.2.recipe @@ -2,12 +2,12 @@ SUMMARY="A Media Editor exclusively built for Haiku" DESCRIPTION="A modern video editor with customisable OpenGL GLSL plugin based \ effects. There are many bundled media effects, including: -- Colour grading effects (Saturation/Exposure/Temperature etc) +- Colour grading effects (Saturation/Exposure/Temperature etc.) - Colour correction curves and white balance. - Support for Adobe LUT (Look Up Tables) - Create masks and keyframes - Several bundled transitions -- Several special effects (Blur, Night Vision, Chroma Key etc) +- Several special effects (Blur, Night Vision, Chroma Key etc.) - Spatial tools to transform media (scale/rotate/position/crop) - Multiple text effects, including 3D extruded fonts. - Audio effects (20 band equaliser, fade) @@ -19,14 +19,14 @@ An SDK allows 3rd party developers to create Addons and Plugins." HOMEPAGE="https://github.com/smallstepforman/Medo" COPYRIGHT="2019-2021 Zen Yes Pty Ltd" LICENSE="MIT" -REVISION="2" -SOURCE_URI="https://github.com/smallstepforman/Medo/archive/R1.0.0-Beta1-1.tar.gz" -CHECKSUM_SHA256="734443d5d34d74c2a654e63d5bab33baddf68199fe2497688bcac337f10b7cf8" -SOURCE_DIR="Medo-R1.0.0-Beta1-1" -PATCHES="medo-$portVersion.patchset" +REVISION="1" +SOURCE_URI="https://github.com/smallstepforman/Medo/archive/R1.0.0-Beta1-2.tar.gz" +CHECKSUM_SHA256="b00a58ee661fd08168a4534dce0a79771bc339f010d3c3a8f19996b7adc14d12" +SOURCE_DIR="Medo-R1.0.0-Beta1-2" +PATCHES="medo-1.0.0~beta1.2.patchset" -ARCHITECTURES="!x86_gcc2 ?x86_64" -SECONDARY_ARCHITECTURES="!x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" medo$secondaryArchSuffix = $portVersion @@ -82,6 +82,7 @@ INSTALL() mkdir $appsDir/Medo/AddOns/${d%/} cp *".so" "$appsDir/Medo/AddOns/$d" cp *".png" "$appsDir/Medo/AddOns/$d" + cp *".json" "$appsDir/Medo/AddOns/$d" popd done popd @@ -97,6 +98,12 @@ INSTALL() done popd + #Languages + mkdir $appsDir/Medo/Languages + pushd Languages + cp *.lang "$appsDir/Medo/Languages/" + popd + #Resources mkdir $appsDir/Medo/Resources mkdir $appsDir/Medo/Resources/Icon diff --git a/haiku-apps/medo/patches/medo-1.0.0~beta1.2.patchset b/haiku-apps/medo/patches/medo-1.0.0~beta1.2.patchset new file mode 100644 index 000000000..ff23f9421 --- /dev/null +++ b/haiku-apps/medo/patches/medo-1.0.0~beta1.2.patchset @@ -0,0 +1,22 @@ +From 072700ee6e40d3095777ce78a9f303b4f046f353 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Thu, 18 Feb 2021 17:47:26 +0100 +Subject: x86 build fix + + +diff --git a/Jamfile b/Jamfile +index 0ef01c3..53bbae0 100644 +--- a/Jamfile ++++ b/Jamfile +@@ -10,7 +10,7 @@ else + C++FLAGS += -std=c++2a -g -O0 -gno-column-info ; + } + C++FLAGS += -I. -IYarra -I/boot/system/develop/headers/private/interface ; +-C++FLAGS += -I/boot/system/develop/headers/freetype2 ; ++C++FLAGS += -I/boot/system/develop/headers/freetype2 -I/boot/system/develop/headers/x86/freetype2 ; + + # Source files needed to build Medo + # +-- +2.30.0 + diff --git a/haiku-apps/medo/patches/medo-1.0.0~beta1.patchset b/haiku-apps/medo/patches/medo-1.0.0~beta1.patchset deleted file mode 100644 index dadd1b3ad..000000000 --- a/haiku-apps/medo/patches/medo-1.0.0~beta1.patchset +++ /dev/null @@ -1,130 +0,0 @@ -From 658881e640de392987fe7796f2fc254240bbdd62 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 23 Dec 2020 13:04:24 +0100 -Subject: Fix some build problems on 32bit systems. - -Eventually I hit a compiler error. Not sure what to do next. - -diff --git a/Editor/ExportMedia_MediaKit.cpp b/Editor/ExportMedia_MediaKit.cpp -index 48b2e7c..4b4a5a8 100644 ---- a/Editor/ExportMedia_MediaKit.cpp -+++ b/Editor/ExportMedia_MediaKit.cpp -@@ -178,7 +178,7 @@ void Export_MediaKit :: BuildVideoCodecOptions() - if (cookie != selected_cookie) - continue; - -- int cookie2 = 0; -+ int32 cookie2 = 0; - memset(&format, 0, sizeof(media_format)); - format.type = B_MEDIA_RAW_VIDEO; - format.u.raw_video = media_raw_video_format::wildcard; -@@ -230,7 +230,7 @@ void Export_MediaKit :: BuildAudioCodecOptions() - if (cookie != selected_cookie) - continue; - -- int cookie2 = 0; -+ int32 cookie2 = 0; - memset(&format, 0, sizeof(media_format)); - format.type = B_MEDIA_RAW_AUDIO; - while (get_next_encoder(&cookie2, &mfi, &format, &outfmt, &mci) == B_OK) -diff --git a/Editor/ExportMedia_ffmpeg.cpp b/Editor/ExportMedia_ffmpeg.cpp -index 3dd2bd6..ab07adf 100644 ---- a/Editor/ExportMedia_ffmpeg.cpp -+++ b/Editor/ExportMedia_ffmpeg.cpp -@@ -960,7 +960,7 @@ void Export_ffmpeg :: StopEncode(const bool complete) - - /**************************************************************/ - /* WorkThread */ --int Export_ffmpeg :: WorkThread(void *arg) -+status_t Export_ffmpeg :: WorkThread(void *arg) - { - assert(arg != nullptr); - Export_ffmpeg *instance = (Export_ffmpeg *) arg; -diff --git a/Editor/MonitorControls.cpp b/Editor/MonitorControls.cpp -index fe26cc0..e3bdcba 100644 ---- a/Editor/MonitorControls.cpp -+++ b/Editor/MonitorControls.cpp -@@ -255,7 +255,7 @@ void MonitorControls :: DrawAfterChildren(BRect frame) - char buffer[20]; - gProject->CreateTimeString(fCurrentFrame, buffer); - char *strarray[1] = {buffer}; -- int len[1] = {20}; -+ int32 len[1] = {20}; - float width; - GetStringWidths(strarray, len, 1, &width); - -diff --git a/Editor/SourceListView.cpp b/Editor/SourceListView.cpp -index f6ab2ad..0123853 100644 ---- a/Editor/SourceListView.cpp -+++ b/Editor/SourceListView.cpp -@@ -456,7 +456,7 @@ bool SourceListView :: AddItem(BListItem* item) - { - if (fInstructionItemVisible) - { -- InstructionListItem *item = (InstructionListItem *)RemoveItem(0); -+ InstructionListItem *item = (InstructionListItem *)RemoveItem((int32)0); - delete item; - fInstructionItemVisible = false; - } -@@ -474,6 +474,6 @@ void SourceListView :: RemoveAllMediaSources() - { - SourceListItem *item = (SourceListItem *)ItemAt(0); - gProject->RemoveMediaSource(item->GetMediaSource()); -- RemoveItem(0); -+ RemoveItem((int32)0); - } - } -diff --git a/Editor/TimelinePosition.cpp b/Editor/TimelinePosition.cpp -index 875b785..feb184a 100644 ---- a/Editor/TimelinePosition.cpp -+++ b/Editor/TimelinePosition.cpp -@@ -420,7 +420,7 @@ void TimelinePosition :: Draw(BRect frame) - char buffer[20]; - gProject->CreateTimeString(fCurrentPosition, buffer, true); - char *strarray[1] = {buffer}; -- int len[1] = {20}; -+ int32 len[1] = {20}; - float width; - GetStringWidths(strarray, len, 1, &width); - -diff --git a/Effects/Effect_Mask.cpp b/Effects/Effect_Mask.cpp -index 1a6c94e..96dbf20 100644 ---- a/Effects/Effect_Mask.cpp -+++ b/Effects/Effect_Mask.cpp -@@ -584,7 +584,7 @@ void Effect_Mask :: MessageReceived(BMessage *msg) - - case kMsgKeyframeSlider: - { -- int selection; -+ int32 selection; - if (msg->FindInt32("selection", &selection) == B_OK) - { - assert((selection >= 0) && (selection < fKeyframeList->CountItems())); -diff --git a/Gui/FontPanel.cpp b/Gui/FontPanel.cpp -index f5a082d..b76a922 100644 ---- a/Gui/FontPanel.cpp -+++ b/Gui/FontPanel.cpp -@@ -439,7 +439,7 @@ void FontView :: CreateStyleList(int32 family_idx) - - while (fStyleList->CountItems() > 0) - { -- BStringItem *item = (BStringItem*)fStyleList->RemoveItem(0); -+ BStringItem *item = (BStringItem*)fStyleList->RemoveItem((int32)0); - delete item; - } - -diff --git a/Jamfile b/Jamfile -index 839b0b7..45eee66 100644 ---- a/Jamfile -+++ b/Jamfile -@@ -11,6 +11,7 @@ else - } - C++FLAGS += -I. -IYarra -I/boot/system/develop/headers/private/interface ; - C++FLAGS += -I/boot/system/develop/headers/freetype2 ; -+C++FLAGS += -I/boot/system/develop/headers/x86/freetype2 -mavx ; - - # Source files needed to build Medo - # --- -2.28.0 -