[neon/backports-focal/draco/Neon/release] debian: Revert "Install draco_transcoder"

Jonathan Riddell null at kde.org
Wed Dec 15 17:07:57 GMT 2021


Git commit a1a62ffb4dbf206bc44af3b32f69d173c54df556 by Jonathan Riddell.
Committed on 15/12/2021 at 17:07.
Pushed by jriddell into branch 'Neon/release'.

Revert "Install draco_transcoder"

This reverts commit 5c93ba2068b08b585321891f85fa57e27a617ddd.

D  +0    -35   debian/patches/0005-Install-missing-files.patch
A  +20   -0    debian/patches/0005-Install-missing-headers.patch
M  +1    -1    debian/patches/series
M  +0    -1    debian/rules

https://invent.kde.org/neon/backports-focal/draco/commit/a1a62ffb4dbf206bc44af3b32f69d173c54df556

diff --git a/debian/patches/0005-Install-missing-files.patch b/debian/patches/0005-Install-missing-files.patch
deleted file mode 100644
index 041ba6a..0000000
--- a/debian/patches/0005-Install-missing-files.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling at debian.org>
-Date: Sat, 11 Dec 2021 20:42:46 +0100
-Subject: Install missing files
-
----
- CMakeLists.txt            | 1 +
- cmake/draco_install.cmake | 3 +++
- 2 files changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8aa55cb..5aa9863 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -230,6 +230,7 @@ list(
-     "${draco_src_root}/compression/bit_coders/symbol_bit_encoder.h")
- 
- list(APPEND draco_enc_config_sources
-+            "${draco_src_root}/compression/draco_compression_options.h"
-             "${draco_src_root}/compression/config/compression_shared.h"
-             "${draco_src_root}/compression/config/draco_options.h"
-             "${draco_src_root}/compression/config/encoder_options.h"
-diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake
-index 3b19192..652a6c9 100644
---- a/cmake/draco_install.cmake
-+++ b/cmake/draco_install.cmake
-@@ -77,6 +77,9 @@ macro(draco_setup_install_target)
- 
-   install(TARGETS draco_decoder DESTINATION "${bin_path}")
-   install(TARGETS draco_encoder DESTINATION "${bin_path}")
-+  if(TARGET draco_transcoder)
-+    install(TARGETS draco_transcoder DESTINATION "${bin_path}")
-+  endif()
- 
-   if(MSVC)
-     install(TARGETS draco DESTINATION "${libs_path}")
diff --git a/debian/patches/0005-Install-missing-headers.patch b/debian/patches/0005-Install-missing-headers.patch
new file mode 100644
index 0000000..590adba
--- /dev/null
+++ b/debian/patches/0005-Install-missing-headers.patch
@@ -0,0 +1,20 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling at debian.org>
+Date: Sat, 11 Dec 2021 20:42:46 +0100
+Subject: Install missing headers
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8aa55cb..5aa9863 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -230,6 +230,7 @@ list(
+     "${draco_src_root}/compression/bit_coders/symbol_bit_encoder.h")
+ 
+ list(APPEND draco_enc_config_sources
++            "${draco_src_root}/compression/draco_compression_options.h"
+             "${draco_src_root}/compression/config/compression_shared.h"
+             "${draco_src_root}/compression/config/draco_options.h"
+             "${draco_src_root}/compression/config/encoder_options.h"
diff --git a/debian/patches/series b/debian/patches/series
index fe75b37..2b092bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
 0002-Fix-removal-of-build-dir-prefix-from-include-path.patch
 0003-Install-proper-CMake-targets.patch
 0004-Use-C-17-filesystem-library.patch
-0005-Install-missing-files.patch
+0005-Install-missing-headers.patch
diff --git a/debian/rules b/debian/rules
index 6577197..1c768d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,4 +21,3 @@ override_dh_auto_configure:
 execute_after_dh_auto_install:
 	mv debian/tmp/usr/bin/draco_encoder-* debian/tmp/usr/bin/draco_encoder
 	mv debian/tmp/usr/bin/draco_decoder-* debian/tmp/usr/bin/draco_decoder
-	mv debian/tmp/usr/bin/draco_transcoder-* debian/tmp/usr/bin/draco_transcoder



More information about the Neon-commits mailing list