diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-01-31 08:27:34 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-01-31 08:27:34 +0000 |
| commit | 7a2c81bf198b4bcd8f344a1ef72734d1d605bba9 (patch) | |
| tree | e5120d1222b1c2789a442f515dcf061d4f2c5c52 /packages | |
| parent | f53c4a0cfc709f29c5251ea374fc74fb1ef75ac2 (diff) | |
| parent | a24ac638a631ddd5722cad0e4bbf30084664c709 (diff) | |
merge of d95a77faa4899185141ccf69126722bbf2116c19
and e063b9788ae00fbebf2d7ae07cf7f7fc2feb45e9
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/js/js_1.5.bb | 14 | ||||
| -rw-r--r-- | packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch | 13 | ||||
| -rw-r--r-- | packages/vorbis-tools/vorbis-tools_1.0.1.bb | 11 |
3 files changed, 26 insertions, 12 deletions
diff --git a/packages/js/js_1.5.bb b/packages/js/js_1.5.bb index 5f8323769f..cb353d968c 100644 --- a/packages/js/js_1.5.bb +++ b/packages/js/js_1.5.bb @@ -1,15 +1,12 @@ -LICENSE = "GPL" DESCRIPTION = "A JavaScript engine" -SECTION = "libs" +LICENSE = "GPL" +SECTION = "libs/network" DEPENDS = "readline" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.5.tar.gz \ - file://jsautocfg.h" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz \ + file://jsautocfg.h" S = "${WORKDIR}/js/src" -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a" - EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'XCFLAGS=${CFLAGS}' 'XLDFLAGS=-L${STAGING_LIBDIR} -soname=libjs'" do_compile_prepend() { @@ -33,3 +30,6 @@ do_stage() { install -m 0644 ${S}/*.h ${STAGING_INCDIR}/js/ oe_libinstall -so -C Linux_All_DBG.OBJ libjs ${STAGING_LIBDIR} } + +FILES_${PN} = "${libdir}/lib*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a" diff --git a/packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch b/packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch new file mode 100644 index 0000000000..6261ac175c --- /dev/null +++ b/packages/vorbis-tools/vorbis-tools-1.0.1/remove-deprecated-curl-option.patch @@ -0,0 +1,13 @@ +Index: vorbis-tools-1.0.1/ogg123/http_transport.c +=================================================================== +--- vorbis-tools-1.0.1.orig/ogg123/http_transport.c ++++ vorbis-tools-1.0.1/ogg123/http_transport.c +@@ -113,7 +113,7 @@ void set_curl_opts (http_private_t *priv + if (inputOpts.ProxyTunnel) + curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel); + */ +- curl_easy_setopt(handle, CURLOPT_MUTE, 1); ++ /* curl_easy_setopt(handle, CURLOPT_MUTE, 1); */ + curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error); + curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback); + curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private); diff --git a/packages/vorbis-tools/vorbis-tools_1.0.1.bb b/packages/vorbis-tools/vorbis-tools_1.0.1.bb index 7b8a75dd3b..9991156dcd 100644 --- a/packages/vorbis-tools/vorbis-tools_1.0.1.bb +++ b/packages/vorbis-tools/vorbis-tools_1.0.1.bb @@ -1,13 +1,14 @@ -LICENSE = "GPL" -DEPENDS = "libogg libvorbis libao curl" -DESCRIPTION = " vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \ +DESCRIPTION = "vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \ ogginfo (displays ogg information), vcut (ogg file splitter), and \ vorbiscomment (ogg comment editor)." - +LICENSE = "GPL" +DEPENDS = "libogg libvorbis libao curl" SECTION = "console/multimedia" +PR = "r1" SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \ - file://m4.patch;patch=1" + file://m4.patch;patch=1 \ + file://remove-deprecated-curl-option.patch;patch=1" inherit autotools |