mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] cog: version bump to 0.7.1
@ 2020-07-02 10:22 Marco Felsch
  2020-07-02 10:22 ` [ptxdist] [PATCH 2/2] wpewebkit: version bump to 2.28.2 Marco Felsch
  2020-07-06  6:32 ` [ptxdist] [APPLIED] cog: version bump to 0.7.1 Michael Olbrich
  0 siblings, 2 replies; 4+ messages in thread
From: Marco Felsch @ 2020-07-02 10:22 UTC (permalink / raw)
  To: ptxdist

The patch was merged upstream by commit: 30b13be ("cmake: Fix passing
-DWAYLAND_PROTOCOLS= on command line")

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 ...g-DWAYLAND_PROTOCOLS-on-command-line.patch | 103 ------------------
 patches/cog-0.6.0/series                      |   4 -
 rules/cog.make                                |   4 +-
 3 files changed, 2 insertions(+), 109 deletions(-)
 delete mode 100644 patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
 delete mode 100644 patches/cog-0.6.0/series

diff --git a/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch b/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
deleted file mode 100644
index b4686bd62..000000000
--- a/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Joshua Watt <Joshua.Watt@garmin.com>
-Date: Mon, 30 Mar 2020 14:50:46 -0500
-Subject: [PATCH] cmake: Fix passing -DWAYLAND_PROTOCOLS= on command line
-
-The optimization to check if WAYLAND_PROTOCOLS was set on the cmake
-comamnd line was skipping the function implementations, making cmake
-fail if it was used. The simple fix is to define the functions, then
-bail of out WAYLAND_PROTOCOLS is already defined.
-
-Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
----
- cmake/FindWaylandProtocols.cmake | 74 ++++++++++++++++++++--------------------
- 1 file changed, 37 insertions(+), 37 deletions(-)
-
-diff --git a/cmake/FindWaylandProtocols.cmake b/cmake/FindWaylandProtocols.cmake
-index 49a3cd50f91b..31f429cb2732 100644
---- a/cmake/FindWaylandProtocols.cmake
-+++ b/cmake/FindWaylandProtocols.cmake
-@@ -34,43 +34,6 @@ find_package(WaylandScanner)
- 
- set(WAYLAND_PROTOCOLS "" CACHE FILEPATH "Path to the wayland-protocols data directory")
- 
--# Already detected included and directory found?
--if (WAYLAND_PROTOCOLS AND IS_DIRECTORY "${WAYLAND_PROTOCOLS}")
--    return ()
--endif ()
--
--#
--# Method 1: If -DWAYLAND_PROTOCOLS=... was passed in the command line,
--#           check whether the "stable" and "unstable" subdirectories
--#           exist.
--#
--if (WAYLAND_PROTOCOLS)
--    get_filename_component(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS}" REALPATH)
--    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/stable")
--        set(WAYLAND_PROTOCOLS "")
--    endif ()
--    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/unstable")
--        set(WAYLAND_PROTOCOLS "")
--    endif ()
--endif ()
--
--#
--# Method 2: Try to find the directory using pkg-config.
--#
--if (NOT DEFINED WAYLAND_PROTOCOLS OR NOT WAYLAND_PROTOCOLS)
--    find_package(PkgConfig)
--    pkg_check_modules(WAYLAND_PROTOCOLS_PC wayland-protocols)
--    if (WAYLAND_PROTOCOLS_PC_FOUND)
--        pkg_get_variable(WAYLAND_PROTOCOLS_PC_DATADIR wayland-protocols pkgdatadir)
--        if (WAYLAND_PROTOCOLS_PC_DATADIR)
--            set(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS_PC_DATADIR}")
--        endif ()
--    endif ()
--    unset(WAYLAND_PROTOCOLS_PC)
--    unset(WAYLAND_PROTOCOLS_PC_DATADIR)
--endif ()
--
--
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-     WAYLAND_PROTOCOLS
-@@ -206,3 +169,40 @@ function(add_wayland_protocol _target _kind _protocol)
-         target_sources(${_target} PRIVATE "${proto_server}")
-     endif ()
- endfunction()
-+
-+# Already detected included and directory found?
-+if (WAYLAND_PROTOCOLS AND IS_DIRECTORY "${WAYLAND_PROTOCOLS}")
-+    return ()
-+endif ()
-+
-+#
-+# Method 1: If -DWAYLAND_PROTOCOLS=... was passed in the command line,
-+#           check whether the "stable" and "unstable" subdirectories
-+#           exist.
-+#
-+if (WAYLAND_PROTOCOLS)
-+    get_filename_component(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS}" REALPATH)
-+    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/stable")
-+        set(WAYLAND_PROTOCOLS "")
-+    endif ()
-+    if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/unstable")
-+        set(WAYLAND_PROTOCOLS "")
-+    endif ()
-+endif ()
-+
-+#
-+# Method 2: Try to find the directory using pkg-config.
-+#
-+if (NOT DEFINED WAYLAND_PROTOCOLS OR NOT WAYLAND_PROTOCOLS)
-+    find_package(PkgConfig)
-+    pkg_check_modules(WAYLAND_PROTOCOLS_PC wayland-protocols)
-+    if (WAYLAND_PROTOCOLS_PC_FOUND)
-+        pkg_get_variable(WAYLAND_PROTOCOLS_PC_DATADIR wayland-protocols pkgdatadir)
-+        if (WAYLAND_PROTOCOLS_PC_DATADIR)
-+            set(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS_PC_DATADIR}")
-+        endif ()
-+    endif ()
-+    unset(WAYLAND_PROTOCOLS_PC)
-+    unset(WAYLAND_PROTOCOLS_PC_DATADIR)
-+endif ()
-+
diff --git a/patches/cog-0.6.0/series b/patches/cog-0.6.0/series
deleted file mode 100644
index 3c5f3e8d5..000000000
--- a/patches/cog-0.6.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
-# fe47d1ea6f9b17c63023088fd025091b  - git-ptx-patches magic
diff --git a/rules/cog.make b/rules/cog.make
index 19a70b941..a0587a8d5 100644
--- a/rules/cog.make
+++ b/rules/cog.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog
 #
 # Paths and names
 #
-COG_VERSION		:= 0.6.0
-COG_MD5			:= a97df4f0e2d25f4da7cd9bb55294d30e
+COG_VERSION		:= 0.7.1
+COG_MD5			:= f2c51cd444ca54d8042e99b3e8a3fa78
 COG			:= cog-$(COG_VERSION)
 COG_SUFFIX		:= tar.xz
 COG_URL			:= https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-06  6:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-02 10:22 [ptxdist] [PATCH 1/2] cog: version bump to 0.7.1 Marco Felsch
2020-07-02 10:22 ` [ptxdist] [PATCH 2/2] wpewebkit: version bump to 2.28.2 Marco Felsch
2020-07-06  6:32   ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-06  6:32 ` [ptxdist] [APPLIED] cog: version bump to 0.7.1 Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox