mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
media-libs/libopenshot_audio: various changes
- removed test binary as it doesn't seem to be used by anything or anyone. - added debuginfo - added doc subpackage - patched to use native libraries
This commit is contained in:
Leorize
@@ -29,36 +29,58 @@ REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libopenshot_audio${secondaryArchSuffix}_devel = $portVersion
|
||||
cmd:openshot_audio_test_sound$secondaryArchSuffix
|
||||
devel:libopenshot_audio$secondaryArchSuffix = $libVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku$secondaryArchSuffix
|
||||
libopenshot_audio$secondaryArchSuffix == $portVersion base
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:find
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
ARCHITECTURES_doc="any"
|
||||
|
||||
PROVIDES_doc="
|
||||
libopenshot_audio_doc = $portVersion
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES+="
|
||||
cmd:dot
|
||||
cmd:doxygen
|
||||
"
|
||||
fi
|
||||
|
||||
defineDebugInfoPackage libopenshot_audio$secondaryArchSuffix \
|
||||
"$libDir/libopenshot-audio.so.$portVersion"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake . $cmakeDirArgs
|
||||
export LDFLAGS="-Wl,--as-needed" # Trim unneeded links
|
||||
cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo $cmakeDirArgs
|
||||
make $jobArgs
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
make $jobArgs doc
|
||||
fi
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
@@ -67,9 +89,18 @@ INSTALL()
|
||||
|
||||
prepareInstalledDevelLibs libopenshot-audio
|
||||
|
||||
rm -rf $binDir $manDir
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$binDir \
|
||||
$developDir \
|
||||
$manDir
|
||||
$developDir
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
install -d -m 755 $developDocDir
|
||||
mv -T $docDir/libopenshot-audio $developDocDir
|
||||
packageEntries doc \
|
||||
$developDir
|
||||
fi
|
||||
|
||||
find $prefix -type d -empty -delete
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1d9e135619affcc2f215fffc43c63aff26038c24 Mon Sep 17 00:00:00 2001
|
||||
From f7788f0aeef9e3fea3f17d1e398b0ac4714a1dba Mon Sep 17 00:00:00 2001
|
||||
From: Leorize <alaviss@users.noreply.github.com>
|
||||
Date: Tue, 28 Aug 2018 16:43:43 +0700
|
||||
Subject: cmake: uses GNUInstallDirs
|
||||
@@ -127,14 +127,14 @@ index a5ee15a..0a9f423 100644
|
||||
2.16.4
|
||||
|
||||
|
||||
From 9634fbf36821cb0807570d168ec20ba9919829eb Mon Sep 17 00:00:00 2001
|
||||
From b5fa3e84aa782e890a8923bb8772f421deffebfc Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 30 Aug 2018 00:22:13 +0700
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8ea6d2f..38a58d9 100644
|
||||
index 8ea6d2f..5c7e5f6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -126,14 +126,23 @@ ELSE (WIN32)
|
||||
@@ -1776,3 +1776,87 @@ index 0000000..b5c0a4d
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 3d6ff53869ac0c2bf618c6ecf4a05bde37978adf Mon Sep 17 00:00:00 2001
|
||||
From: Leorize <alaviss@users.noreply.github.com>
|
||||
Date: Thu, 30 Aug 2018 15:20:04 +0700
|
||||
Subject: cmake: fix documentation installation
|
||||
|
||||
The glob approach used prior to this commit only works if
|
||||
the documentation has been generated **before** cmake was run.
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5c7e5f6..0c0e4e9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -199,8 +199,7 @@ INSTALL(TARGETS openshot-audio DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
include(cmake/Modules/UseDoxygen.cmake)
|
||||
|
||||
# Install Doxygen html documentation
|
||||
-file(GLOB_RECURSE doc_files ${CMAKE_CURRENT_BINARY_DIR}/doc/html/*.*)
|
||||
-INSTALL(FILES ${doc_files} DESTINATION ${CMAKE_INSTALL_DOCDIR}/libopenshot-audio)
|
||||
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/libopenshot-audio OPTIONAL)
|
||||
|
||||
# Install manpage
|
||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/openshot-audio-test-sound.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 40cc214402b5fcc803c1f35121120913360fd046 Mon Sep 17 00:00:00 2001
|
||||
From: Leorize <alaviss@users.noreply.github.com>
|
||||
Date: Thu, 30 Aug 2018 10:37:53 +0700
|
||||
Subject: haiku: uses native libraries
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0c0e4e9..c6669e1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -129,10 +129,14 @@ ELSE (WIN32)
|
||||
IF (HAIKU)
|
||||
SET_PROPERTY(GLOBAL PROPERTY JUCE_HAIKU "JUCE_HAIKU")
|
||||
SET(EXTENSION "cpp")
|
||||
+ FIND_PACKAGE(CURL REQUIRED)
|
||||
FIND_PACKAGE(Freetype REQUIRED)
|
||||
+ FIND_PACKAGE(PNG REQUIRED)
|
||||
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
|
||||
ADD_DEFINITIONS(-DHAIKU)
|
||||
- SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES curl ${FREETYPE_LIBRARIES})
|
||||
+ ADD_DEFINITIONS(${PNG_DEFINITIONS})
|
||||
+ ADD_DEFINITIONS(-DJUCE_INCLUDE_PNGLIB_CODE=0)
|
||||
+ SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${CURL_LIBRARIES} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES})
|
||||
ELSE (HAIKU)
|
||||
SET_PROPERTY(GLOBAL PROPERTY JUCE_LINUX "JUCE_LINUX")
|
||||
SET(EXTENSION "cpp")
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
From 9ac8dff70510ea742abee32bb9ce7aca0a6f537b Mon Sep 17 00:00:00 2001
|
||||
From: Ghislain Antony Vaillant <ghisvail@gmail.com>
|
||||
Date: Thu, 15 Dec 2016 19:39:01 +0000
|
||||
Subject: Fix build with libpng16
|
||||
|
||||
|
||||
diff --git a/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
|
||||
index fa3b887..fe382b6 100644
|
||||
--- a/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
|
||||
+++ b/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
|
||||
@@ -396,8 +396,12 @@ Image PNGImageFormat::decodeImage (InputStream& in)
|
||||
|
||||
png_set_add_alpha (pngReadStruct, 0xff, PNG_FILLER_AFTER);
|
||||
|
||||
+ png_bytep trans_alpha;
|
||||
+ int num_trans;
|
||||
+ png_get_tRNS(pngReadStruct, pngInfoStruct, &trans_alpha, &num_trans, NULL);
|
||||
+
|
||||
bool hasAlphaChan = (colorType & PNG_COLOR_MASK_ALPHA) != 0
|
||||
- || pngInfoStruct->num_trans > 0;
|
||||
+ || num_trans > 0;
|
||||
|
||||
// Load the image into a temp buffer in the pnglib format..
|
||||
const size_t lineStride = width * 4;
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user