merge of c6f51b08eabf922e93feada29159ba2de2a5caec

     and d392153f540fb53432b333f95c079d221f6570f1

8 files changed, 173 insertions, 0 deletions

diff --git a/packages/povray/.mtn2git_empty b/packages/povray/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/povray/.mtn2git_empty
diff --git a/packages/povray/files/.mtn2git_empty b/packages/povray/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/povray/files/.mtn2git_empty
diff --git a/packages/povray/files/configure-cross-hack.patch b/packages/povray/files/configure-cross-hack.patch
new file mode 100644
index 0000000000..550eac9323
--- /dev/null
+++ b/packages/povray/files/configure-cross-hack.patch
@@ -0,0 +1,94 @@
+--- /tmp/configure	2006-09-04 20:44:50.000000000 +0200
++++ povray-3.6.1/configure	2006-09-04 20:44:58.085780000 +0200
+@@ -10287,7 +10287,7 @@
+           # check library version, update LIBS
+           echo "$as_me:$LINENO: checking for libz version >= $required_libz_version" >&5
+ echo $ECHO_N "checking for libz version >= $required_libz_version... $ECHO_C" >&6
+-          if test "$cross_compiling" = yes; then
++          if test "$cross_compilingi" = yes; then
+   echo "$as_me:$LINENO: result: cross-compiling, forced" >&5
+ echo "${ECHO_T}cross-compiling, forced" >&6
+ 
+@@ -10338,7 +10338,7 @@
+ ( exit $ac_status )
+ 
+               if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then
+-                pov_check_lib="unknown"
++                pov_check_lib="ok"
+                 echo "$as_me:$LINENO: result: $pov_check_lib" >&5
+ echo "${ECHO_T}$pov_check_lib" >&6
+               else
+@@ -10632,7 +10632,7 @@
+           # check library version, update LIBS
+           echo "$as_me:$LINENO: checking for libpng version >= $required_libpng_version" >&5
+ echo $ECHO_N "checking for libpng version >= $required_libpng_version... $ECHO_C" >&6
+-          if test "$cross_compiling" = yes; then
++          if test "$cross_compilingi" = yes; then
+   echo "$as_me:$LINENO: result: cross-compiling, forced" >&5
+ echo "${ECHO_T}cross-compiling, forced" >&6
+ 
+@@ -10683,7 +10683,7 @@
+ ( exit $ac_status )
+ 
+               if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then
+-                pov_check_lib="unknown"
++                pov_check_lib="ok"
+                 echo "$as_me:$LINENO: result: $pov_check_lib" >&5
+ echo "${ECHO_T}$pov_check_lib" >&6
+               else
+@@ -10989,7 +10989,7 @@
+           # check library version, update LIBS
+           echo "$as_me:$LINENO: checking for libjpeg version >= $required_libjpeg_version" >&5
+ echo $ECHO_N "checking for libjpeg version >= $required_libjpeg_version... $ECHO_C" >&6
+-          if test "$cross_compiling" = yes; then
++          if test "$cross_compilings" = yes; then
+   echo "$as_me:$LINENO: result: cross-compiling, forced" >&5
+ echo "${ECHO_T}cross-compiling, forced" >&6
+ 
+@@ -11041,12 +11041,12 @@
+ ( exit $ac_status )
+ 
+               if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then
+-                pov_check_libjpeg="unknown"
++                pov_check_libjpeg="ok"
+                 echo "$as_me:$LINENO: result: $pov_check_libjpeg" >&5
+ echo "${ECHO_T}$pov_check_libjpeg" >&6
+               else
+                 pov_check_libjpeg_version=`eval $ac_try 2>&1`
+-                pov_check_libjpeg="bad"
++                pov_check_libjpeg="ok"
+                 echo "$as_me:$LINENO: result: $pov_check_libjpeg_version, $pov_check_libjpeg" >&5
+ echo "${ECHO_T}$pov_check_libjpeg_version, $pov_check_libjpeg" >&6
+               fi
+@@ -11079,7 +11079,7 @@
+ 
+ subdirs="$subdirs libraries/jpeg"
+ 
+-  if test "$ac_cv_search_jpeg_std_error"; then
++  if test "$ac_cv_search_jpeg_std_errort"; then
+     LIBS=`echo $LIBS | sed s,$ac_cv_search_jpeg_std_error,,g`
+   fi
+   INCJPEG="-I\$(top_srcdir)/libraries/jpeg"
+@@ -11341,7 +11341,7 @@
+           # check library version, update LIBS
+           echo "$as_me:$LINENO: checking for libtiff version >= $required_libtiff_version" >&5
+ echo $ECHO_N "checking for libtiff version >= $required_libtiff_version... $ECHO_C" >&6
+-          if test "$cross_compiling" = yes; then
++          if test "$cross_compilingi" = yes; then
+   echo "$as_me:$LINENO: result: cross-compiling, forced" >&5
+ echo "${ECHO_T}cross-compiling, forced" >&6
+ 
+@@ -11398,11 +11398,11 @@
+ ( exit $ac_status )
+ 
+               if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then
+-                pov_check_libtiff="unknown"
++                pov_check_libtiff="ok"
+                 echo "$as_me:$LINENO: result: $pov_check_libtiff" >&5
+ echo "${ECHO_T}$pov_check_libtiff" >&6
+               else
+-                pov_check_libtiff_version=`eval $ac_try 2>&1`
++                pov_check_libtiff_version="3.6.1"
+                 pov_check_libtiff="bad"
+                 echo "$as_me:$LINENO: result: $pov_check_libtiff_version, $pov_check_libtiff" >&5
+ echo "${ECHO_T}$pov_check_libtiff_version, $pov_check_libtiff" >&6
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
new file mode 100644
index 0000000000..ee4876324e
--- /dev/null
+++ b/packages/povray/povray_3.6.1.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. "
+HOMEPAGE = "http://www.povray.org"
+SECTION = "foo/bar"
+#Make this a weak assigment to allow branding of the povray binary 
+MAINTAINER ?= "Koen Kooi <koen@openembedded.org>"
+LICENSE = "povray"
+
+DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
+RDEPENDS = ""
+
+PR = "r0" 
+
+#We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack.
+SRC_URI = "http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \
+	   file://configure-cross-hack.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-x COMPILED_BY=${MAINTAINER}" 
+PARALLEL_MAKE = ""
+
+#autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect
+do_configure() {
+	oe_runconf
+}	
+
+PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes"
+
+PACKAGE_ARCH_${PN}-doc = "all"
+
+PACKAGE_ARCH_${PN}-scenes = "all"
+FILES_${PN}-scenes = "${datadir}/povray-3.6/scenes"
+
+PACKAGE_ARCH_${PN}-ini = "all"
+FILES_${PN}-ini = "${datadir}/povray-3.6/ini"
+
+PACKAGE_ARCH_${PN}-icons = "all"
+FILES_${PN}-icons = "${datadir}/povray-3.6/icons"
+
+PACKAGE_ARCH_${PN}-scripts = "all"
+FILES_${PN}-scripts = "${datadir}/povray-3.6/scripts"
+
+PACKAGE_ARCH_${PN}-includes = "all"
+FILES_${PN}-includes = "${datadir}/povray-3.6/include"
+
diff --git a/packages/rox/.mtn2git_empty b/packages/rox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/rox/.mtn2git_empty
diff --git a/packages/rox/files/.mtn2git_empty b/packages/rox/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/rox/files/.mtn2git_empty
diff --git a/packages/rox/files/no-strip-objcopy.patch b/packages/rox/files/no-strip-objcopy.patch
new file mode 100644
index 0000000000..181dccc436
--- /dev/null
+++ b/packages/rox/files/no-strip-objcopy.patch
@@ -0,0 +1,13 @@
+--- /tmp/Makefile.in	2006-09-04 22:08:51.000000000 +0200
++++ rox-filer-2.5/ROX-Filer/src/Makefile.in	2006-09-04 22:09:00.275780000 +0200
+@@ -51,10 +51,6 @@
+ ${PROG}: ${OBJECTS}
+ 	${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
+ 	mv "${PROG}" "${PLATFORM_DIR}"
+-	-(cd "${PLATFORM_DIR}" && \
+-	 objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \
+-	 strip ROX-Filer && \
+-	 objcopy --add-gnu-debuglink=ROX-Filer.dbg ROX-Filer)
+ 
+ clean:
+ 	rm -f *.o Makefile.bak
diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb
new file mode 100644
index 0000000000..87552ddfc2
--- /dev/null
+++ b/packages/rox/rox-filer_2.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "the file manager at the core of the ROX desktop"
+HOMEPAGE = "http://rox.sf.net"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/rox/${P}.tar.bz2 \
+           file://no-strip-objcopy.patch;patch=1;pnum=3"
+
+inherit pkgconfig
+
+S = "${WORKDIR}/${P}/ROX-Filer/src/"
+
+do_compile() {
+	../AppRun --compile
+}	
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 755 ../ROX-Filer ${D}${bindir}
+}
+