[oe-commits] org.oe.dev merge of '0cfef0fdcd39ce49077acb4218058948a07ba70f'

[oe commit]

merge of '0cfef0fdcd39ce49077acb4218058948a07ba70f'
     and 'e60a36ce97927c0d8ad36cace5dc291638e20694'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 597777f13fd740ef2b1aeb92a422469e4e9b56aa
ViewMTN: http://monotone.openembedded.org/revision/info/597777f13fd740ef2b1aeb92a422469e4e9b56aa
Files:
1
packages/xorg-proto/renderproto_0.9.3.bb
packages/amule
packages/amule/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
Diffs:

#
# mt diff -r0cfef0fdcd39ce49077acb4218058948a07ba70f -r597777f13fd740ef2b1aeb92a422469e4e9b56aa
#
# 
# 
# patch "packages/xorg-proto/renderproto_0.9.3.bb"
#  from [1bb8221a34173072ea7c764733f75f2a635ff066]
#    to [941a64141dc39736fe734344c9ecc6cbbb9620f4]
# 
============================================================
--- packages/xorg-proto/renderproto_0.9.3.bb	1bb8221a34173072ea7c764733f75f2a635ff066
+++ packages/xorg-proto/renderproto_0.9.3.bb	941a64141dc39736fe734344c9ecc6cbbb9620f4
@@ -1,4 +1,6 @@ PE = "1"
 require xorg-proto-common.inc
 
 CONFLICTS = "renderext"
 PE = "1"
+
+DEFAULT_PREFERENCE = "-1"


#
# mt diff -re60a36ce97927c0d8ad36cace5dc291638e20694 -r597777f13fd740ef2b1aeb92a422469e4e9b56aa
#
# 
# 
# add_dir "packages/amule"
# 
# add_dir "packages/amule/files"
# 
# add_file "packages/amule/amule_2.1.3.bb"
#  content [e94b17ff6a0526951854c033da5fe53b89be7198]
# 
# add_file "packages/amule/files/parser.patch"
#  content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
# 
============================================================
--- packages/amule/amule_2.1.3.bb	e94b17ff6a0526951854c033da5fe53b89be7198
+++ packages/amule/amule_2.1.3.bb	e94b17ff6a0526951854c033da5fe53b89be7198
@@ -0,0 +1,25 @@
+DESCRIPTION = "aMule is an eMule-like client for the eD2k \
+and Kademlia networks, supporting multiple platforms."
+HOMEPAGE = "http://www.amule.org"
+LICENSE = "GPL"
+SECTION = "web"
+PRIORITY = "optional"
+DEPENDS = "wxbase"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \
+           file://parser.patch;patch=1"
+
+S = "${WORKDIR}/aMule-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-amulecmd \
+                --enable-webserver \
+		--disable-monolithic \
+		--enable-amule-daemon \
+		--disable-nls"
+#		--enable-optimize"
+
+FILES_${PN} += " \
+        ${libdir}/xchat"
============================================================
--- packages/amule/files/parser.patch	aa35fa9621c341aaf36abdc4f0a42887e4e6e384
+++ packages/amule/files/parser.patch	aa35fa9621c341aaf36abdc4f0a42887e4e6e384
@@ -0,0 +1,20 @@
+diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp
+--- aMule-2.1.0_orig/src/Parser.cpp	2005-12-20 05:13:25.000000000 +0100
++++ aMule-2.1.0/src/Parser.cpp	2006-01-29 15:16:45.000000000 +0100
+@@ -203,14 +203,14 @@
+ #   define YYMALLOC malloc
+ #   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifndef YYFREE
+ #   define YYFREE free
+ #   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+-void free (void *); /* INFRINGES ON USER NAME SPACE */
++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifdef __cplusplus