2 files changed, 53 insertions, 61 deletions
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc
deleted file mode 100644
index e08d11b0c2..0000000000
--- a/meta-oe/recipes-multimedia/live555/live555.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-# live555 OE build file
-# Copyright (C) 2005, Koninklijke Philips Electronics NV.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-DESCRIPTION = "LIVE555 Streaming Media libraries"
-HOMEPAGE = "http://live.com/"
-LICENSE = "LGPLv3"
-SECTION = "devel"
-URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}"
-SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \
-           file://config.linux-cross"
-# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
-MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
-S = "${WORKDIR}/live"
-TARGET_CC_ARCH += "${LDFLAGS}"
-do_configure() {
-    cp ${WORKDIR}/config.linux-cross .
-    echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross
-    ./genMakefiles linux-cross
-}
-do_compile() {
-    oe_runmake
-}
-do_install() {
-    install -d ${D}${includedir}/BasicUsageEnvironment
-    install -d ${D}${includedir}/groupsock
-    install -d ${D}${includedir}/liveMedia
-    install -d ${D}${includedir}/UsageEnvironment
-    install -d ${D}${libdir}
-    cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
-    # Find all the headers
-    for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
-        install ${i} ${D}${includedir}
-    done
-    cp ${S}/*/*.a ${D}${libdir}
-    install -d ${D}${bindir}
-    for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do
-        install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
-    done
-    install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
-}
-PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples"
-FILES_live555-openrtsp = "${bindir}/openRTSP"
-FILES_live555-playsip = "${bindir}/playSIP"
-FILES_live555-mediaserver = "${bindir}/live555MediaServer"
-FILES_live555-examples = "${bindir}/*"
diff --git a/meta-oe/recipes-multimedia/live555/live555_20190828.bb b/meta-oe/recipes-multimedia/live555/live555_20190828.bb
index 1da61c0cf5..39e1fddfcc 100644
--- a/meta-oe/recipes-multimedia/live555/live555_20190828.bb
+++ b/meta-oe/recipes-multimedia/live555/live555_20190828.bb
@@ -1,11 +1,59 @@
-require live555.inc
+# live555 OE build file
+# Copyright (C) 2005, Koninklijke Philips Electronics NV.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "LIVE555 Streaming Media libraries"
+HOMEPAGE = "http://live.com/"
+LICENSE = "LGPLv3"
+SECTION = "devel"
+URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}"
+SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \
+           file://config.linux-cross"
+# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
+MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
+SRC_URI[sha256sum] = "a3dcd157865186cf883c3a80b4bb09637e91fff96b234b2c780a7f7dcc7a35dc"
+S = "${WORKDIR}/live"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                    file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \
                   "
-# SRC_URI[md5sum] = "a84ca3946d899f5592c7d31012ed2fe3"
-# SRC_URI[sha256sum] = "0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd"
-SRC_URI[md5sum] = "a593f915664793b3ba41299b17b8bedc"
+TARGET_CC_ARCH += "${LDFLAGS}"
-SRC_URI[sha256sum] = "a3dcd157865186cf883c3a80b4bb09637e91fff96b234b2c780a7f7dcc7a35dc"
+do_configure() {
+    cp ${WORKDIR}/config.linux-cross .
+    echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross
+    ./genMakefiles linux-cross
+}
+do_install() {
+    install -d ${D}${includedir}/BasicUsageEnvironment
+    install -d ${D}${includedir}/groupsock
+    install -d ${D}${includedir}/liveMedia
+    install -d ${D}${includedir}/UsageEnvironment
+    install -d ${D}${libdir}
+    cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
+    cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
+    # Find all the headers
+    for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
+        install ${i} ${D}${includedir}
+    done
+    cp ${S}/*/*.a ${D}${libdir}
+    install -d ${D}${bindir}
+    for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do
+        install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
+    done
+    install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
+}
+PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples"
+FILES_live555-openrtsp = "${bindir}/openRTSP"
+FILES_live555-playsip = "${bindir}/playSIP"
+FILES_live555-mediaserver = "${bindir}/live555MediaServer"
+FILES_live555-examples = "${bindir}/*"

diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc deleted file mode 100644 index e08d11b0c2..0000000000 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ /dev/null
@@ -1,56 +0,0 @@
1	# live555 OE build file
2	# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved
3	# Released under the MIT license (see packages/COPYING)
4
5	DESCRIPTION = "LIVE555 Streaming Media libraries"
6	HOMEPAGE = "http://live.com/"
7	LICENSE = "LGPLv3"
8	SECTION = "devel"
9
10	URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}"
11	SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \
12	file://config.linux-cross"
13	# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
14	MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
15
16	S = "${WORKDIR}/live"
17	TARGET_CC_ARCH += "${LDFLAGS}"
18
19	do_configure() {
20	cp ${WORKDIR}/config.linux-cross .
21	echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross
22	./genMakefiles linux-cross
23	}
24
25	do_compile() {
26	oe_runmake
27	}
28
29	do_install() {
30	install -d ${D}${includedir}/BasicUsageEnvironment
31	install -d ${D}${includedir}/groupsock
32	install -d ${D}${includedir}/liveMedia
33	install -d ${D}${includedir}/UsageEnvironment
34	install -d ${D}${libdir}
35	cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
36	cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
37	cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
38	cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
39	cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
40	# Find all the headers
41	for i in $(find . -name ".hh") $(find . -name ".h") ; do
42	install ${i} ${D}${includedir}
43	done
44	cp ${S}//.a ${D}${libdir}
45	install -d ${D}${bindir}
46	for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do
47	install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
48	done
49	install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
50	}
51
52	PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples"
53	FILES_live555-openrtsp = "${bindir}/openRTSP"
54	FILES_live555-playsip = "${bindir}/playSIP"
55	FILES_live555-mediaserver = "${bindir}/live555MediaServer"
56	FILES_live555-examples = "${bindir}/*"


diff --git a/meta-oe/recipes-multimedia/live555/live555_20190828.bb b/meta-oe/recipes-multimedia/live555/live555_20190828.bb index 1da61c0cf5..39e1fddfcc 100644 --- a/meta-oe/recipes-multimedia/live555/live555_20190828.bb +++ b/meta-oe/recipes-multimedia/live555/live555_20190828.bb
@@ -1,11 +1,59 @@
1	require live555.inc	1	# live555 OE build file
		2	# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved
		3	# Released under the MIT license (see packages/COPYING)
		4
		5	DESCRIPTION = "LIVE555 Streaming Media libraries"
		6	HOMEPAGE = "http://live.com/"
		7	LICENSE = "LGPLv3"
		8	SECTION = "devel"
		9
		10	URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}"
		11	SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \
		12	file://config.linux-cross"
		13	# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
		14	MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n"
		15
		16	SRC_URI[sha256sum] = "a3dcd157865186cf883c3a80b4bb09637e91fff96b234b2c780a7f7dcc7a35dc"
		17
		18	S = "${WORKDIR}/live"
2		19
3	LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \	20	LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4	file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \	21	file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \
5	"	22	"
6	# SRC_URI[md5sum] = "a84ca3946d899f5592c7d31012ed2fe3"
7	# SRC_URI[sha256sum] = "0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd"
8		23
9	SRC_URI[md5sum] = "a593f915664793b3ba41299b17b8bedc"	24	TARGET_CC_ARCH += "${LDFLAGS}"
10	SRC_URI[sha256sum] = "a3dcd157865186cf883c3a80b4bb09637e91fff96b234b2c780a7f7dcc7a35dc"	25
		26	do_configure() {
		27	cp ${WORKDIR}/config.linux-cross .
		28	echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross
		29	./genMakefiles linux-cross
		30	}
		31
		32	do_install() {
		33	install -d ${D}${includedir}/BasicUsageEnvironment
		34	install -d ${D}${includedir}/groupsock
		35	install -d ${D}${includedir}/liveMedia
		36	install -d ${D}${includedir}/UsageEnvironment
		37	install -d ${D}${libdir}
		38	cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
		39	cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
		40	cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
		41	cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
		42	cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
		43	# Find all the headers
		44	for i in $(find . -name ".hh") $(find . -name ".h") ; do
		45	install ${i} ${D}${includedir}
		46	done
		47	cp ${S}//.a ${D}${libdir}
		48	install -d ${D}${bindir}
		49	for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do
		50	install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
		51	done
		52	install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
		53	}
11		54
		55	PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples"
		56	FILES_live555-openrtsp = "${bindir}/openRTSP"
		57	FILES_live555-playsip = "${bindir}/playSIP"
		58	FILES_live555-mediaserver = "${bindir}/live555MediaServer"
		59	FILES_live555-examples = "${bindir}/*"