[oe-commits] org.oe.dev merge of '059498b6c4f13f5dfa1e6c21a17742c9c506dc06'
oe commit
openembedded-commits at lists.openembedded.org
Thu Feb 28 00:31:22 UTC 2008
merge of '059498b6c4f13f5dfa1e6c21a17742c9c506dc06'
and '37c001885fbd1b66958b92b288dcb0c2e2024213'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d750ea7ef7e7aca16df6c41e844a4e62d9fef164
ViewMTN: http://monotone.openembedded.org/revision/info/d750ea7ef7e7aca16df6c41e844a4e62d9fef164
Files:
1
packages/xvidcap
packages/xvidcap/xvidcap.inc
packages/xvidcap/xvidcap_1.1.6.bb
packages/xvidcap/xvidcap_1.1.7rc1.bb
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/boost/boost_1.33.0.bb
packages/boost/boost_1.33.1.bb
Diffs:
#
# mt diff -r059498b6c4f13f5dfa1e6c21a17742c9c506dc06 -rd750ea7ef7e7aca16df6c41e844a4e62d9fef164
#
#
#
# add_dir "packages/xvidcap"
#
# add_file "packages/xvidcap/xvidcap.inc"
# content [70f22e3dac547564bd7b3c4e29b15d7b1458a393]
#
# add_file "packages/xvidcap/xvidcap_1.1.6.bb"
# content [893d6c7e33ce7d9566fa9ee2dc59153563e08828]
#
# add_file "packages/xvidcap/xvidcap_1.1.7rc1.bb"
# content [02497635f8ca2648983f1a14199a3e1da3b5f47d]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# from [a71a90f95c1e63d6e70e783d56e0e3d756600f16]
# to [7189c9e70cf87bf7a1cc2980dd19561351b4a37b]
#
============================================================
--- packages/xvidcap/xvidcap.inc 70f22e3dac547564bd7b3c4e29b15d7b1458a393
+++ packages/xvidcap/xvidcap.inc 70f22e3dac547564bd7b3c4e29b15d7b1458a393
@@ -0,0 +1,16 @@
+DESCRIPTION = "Capture X-Window display to individual frames or MPEG video."
+SECTION = "multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "Rasca <thron at gmx.de> Karl H. Beckers <karl.h.beckers at gmx.net>"
+HOMEPAGE = "http://xvidcap.sf.net"
+
+DEPENDS = "intltool-native docbook-utils-native gtk+ glib-2.0 libglade lame xmu libxfixes xdamage"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-libmp3lame --with-x"
+
+FILES_${PN} += "${datadir}/dbus-1"
============================================================
--- packages/xvidcap/xvidcap_1.1.6.bb 893d6c7e33ce7d9566fa9ee2dc59153563e08828
+++ packages/xvidcap/xvidcap_1.1.6.bb 893d6c7e33ce7d9566fa9ee2dc59153563e08828
@@ -0,0 +1,4 @@
+require xvidcap.inc
+
+PR = "r0"
+
============================================================
--- packages/xvidcap/xvidcap_1.1.7rc1.bb 02497635f8ca2648983f1a14199a3e1da3b5f47d
+++ packages/xvidcap/xvidcap_1.1.7rc1.bb 02497635f8ca2648983f1a14199a3e1da3b5f47d
@@ -0,0 +1,6 @@
+require xvidcap.inc
+
+PR = "r0"
+
+# 1.1.7rc1 still uses this directory name
+S = "${WORKDIR}/${PN}-1.1.6"
============================================================
--- packages/docbook-utils/docbook-utils-native_0.6.14.bb a71a90f95c1e63d6e70e783d56e0e3d756600f16
+++ packages/docbook-utils/docbook-utils-native_0.6.14.bb 7189c9e70cf87bf7a1cc2980dd19561351b4a37b
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "console/utils"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native"
@@ -25,6 +25,7 @@ do_stage () {
for doctype in html ps dvi man pdf rtf tex texi txt
do
install -m 0755 ${S}/bin/docbook2$doctype ${STAGING_BINDIR_NATIVE}/
+ ln -sf docbook2x-$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype
ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/db2$doctype
ln -sf docbook2$doctype ${STAGING_BINDIR_NATIVE}/docbook-to-$doctype
done
#
# mt diff -r37c001885fbd1b66958b92b288dcb0c2e2024213 -rd750ea7ef7e7aca16df6c41e844a4e62d9fef164
#
#
#
# patch "packages/boost/boost_1.33.0.bb"
# from [9250e9c2e1581c023e64867372028588784a5709]
# to [e112502158b7f977f56f3408d0d4e06562698c72]
#
# patch "packages/boost/boost_1.33.1.bb"
# from [b7d50805cd778e9f1ace2effa81618d4968d1175]
# to [9e61fbe13da215613e0df5e8e49a650c399e667d]
#
============================================================
--- packages/boost/boost_1.33.0.bb 9250e9c2e1581c023e64867372028588784a5709
+++ packages/boost/boost_1.33.0.bb e112502158b7f977f56f3408d0d4e06562698c72
@@ -21,42 +21,43 @@ S = "${WORKDIR}/${BOOST_P}"
S = "${WORKDIR}/${BOOST_P}"
# Make a package for each library, plus -dev and -python
-PACKAGES =
+PACKAGES = "${PN}-dbg"
+BOOSTLIBS = ""
PACKAGES += "boost-date-time"
FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}"
-PACKAGES += "boost-filesystem"
+BOOSTLIBS += "boost-filesystem"
FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}"
-PACKAGES += "boost-prg-exec-monitor"
+BOOSTLIBS += "boost-prg-exec-monitor"
FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}"
-PACKAGES += "boost-program-options"
+BOOSTLIBS += "boost-program-options"
FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}"
-PACKAGES += "boost-regex"
+BOOSTLIBS += "boost-regex"
FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}"
-PACKAGES += "boost-signals"
+BOOSTLIBS += "boost-signals"
FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}"
-PACKAGES += "boost-test-exec-monitor"
+BOOSTLIBS += "boost-test-exec-monitor"
FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}"
-PACKAGES += "boost-thread-mt"
+BOOSTLIBS += "boost-thread-mt"
FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
-PACKAGES += "boost-unit-test-framework"
+BOOSTLIBS += "boost-unit-test-framework"
FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
-PACKAGES += "boost-iostreams"
+BOOSTLIBS += "boost-iostreams"
FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
-PACKAGES += "boost-serialization"
+BOOSTLIBS += "boost-serialization"
FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
-PACKAGES += "boost-wserialization"
+BOOSTLIBS += "boost-wserialization"
FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
# Python - remove this and set:
@@ -66,13 +67,19 @@ PYTHON_VERSION = "2.4"
PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
-PACKAGES += "boost-python"
+BOOSTLIBS += "boost-python"
FILES_boost-python = "${libdir}/libboost_python.so.${PV}"
+PACKAGES += "${BOOSTLIBS}"
+
# -dev last to pick up the remaining stuff
PACKAGES += "${PN}-dev"
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+# "boost" is a metapackage which pulls in all boost librabries
+PACKAGES += "${PN}"
+RRECOMMENDS_${PN} += "${BOOSTLIBS}"
+
# Oh yippee, a new build system, it's sooo cooool I could eat my own
# foot. inlining=on lets the compiler choose, I think. At least this
# stuff is documented...
============================================================
--- packages/boost/boost_1.33.1.bb b7d50805cd778e9f1ace2effa81618d4968d1175
+++ packages/boost/boost_1.33.1.bb 9e61fbe13da215613e0df5e8e49a650c399e667d
@@ -21,42 +21,43 @@ S = "${WORKDIR}/${BOOST_P}"
S = "${WORKDIR}/${BOOST_P}"
# Make a package for each library, plus -dev and -python
-PACKAGES =
+PACKAGES = "${PN}-dbg"
+BOOSTLIBS = ""
PACKAGES += "boost-date-time"
FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}"
-PACKAGES += "boost-filesystem"
+BOOSTLIBS += "boost-filesystem"
FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}"
-PACKAGES += "boost-prg-exec-monitor"
+BOOSTLIBS += "boost-prg-exec-monitor"
FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}"
-PACKAGES += "boost-program-options"
+BOOSTLIBS += "boost-program-options"
FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}"
-PACKAGES += "boost-regex"
+BOOSTLIBS += "boost-regex"
FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}"
-PACKAGES += "boost-signals"
+BOOSTLIBS += "boost-signals"
FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}"
-PACKAGES += "boost-test-exec-monitor"
+BOOSTLIBS += "boost-test-exec-monitor"
FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}"
-PACKAGES += "boost-thread-mt"
+BOOSTLIBS += "boost-thread-mt"
FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
-PACKAGES += "boost-unit-test-framework"
+BOOSTLIBS += "boost-unit-test-framework"
FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
-PACKAGES += "boost-iostreams"
+BOOSTLIBS += "boost-iostreams"
FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
-PACKAGES += "boost-serialization"
+BOOSTLIBS += "boost-serialization"
FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
-PACKAGES += "boost-wserialization"
+BOOSTLIBS += "boost-wserialization"
FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
# Python - remove this and set:
@@ -66,13 +67,19 @@ PYTHON_VERSION = "2.4"
PYTHON_ROOT = "${STAGING_DIR_HOST}"
PYTHON_VERSION = "2.4"
-PACKAGES += "boost-python"
+BOOSTLIBS += "boost-python"
FILES_boost-python = "${libdir}/libboost_python.so.${PV}"
+PACKAGES += "${BOOSTLIBS}"
+
# -dev last to pick up the remaining stuff
PACKAGES += "${PN}-dev"
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+# "boost" is a metapackage which pulls in all boost librabries
+PACKAGES += "${PN}"
+RRECOMMENDS_${PN} += "${BOOSTLIBS}"
+
# Oh yippee, a new build system, it's sooo cooool I could eat my own
# foot. inlining=on lets the compiler choose, I think. At least this
# stuff is documented...
More information about the Openembedded-commits
mailing list