openobex: Update to 1.7.2

Add myself as maintainer.

Cosmetic Makefile fixes for consistency between projects.

Signed-off-by: Rosen Penev <redacted>

diff --git a/utils/openobex/Makefile b/utils/openobex/Makefile
index bb50a3d709a980fce197aa409aef744dbe70bf2f..88a2fa46c1b11b4fac71020bfc768e1e61721db5 100644 (file)
--- a/utils/openobex/Makefile
+++ b/utils/openobex/Makefile
@@ -8,17 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openobex
-PKG_VERSION:=1.7.1
+PKG_VERSION:=1.7.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-Source
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-Source.tar.gz
 PKG_SOURCE_URL:=@SF/openobex
-PKG_HASH:=3b264665d90901ea4ff720332ffb9b6d1d8f67187463d3a3279caddc7205ea57
+PKG_HASH:=158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-Source
 
+PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
+PKG_CPE_ID:=cpe:/a:openobex:openobex
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk

diff --git a/utils/openobex/patches/001-cxx.patch b/utils/openobex/patches/001-cxx.patch
index 650458f0a7dc8c1db2a524c123903fb294ab051e..ec53b4d1dae3e72f1efebd7de35fccd58b3f99f3 100644 (file)
--- a/utils/openobex/patches/001-cxx.patch
+++ b/utils/openobex/patches/001-cxx.patch
@@ -1,10 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 813f900..a0942e8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required ( VERSION 2.8.5 FATAL_ERROR )\r
+@@ -1,7 +1,7 @@
+ cmake_minimum_required ( VERSION 3.1 FATAL_ERROR )\r
  \r
--project ( openobex C )\r
-+project ( openobex C CXX )\r
+ project ( openobex\r
+-  LANGUAGES C\r
++  LANGUAGES C CXX\r
+   VERSION 1.7.2\r
+ )\r
  \r
- #\r
- # The project version\r