[oe-commits] org.oe.dev merge of '696f3c5e555284edab7d8cdb02487889a270786b'
khem commit
oe at amethyst.openembedded.net
Mon Sep 1 17:50:00 UTC 2008
merge of '696f3c5e555284edab7d8cdb02487889a270786b'
and 'b701ffba40ab76cb5b74d4e7415eca78071755bb'
Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 8466993a3697b2418d8e30e8b4c0e64e456fe955
ViewMTN: http://monotone.openembedded.org/revision/info/8466993a3697b2418d8e30e8b4c0e64e456fe955
Files:
1
packages/flac/flac-1.1.0
packages/flac/flac-1.1.0/disable-xmms-plugin.patch
packages/flac/flac-1.1.0/xmms.m4
packages/flac/flac-1.1.2
packages/flac/files
packages/flac/flac_1.1.2.bb
packages/flac/flac.inc
packages/konqueror/konqueror-embedded-20070212
packages/konqueror/konqueror-embedded-20070316
packages/konqueror/konqueror-embedded_20070212.bb
packages/konqueror/konqueror-embedded_20070316.bb
packages/espgs/espgs_8.15.3.bb
packages/flac/flac_1.1.0.bb
packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch
packages/konqueror/konqueror-embedded-20070316/konqueror.desktop
packages/qt4/qt_staging.inc
packages/rrdtool/rrdtool_1.0.49.bb
Diffs:
#
# mt diff -r696f3c5e555284edab7d8cdb02487889a270786b -r8466993a3697b2418d8e30e8b4c0e64e456fe955
#
#
#
# delete "packages/flac/flac-1.1.0"
#
# delete "packages/flac/flac-1.1.0/disable-xmms-plugin.patch"
#
# delete "packages/flac/flac-1.1.0/xmms.m4"
#
# rename "packages/flac/flac-1.1.2"
# to "packages/flac/files"
#
# rename "packages/flac/flac_1.1.2.bb"
# to "packages/flac/flac.inc"
#
# rename "packages/konqueror/konqueror-embedded-20070212"
# to "packages/konqueror/konqueror-embedded-20070316"
#
# rename "packages/konqueror/konqueror-embedded_20070212.bb"
# to "packages/konqueror/konqueror-embedded_20070316.bb"
#
# add_file "packages/flac/flac_1.1.2.bb"
# content [245d992e59fe51ef048af8a26f63b8a3697553a9]
#
# patch "packages/espgs/espgs_8.15.3.bb"
# from [15c8fbb3bb09a6f58519c29dcb6c06b9a5bad084]
# to [d05b9354e4bf056b14a558f78714e226e99eea4c]
#
# patch "packages/flac/flac.inc"
# from [96f2861b917ed2fbcaa9526091bbe8c89b7a7a80]
# to [3debbf0cbf93e4c1cd7d9cf2fced5a6b7ed588a4]
#
# patch "packages/flac/flac_1.1.0.bb"
# from [71e75385e9a1c43fb8889177f8f7eee410a1ce49]
# to [06994a9dfe206b7f2228ed1848818e4da01eb833]
#
# patch "packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch"
# from [97449995738e923ea33949a405e6f928e11bdf83]
# to [fa173691844ffa2b26adf010b3d5b2e3080a1282]
#
# patch "packages/konqueror/konqueror-embedded-20070316/konqueror.desktop"
# from [f61654c86352e52a354a25c38006bfde302806ed]
# to [a1a145baa691f7f01386d8342a96cdd226cabfa5]
#
# patch "packages/konqueror/konqueror-embedded_20070316.bb"
# from [6e24fc121d123e76770ab74b853705ff5b790e98]
# to [86f01914d98db2ca4443578b2001273781984d3e]
#
# patch "packages/qt4/qt_staging.inc"
# from [47a145dc6e238d6fffdbd1cfa27edaa0e623d3ef]
# to [f35c509913b9b43e11838625fb843e06d4ea182e]
#
# patch "packages/rrdtool/rrdtool_1.0.49.bb"
# from [a39c7f89e3e1279eadc45341674681d20077b0d5]
# to [a364d6c23ab74530732b748ae5ffa3e7df3c3e57]
#
============================================================
--- packages/flac/flac_1.1.2.bb 245d992e59fe51ef048af8a26f63b8a3697553a9
+++ packages/flac/flac_1.1.2.bb 245d992e59fe51ef048af8a26f63b8a3697553a9
@@ -0,0 +1,13 @@
+require flac.inc
+
+PR = "r6"
+
+do_configure_append () {
+ # removes '-read-only-relocs' which is enabled for PowerPC builds.
+ # It makes the build fail, other archs are not affected. Fixes #1775.
+ sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile
+}
+
+do_stage_append () {
+ install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h
+}
============================================================
--- packages/espgs/espgs_8.15.3.bb 15c8fbb3bb09a6f58519c29dcb6c06b9a5bad084
+++ packages/espgs/espgs_8.15.3.bb d05b9354e4bf056b14a558f78714e226e99eea4c
@@ -2,31 +2,21 @@ SECTION = "libs"
including bug fixes, new drivers, and additional support for CUPS."
HOMEPAGE = "http://www.cups.org/espgs/"
SECTION = "libs"
-DEPENDS = "jpeg zlib libpng fontconfig"
+DEPENDS = "jpeg zlib libpng tiff fontconfig"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/${PV}/espgs-${PV}-source.tar.bz2"
-S = "${WORKDIR}/espgs-${PV}"
PARALLEL_MAKE = ""
inherit autotools
-PACKAGES += "espgs-examples espgs-resources"
-
-# I added the lib dir to the central package, since espgs complained of a missing file when run.
-# If I find exactly which files are needed for operation, I'll just add those, and split the package.
-
-FILES_${PN} += "${datadir}/ghostscript/8.15/lib/*"
-FILES_${PN}-doc += "${datadir}/ghostscript/8.15/doc/*"
-FILES_${PN}-examples += "${datadir}/ghostscript/8.15/examples/*"
-FILES_${PN}-resources += "${datadir}/ghostscript/8.15/Resource/*"
-
-EXTRA_OECONF = "--with-drivers= \
- --disable-cups \
+EXTRA_OECONF = "--with-drivers=ALL \
+ --enable-cups \
+ --without-ijs \
--disable-gtk \
- --without-ijs \
- --without-gimp-print \
+ --without-gimp-print \
--without-x \
--without-omni"
@@ -34,12 +24,32 @@ do_compile() {
oe_runmake CCAUX="${BUILD_CC}"
}
+
do_install () {
oe_runmake 'prefix=${D}${prefix}' \
'bindir=${D}${bindir}' \
'datadir=${D}${datadir}' \
+ 'cups_datadir=${D}${datadir}/cups' \
+ 'cups_serverroot=${D}${sysconfdir}/cups' \
+ 'cups_serverbin= ${D}${libdir}/cups' \
+ 'CUPSSERVER=${cups_serverbin}' \
+ 'CUPSCONFIG=${cups_serverroot}' \
+ 'CUPSDATA=${cups_datadir}' \
+ 'sysconfdir=${D}${sysconfdir}' \
'gsdir=${D}${datadir}/ghostscript' \
'gsdatadir=${D}${datadir}/ghostscript/8.15' \
'mandir=${D}${mandir}' \
- 'docdir=${D}${datadir}/doc/espgs/' install
+ 'docdir=${D}${datadir}/doc/espgs/' install
}
+
+PACKAGES += "espgs-examples espgs-resources"
+
+# I added the lib dir to the central package, since espgs complained of a missing file when run.
+# If I find exactly which files are needed for operation, I'll just add those, and split the package.
+
+FILES_${PN} += "${datadir}/ghostscript/8.15/lib/* \
+ ${libdir}/cups/filter/* \
+ ${datadir}/cups/model/* \"
+FILES_${PN}-doc += "${datadir}/ghostscript/8.15/doc/*"
+FILES_${PN}-examples += "${datadir}/ghostscript/8.15/examples/*"
+FILES_${PN}-resources += "${datadir}/ghostscript/8.15/Resource/*"
============================================================
--- packages/flac/flac_1.1.2.bb 96f2861b917ed2fbcaa9526091bbe8c89b7a7a80
+++ packages/flac/flac.inc 3debbf0cbf93e4c1cd7d9cf2fced5a6b7ed588a4
@@ -2,14 +2,11 @@ DEPENDS = "libogg"
LICENSE = "BSD GPL"
SECTION = "libs"
DEPENDS = "libogg"
-PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
file://disable-xmms-plugin.patch;patch=1 \
file://xmms.m4"
-S = "${WORKDIR}/flac-${PV}"
-
inherit autotools
EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
@@ -20,13 +17,6 @@ EXTRA_OECONF = "--disable-oggtest --disa
--without-libiconv-prefix \
--without-id3lib"
-PACKAGES += "libflac libflac++ liboggflac liboggflac++"
-FILES_${PN} = "${bindir}/*"
-FILES_libflac = "${libdir}/libFLAC.so.*"
-FILES_libflac++ = "${libdir}/libFLAC++.so.*"
-FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
-FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
-
do_configure () {
install -d ${S}/m4
install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
@@ -82,3 +72,10 @@ do_stage () {
install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
}
+
+PACKAGES += "libflac libflac++ liboggflac liboggflac++"
+FILES_${PN} = "${bindir}/*"
+FILES_libflac = "${libdir}/libFLAC.so.*"
+FILES_libflac++ = "${libdir}/libFLAC++.so.*"
+FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
+FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
============================================================
--- packages/flac/flac_1.1.0.bb 71e75385e9a1c43fb8889177f8f7eee410a1ce49
+++ packages/flac/flac_1.1.0.bb 06994a9dfe206b7f2228ed1848818e4da01eb833
@@ -1,78 +1,3 @@
-DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
-LICENSE = "BSD GPL"
-SECTION = "libs"
-DEPENDS = "libogg"
-PR = "r5"
+require flac.inc
+PR = "r6"
-SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
- file://disable-xmms-plugin.patch;patch=1 \
- file://xmms.m4"
-S = "${WORKDIR}/flac-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
- --with-ogg-libraries=${STAGING_LIBDIR} \
- --with-ogg-includes=${STAGING_INCDIR} \
- --without-xmms-prefix \
- --without-xmms-exec-prefix \
- --without-libiconv-prefix \
- --without-id3lib"
-
-PACKAGES += "libflac libflac++ liboggflac liboggflac++"
-FILES_${PN} = "${bindir}/*"
-FILES_libflac = "${libdir}/libFLAC.so.*"
-FILES_libflac++ = "${libdir}/libFLAC++.so.*"
-FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
-FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
-
-do_configure () {
- install -d ${S}/m4
- install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
- autotools_do_configure
-}
-
-do_stage () {
- install -d ${STAGING_DATADIR}/aclocal
-
- oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/OggFLAC
- install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
- install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
- install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
- install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
- install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
- oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/FLAC
- install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
- install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
- install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
- install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
- install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
- install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
- install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
- install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
- install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
- install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
- install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
- install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
- install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
- oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/FLAC++
- install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
- install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
- install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
- install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
- install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
- install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-
- oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
- install -d ${STAGING_INCDIR}/OggFLAC++
- install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
- install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
- install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
- install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
- install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-}
============================================================
--- packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch 97449995738e923ea33949a405e6f928e11bdf83
+++ packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch fa173691844ffa2b26adf010b3d5b2e3080a1282
@@ -1,6 +1,6 @@
-diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4
+diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox/acinclude.m4
--- kdenox/acinclude.m4 2007-02-12 22:26:21.000000000 +1300
-+++ kdenox_new/acinclude.m4 2007-02-25 22:00:27.000000000 +1300
++++ kdenox/acinclude.m4 2007-02-25 22:00:27.000000000 +1300
@@ -880,7 +880,7 @@
)
@@ -10,9 +10,9 @@ diff -urNd --exclude-from=excludelist kd
AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]),
kde_use_qt_emb_rtti=$enableval,
kde_use_qt_emb_rtti=no
-diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.in
+diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox/configure.in
--- kdenox/configure.in 2007-02-12 22:26:21.000000000 +1300
-+++ kdenox_new/configure.in 2007-02-25 17:49:59.000000000 +1300
++++ kdenox/configure.in 2007-02-25 17:49:59.000000000 +1300
@@ -60,10 +60,10 @@
@@ -26,9 +26,9 @@ diff -urNd --exclude-from=excludelist kd
fi
dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in
+diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox/configure.in.in
--- kdenox/configure.in.in 2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/configure.in.in 2007-02-25 17:49:27.000000000 +1300
++++ kdenox/configure.in.in 2007-02-25 17:49:27.000000000 +1300
@@ -56,10 +56,10 @@
@@ -42,9 +42,9 @@ diff -urNd --exclude-from=excludelist kd
fi
dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox/konq-embed/dropin/kfiledialog.cpp
--- kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-12 22:25:57.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300
++++ kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300
@@ -23,6 +23,7 @@
@@ -53,9 +53,9 @@ diff -urNd --exclude-from=excludelist kd
#include <qlayout.h>
#include <qconfig.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp
--- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300
@@ -23,7 +23,9 @@
*/
@@ -66,9 +66,9 @@ diff -urNd --exclude-from=excludelist kd
#include <kconfig.h>
#include <ioslave_defaults.h>
#include <kdeversion.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox_new/konq-embed/dropin/kio/progressbase.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox/konq-embed/dropin/kio/progressbase.cpp
--- kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-12 22:25:56.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300
@@ -18,6 +18,7 @@
#include "jobclasses.h"
@@ -77,9 +77,9 @@ diff -urNd --exclude-from=excludelist kd
//namespace KIO {
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox/konq-embed/ipkg/preinst
--- kdenox/konq-embed/ipkg/preinst 1970-01-01 12:00:00.000000000 +1200
-+++ kdenox_new/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300
++++ kdenox/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300
@@ -0,0 +1,15 @@
+#!/bin/sh
+
@@ -96,9 +96,9 @@ diff -urNd --exclude-from=excludelist kd
+ fi
+done
+
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h
--- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-12 21:31:39.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300
@@ -26,6 +26,8 @@
#include <qvaluelist.h>
#include "kdelibs_export.h"
@@ -108,9 +108,9 @@ diff -urNd --exclude-from=excludelist kd
class KMultipleDragPrivate;
/**
* This class makes it easy for applications to provide a drag object
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-emb%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb701ffba40ab76cb5b74d4e7415eca78071755bb -r8466993a3697b2418d8e30e8b4c0e64e456fe955
#
#
# no changes
#
More information about the Openembedded-commits
mailing list