소스 검색

midori: bump to 0.2.9 and make it build with directfb

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Gustavo Zacarias 14 년 전
부모
커밋
3693cdb6e4
2개의 변경된 파일14개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      CHANGES
  2. 13 6
      package/midori/midori.mk

+ 1 - 1
CHANGES

@@ -2,7 +2,7 @@
 
 
 	Fixes all over the tree.
 	Fixes all over the tree.
 
 
-	Updated/fixed packages: libglib2, module-init-tools,
+	Updated/fixed packages: libglib2, midori, module-init-tools,
 	mtd-utils, openssh, qt, sqlite, webkit
 	mtd-utils, openssh, qt, sqlite, webkit
 
 
 	Issues resolved (http://bugs.uclibc.org):
 	Issues resolved (http://bugs.uclibc.org):

+ 13 - 6
package/midori/midori.mk

@@ -4,19 +4,26 @@
 #
 #
 #############################################################
 #############################################################
 
 
-MIDORI_VERSION = 0.2.6
+MIDORI_VERSION = 0.2.9
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
-MIDORI_INSTALL_STAGING = NO
 MIDORI_INSTALL_TARGET = YES
 MIDORI_INSTALL_TARGET = YES
 
 
 MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
 MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
 
 
+ifneq ($(BR2_PACKAGE_XORG7),y)
+define MIDORI_WITHOUT_X11
+	$(SED) "s/check_pkg ('x11')/#check_pkg ('x11')/" $(@D)/wscript
+endef
+endif
+
 define MIDORI_CONFIGURE_CMDS
 define MIDORI_CONFIGURE_CMDS
-       (cd $(@D); \
-               $(TARGET_CONFIGURE_OPTS)        \
-               ./waf configure                 \
-               --prefix=/usr                   \
+	$(MIDORI_WITHOUT_X11)
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS)	\
+		./waf configure			\
+		--prefix=/usr			\
+		--disable-vala			\
        )
        )
 endef
 endef