From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 25 Nov 2024 21:36:53 +0000 (+0100)
Subject: vkmark: move to utils folder
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=986f15f668ce140124e5e8d9edd971b9dfc185dc;p=feed%2Fvideo.git

vkmark: move to utils folder

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/libs/vkmark/Makefile b/libs/vkmark/Makefile
deleted file mode 100644
index d2e7cf0..0000000
--- a/libs/vkmark/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=vkmark
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-04-12
-PKG_SOURCE_VERSION:=ab6e6f34077722d5ae33f6bd40b18ef9c0e99a15
-PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME).git
-PKG_MIRROR_HASH:=a0f268a88239d60650bc6ab2fa57cb99b75e28d4a11a07708c7dced5deea8fcb
-
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING-LGPL2.1
-
-PKG_BUILD_FLAGS:=gc-sections lto
-PKG_BUILD_DEPENDS:=glm
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/meson.mk
-
-define Package/vkmark
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Video
-  TITLE:=Vulkan benchmark
-  URL:=https://github.com/vkmark/vkmark
-  DEPENDS:=+libstdcpp +libassimp +libdrm +libmesa +libwayland +vulkan-loader
-endef
-
-define Package/vkmark/description
-vkmark is an extensible Vulkan benchmarking suite with targeted, configurable scenes.
-endef
-
-MESON_ARGS += \
-	-Dxcb=false \
-	-Dwayland=true \
-	-Dkms=true
-
-define Package/vkmark/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/usr/lib/vkmark
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/vkmark/*.so $(1)/usr/lib/vkmark
-	$(INSTALL_DIR) $(1)/usr/share/vkmark
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/vkmark/* $(1)/usr/share/vkmark
-endef
-
-$(eval $(call BuildPackage,vkmark))
diff --git a/utils/vkmark/Makefile b/utils/vkmark/Makefile
new file mode 100644
index 0000000..d2e7cf0
--- /dev/null
+++ b/utils/vkmark/Makefile
@@ -0,0 +1,49 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vkmark
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2023-04-12
+PKG_SOURCE_VERSION:=ab6e6f34077722d5ae33f6bd40b18ef9c0e99a15
+PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME).git
+PKG_MIRROR_HASH:=a0f268a88239d60650bc6ab2fa57cb99b75e28d4a11a07708c7dced5deea8fcb
+
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=COPYING-LGPL2.1
+
+PKG_BUILD_FLAGS:=gc-sections lto
+PKG_BUILD_DEPENDS:=glm
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
+
+define Package/vkmark
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Video
+  TITLE:=Vulkan benchmark
+  URL:=https://github.com/vkmark/vkmark
+  DEPENDS:=+libstdcpp +libassimp +libdrm +libmesa +libwayland +vulkan-loader
+endef
+
+define Package/vkmark/description
+vkmark is an extensible Vulkan benchmarking suite with targeted, configurable scenes.
+endef
+
+MESON_ARGS += \
+	-Dxcb=false \
+	-Dwayland=true \
+	-Dkms=true
+
+define Package/vkmark/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/lib/vkmark
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/vkmark/*.so $(1)/usr/lib/vkmark
+	$(INSTALL_DIR) $(1)/usr/share/vkmark
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/vkmark/* $(1)/usr/share/vkmark
+endef
+
+$(eval $(call BuildPackage,vkmark))