[SCM] libopenshot-audio/master: Switch from git-dpm to gbp
ghisvail-guest at users.alioth.debian.org
ghisvail-guest at users.alioth.debian.org
Tue Jun 13 10:54:57 UTC 2017
The following commit has been merged in the master branch:
commit 67fe2b80422236502b8d334ff169ee3632d179ed
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Jun 12 22:02:07 2017 +0100
Switch from git-dpm to gbp
- Drop git-dpm configuration
- Unapply the patch queue
- Add gbp configuration
- Refresh the patch queue
- Drop patch numbering
Gbp-Dch: Full
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65cda3c..c6c8f54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,49 +172,6 @@ TARGET_LINK_LIBRARIES(openshot-audio
${JUCE_PLATFORM_SPECIFIC_LIBRARIES}
)
-find_package(ZLIB REQUIRED)
-if(NOT TARGET ZLIB::ZLIB)
- add_library(ZLIB::ZLIB SHARED IMPORTED)
- set_target_properties(ZLIB::ZLIB PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}"
- IMPORTED_LOCATION "${ZLIB_LIBRARIES}")
-endif()
-target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_ZLIB_CODE=0")
-target_link_libraries(openshot-audio ZLIB::ZLIB)
-
-find_package(JPEG REQUIRED)
-if(NOT TARGET JPEG::JPEG)
- add_library(JPEG::JPEG SHARED IMPORTED)
- set_target_properties(JPEG::JPEG PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIRS}"
- IMPORTED_LOCATION "${JPEG_LIBRARIES}")
-endif()
-target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_JPEGLIB_CODE=0")
-target_link_libraries(openshot-audio JPEG::JPEG)
-
-find_package(PNG REQUIRED)
-if(NOT TARGET PNG::PNG)
- add_library(PNG::PNG SHARED IMPORTED)
- set_target_properties(PNG::PNG PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
- IMPORTED_LOCATION "${PNG_LIBRARIES}")
-endif()
-target_compile_definitions(openshot-audio PRIVATE "-DJUCE_INCLUDE_PNGLIB_CODE=0")
-target_link_libraries(openshot-audio PNG::PNG)
-
-set(CMAKE_THREAD_PREFER_PTHREAD 1)
-find_package(Threads REQUIRED)
-if(NOT TARGET Threads::Threads)
- add_library(Threads::Threads INTERFACE IMPORTED)
- set_target_properties(Threads::Threads PROPERTIES
- INTERFACE_COMPILE_OPTIONS "-pthread"
- INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
-endif()
-target_link_libraries(openshot-audio Threads::Threads)
-
-target_link_libraries(openshot-audio ${CMAKE_DL_LIBS})
-
# PROCESS SUB-DIRECTORIES
add_subdirectory(src)
diff --git a/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h b/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
index 788b908..9cd9799 100644
--- a/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
+++ b/JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
@@ -192,6 +192,7 @@
#include <net/if.h>
#include <sys/sysinfo.h>
#include <sys/file.h>
+ #include <sys/prctl.h>
#include <signal.h>
#include <stddef.h>
diff --git a/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h b/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h
index af189e5..b6fff48 100644
--- a/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h
+++ b/JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h
@@ -903,7 +903,11 @@ void JUCE_CALLTYPE Thread::setCurrentThreadName (const String& name)
[[NSThread currentThread] setName: juceStringToNS (name)];
}
#elif JUCE_LINUX
+ #if (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012
pthread_setname_np (pthread_self(), name.toRawUTF8());
+ #else
+ prctl (PR_SET_NAME, name.toRawUTF8(), 0, 0, 0);
+ #endif
#endif
}
diff --git a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
index 779943f..f1db2b4 100644
--- a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
+++ b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
@@ -87,8 +87,8 @@ private:
{
stream.next_in = const_cast <uint8*> (data);
stream.next_out = buffer;
- stream.avail_in = (uInt) dataSize;
- stream.avail_out = (uInt) sizeof (buffer);
+ stream.avail_in = (z_uInt) dataSize;
+ stream.avail_out = (z_uInt) sizeof (buffer);
const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy)
: deflate (&stream, flushMode);
diff --git a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
index b578fed..88d49a3 100644
--- a/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
+++ b/JuceLibraryCode/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
@@ -126,8 +126,8 @@ public:
{
stream.next_in = data;
stream.next_out = dest;
- stream.avail_in = (uInt) dataSize;
- stream.avail_out = (uInt) destSize;
+ stream.avail_in = (z_uInt) dataSize;
+ stream.avail_out = (z_uInt) destSize;
switch (inflate (&stream, Z_PARTIAL_FLUSH))
{
@@ -136,7 +136,7 @@ public:
// deliberate fall-through
case Z_OK:
data += dataSize - stream.avail_in;
- dataSize = (uInt) stream.avail_in;
+ dataSize = (z_uInt) stream.avail_in;
return (int) (destSize - stream.avail_out);
case Z_NEED_DICT:
diff --git a/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
index 955a461..fa3b887 100644
--- a/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
+++ b/JuceLibraryCode/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
@@ -396,12 +396,8 @@ 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
- || num_trans > 0;
+ || pngInfoStruct->num_trans > 0;
// Load the image into a temp buffer in the pnglib format..
const size_t lineStride = width * 4;
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index d487954..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-af0a0c241b14e899a63335c2820e2114abd715a8
-af0a0c241b14e899a63335c2820e2114abd715a8
-0d34cefe6b60bc13c1df4508f5575d0a62dd6088
-0d34cefe6b60bc13c1df4508f5575d0a62dd6088
-libopenshot-audio_0.1.2+ds1.orig.tar.gz
-759a00240420f3d115539f5ab2c694f278b1cc2a
-1820234
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f53906f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+sign-tags = True
+pristine-tar = True
diff --git a/debian/patches/0006-Add-missing-linkage-with-libdl.patch b/debian/patches/Add-missing-linkage-with-libdl.patch
similarity index 88%
rename from debian/patches/0006-Add-missing-linkage-with-libdl.patch
rename to debian/patches/Add-missing-linkage-with-libdl.patch
index 5c8c061..3d9019e 100644
--- a/debian/patches/0006-Add-missing-linkage-with-libdl.patch
+++ b/debian/patches/Add-missing-linkage-with-libdl.patch
@@ -1,4 +1,3 @@
-From af0a0c241b14e899a63335c2820e2114abd715a8 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu, 2 Feb 2017 16:56:19 +0000
Subject: Add missing linkage with libdl
diff --git a/debian/patches/0005-Add-missing-linkage-with-pthread.patch b/debian/patches/Add-missing-linkage-with-pthread.patch
similarity index 93%
rename from debian/patches/0005-Add-missing-linkage-with-pthread.patch
rename to debian/patches/Add-missing-linkage-with-pthread.patch
index a805a4c..6832005 100644
--- a/debian/patches/0005-Add-missing-linkage-with-pthread.patch
+++ b/debian/patches/Add-missing-linkage-with-pthread.patch
@@ -1,4 +1,3 @@
-From 531cbeb14ead3c1351b62a669b60c312ce545e77 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu, 2 Feb 2017 16:55:19 +0000
Subject: Add missing linkage with pthread
diff --git a/debian/patches/0003-Do-not-use-Linux-only-prctl.patch b/debian/patches/Do-not-use-Linux-only-prctl.patch
similarity index 94%
rename from debian/patches/0003-Do-not-use-Linux-only-prctl.patch
rename to debian/patches/Do-not-use-Linux-only-prctl.patch
index 3781f41..4955975 100644
--- a/debian/patches/0003-Do-not-use-Linux-only-prctl.patch
+++ b/debian/patches/Do-not-use-Linux-only-prctl.patch
@@ -1,4 +1,3 @@
-From 4c40115c8b056af0f791bc934d1cdb87ea44fcd7 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue, 31 Jan 2017 00:04:59 +0000
Subject: Do not use Linux-only prctl
diff --git a/debian/patches/0002-fix-build-with-libpng16.patch b/debian/patches/Fix-build-with-libpng16.patch
similarity index 91%
rename from debian/patches/0002-fix-build-with-libpng16.patch
rename to debian/patches/Fix-build-with-libpng16.patch
index 2964a71..e9fada3 100644
--- a/debian/patches/0002-fix-build-with-libpng16.patch
+++ b/debian/patches/Fix-build-with-libpng16.patch
@@ -1,7 +1,6 @@
-From bec2152c777ebcdb6b499bae04dcce16f3765fcb Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu, 15 Dec 2016 19:39:01 +0000
-Subject: fix build with libpng16
+Subject: Fix build with libpng16
---
.../modules/juce_graphics/image_formats/juce_PNGLoader.cpp | 6 +++++-
diff --git a/debian/patches/0001-use-non-prefixed-zlib-types.patch b/debian/patches/Use-non-prefixed-zlib-types.patch
similarity index 94%
rename from debian/patches/0001-use-non-prefixed-zlib-types.patch
rename to debian/patches/Use-non-prefixed-zlib-types.patch
index 65fd078..f19cc93 100644
--- a/debian/patches/0001-use-non-prefixed-zlib-types.patch
+++ b/debian/patches/Use-non-prefixed-zlib-types.patch
@@ -1,7 +1,6 @@
-From 1b8e6427d4bee440c7e09155387382e6246ac17c Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu, 15 Dec 2016 19:52:59 +0000
-Subject: use non-prefixed zlib types
+Subject: Use non-prefixed zlib types
---
.../modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp | 4 ++--
diff --git a/debian/patches/0004-Use-the-system-libraries.patch b/debian/patches/Use-the-system-libraries.patch
similarity index 96%
rename from debian/patches/0004-Use-the-system-libraries.patch
rename to debian/patches/Use-the-system-libraries.patch
index 780a787..eaf51a0 100644
--- a/debian/patches/0004-Use-the-system-libraries.patch
+++ b/debian/patches/Use-the-system-libraries.patch
@@ -1,4 +1,3 @@
-From a50e6a6ae89cda560282566f8992194809447a85 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu, 2 Feb 2017 16:21:52 +0000
Subject: Use the system libraries
diff --git a/debian/patches/series b/debian/patches/series
index a60a74c..2e3843e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-0001-use-non-prefixed-zlib-types.patch
-0002-fix-build-with-libpng16.patch
-0003-Do-not-use-Linux-only-prctl.patch
-0004-Use-the-system-libraries.patch
-0005-Add-missing-linkage-with-pthread.patch
-0006-Add-missing-linkage-with-libdl.patch
+Use-non-prefixed-zlib-types.patch
+Fix-build-with-libpng16.patch
+Do-not-use-Linux-only-prctl.patch
+Use-the-system-libraries.patch
+Add-missing-linkage-with-pthread.patch
+Add-missing-linkage-with-libdl.patch
--
libopenshot-audio packaging
More information about the pkg-multimedia-commits
mailing list