Browse Source

cog: misc fixes

Waldemar Brodkorb 1 month ago
parent
commit
ce5013ef97
3 changed files with 12 additions and 6 deletions
  1. 4 1
      package/cog/Makefile
  2. 2 2
      package/weston/Makefile
  3. 6 3
      package/wpewebkit/Makefile

+ 4 - 1
package/cog/Makefile

@@ -24,7 +24,7 @@ MESON_FLAGS+=		-Ddocumentation=false \
 			-Dmanpages=false \
 			-Dprograms=true \
 			-Dwpe_api=2.0 \
-			-Dplatforms=drm
+			-Dplatforms="wayland"
 
 CONFIG_STYLE:=		meson
 BUILD_STYLE:=		meson
@@ -34,6 +34,9 @@ cog-install:
 	$(INSTALL_DIR) $(IDIR_COG)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libcogcore.so* \
 		$(IDIR_COG)/usr/lib
+	$(INSTALL_DIR) $(IDIR_COG)/usr/lib/cog/modules
+	$(CP) $(WRKINST)/usr/lib/cog/modules/* \
+		$(IDIR_COG)/usr/lib/cog/modules
 	$(INSTALL_DIR) $(IDIR_COG)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/cog \
 		$(IDIR_COG)/usr/bin

+ 2 - 2
package/weston/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		weston
 PKG_VERSION:=		14.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		633f4e0f232ad150300c95ffcbc646fedf1349487bf389dbd2045fa69013d6e2
 PKG_DESCR:=		wayland compositor
 PKG_SECTION:=		x11/drivers
@@ -56,7 +56,7 @@ weston-install:
 	$(CP) $(WRKINST)/usr/lib/*so* \
 		$(IDIR_WESTON)/usr/lib/
 	$(INSTALL_DIR) $(IDIR_WESTON)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/weston \
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
 		$(IDIR_WESTON)/usr/bin
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 6 - 3
package/wpewebkit/Makefile

@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		wpewebkit
-PKG_VERSION:=		2.48.0
+PKG_VERSION:=		2.48.1
 PKG_RELEASE:=		1
-PKG_HASH:=		25bc557fd62f06ac8393a6f638ffceff3d9f367d6d35195315fa459c82f80850
+PKG_HASH:=		2f411b692bb4c2a924d9bddf0c794fd69a24931ad836d6a93c9a65f5adb0357f
 PKG_DESCR:=		web platform for embedded
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libwpe libsoup3 harfbuzz libjpeg-turbo libgcrypt
 PKG_DEPENDS+=		libtasn1 libwebp gstreamer gst-plugins-base libxslt
-PKG_DEPENDS+=		libpsl libmount
+PKG_DEPENDS+=		libpsl libmount libblkid
 PKG_BUILDDEP:=		cmake-host libwpe libsoup3 harfbuzz libjpeg-turbo
 PKG_BUILDDEP+=		libgcrypt libtasn1 libwebp gstreamer gst-plugins-base
 PKG_BUILDDEP+=		libxslt libpsl
@@ -46,5 +46,8 @@ wpewebkit-install:
 	$(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libWPEWebKit*.so* \
 		$(IDIR_WPEWEBKIT)/usr/lib
+	$(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0
+	$(INSTALL_BIN) $(WRKINST)/usr/libexec/wpe-webkit-2.0/* \
+		$(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk