diff options
47 files changed, 1390 insertions, 359 deletions
diff --git a/README.SRC_URI b/README.SRC_URI new file mode 100644 index 0000000..4f87a96 --- /dev/null +++ b/README.SRC_URI @@ -0,0 +1,50 @@ +talk about using SRCREV instead of branch or tag at SRC_URI +----------------------------------------------------------- + +Sent: Tuesday, April 05, 2016 11:33 PM +To: James Thomas +Cc: genivi-meta-ivi@lists.genivi.org +Subject: Re: [meta-ivi] Building with local source mirror + +On Tue, Mar 29, 2016 at 10:51 PM, James Thomas <james.thomas@codethink.co.uk> wrote: +> One thing I noticed is that simply providing the SRCREV works as long +> as that sha exists within master, if it doesn't then you have a build +> error, so being able to use tags is useful. +> +> I think using git://...;tag=foo is not sufficient, because tags *can* +> change (i.e there's no guarantee that the tag you're using is going to +> be the same as the one you used yesterday). +> +> What would be nice is if you could go tag=foo, and have it verified +> against SRCREV (in my testing this resulted in a build error *when* +> the tag and sha matched) +> +> However, something like +> +> SRC_URI = "git://mygitrepo/foo.git;nobranch=1;branch=v0.2" +> SRCREV = "7654321" +> +> does enforce that check (v0.2 is actually a tag in this case), which +> seems to be pretty useful (the recipe provides something human +> readable, and something a machine can understand, and will always +> check they match) + +I completely understand the reasoning behind this. The point I'm trying to + make is that the automotive industry has a strong need for reproducible + offline builds and any kind of mandatory online checks break this requirement. + And like Federico said, using SRCREV is also the Yocto project practice. + +If we want meta-ivi to be widely used in the industry I believe it should + support it's needs. In my opinion the same should go for the whole GENIVI + stack to work nicely, which in particular means tags of the projects should + not change. But the easiest solution would be for meta-ivi to not use tags. + That way it supports offline builds and it is also possible to track bugfixes + in the projects instead of pinning to the tag and then getting the bugfixes + in patch by patch until next release. + +How do the others on this list feel about this proposal? + +Regards, +-- +Igor Socec +Software Engineer @@ -30,7 +30,7 @@ Layer Dependencies URI: git://git.yoctoproject.org/poky > branch: krogoth -> revision: f7b994b75261550faa3ccf9005fc174950c7bee9 +> revision: 12eb72ee3b02f826a156ff4e396c770f2b93571e URI: git://git.openembedded.org/meta-openembedded > layer: meta-oe @@ -91,47 +91,3 @@ export TEMPLATECONF=/full/path/to/meta-ivi/meta-ivi/conf 5. To login use these credentials: > User - root > Password - root - - -talk about using SRCREV instead of branch or tag at SRC_URI ------------------------------------------------------------ -Sent: Tuesday, April 05, 2016 11:33 PM -To: James Thomas -Cc: genivi-meta-ivi@lists.genivi.org -Subject: Re: [meta-ivi] Building with local source mirror - -On Tue, Mar 29, 2016 at 10:51 PM, James Thomas <james.thomas@codethink.co.uk> wrote: -> One thing I noticed is that simply providing the SRCREV works as long -> as that sha exists within master, if it doesn't then you have a build -> error, so being able to use tags is useful. -> -> I think using git://...;tag=foo is not sufficient, because tags *can* -> change (i.e there's no guarantee that the tag you're using is going to -> be the same as the one you used yesterday). -> -> What would be nice is if you could go tag=foo, and have it verified -> against SRCREV (in my testing this resulted in a build error *when* -> the tag and sha matched) -> -> However, something like -> -> SRC_URI = "git://mygitrepo/foo.git;nobranch=1;branch=v0.2" -> SRCREV = "7654321" -> -> does enforce that check (v0.2 is actually a tag in this case), which -> seems to be pretty useful (the recipe provides something human -> readable, and something a machine can understand, and will always -> check they match) - -I completely understand the reasoning behind this. The point I'm trying to make is that the automotive industry has a strong need for reproducible offline builds and any kind of mandatory online checks break this requirement. And like Federico said, using SRCREV is also the Yocto project practice. - -If we want meta-ivi to be widely used in the industry I believe it should support it's needs. In my opinion the same should go for the whole GENIVI stack to work nicely, which in particular means tags of the projects should not change. But the easiest solution would be for meta-ivi to not use tags. That way it supports offline builds and it is also possible to track bugfixes in the projects instead of pinning to the tag and then getting the bugfixes in patch by patch until next release. - -How do the others on this list feel about this proposal? - -Regards, --- -Igor Socec -Software Engineer - - diff --git a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip/vsomeip_t.inc b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip/vsomeip_t.inc new file mode 100644 index 0000000..24788c6 --- /dev/null +++ b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip/vsomeip_t.inc @@ -0,0 +1,43 @@ +#!/bin/sh +get_list() { + return 6 +} + +get_title() { + echo "vSOMEIP" +} + +_run_dir=/opt/tests/vsomeip +_run() { + cd ${_run_dir} + if [ "x${2}" != "x" ]; then + ./${1}_starter.sh >& /tmp/t + tail -n 8 /tmp/t | grep -E 'PASS|FAIL' + else + ./${1}_starter.sh + fi +} + +run_1() { + _run application_test $* +} + +run_2() { + _run big_payload_test_local $* +} + +run_3() { + _run external_local_payload_test_client_local $* +} + +run_4() { + _run header_factory_test_send_receive $* +} + +run_5() { + _run local_payload_test $* +} + +run_6() { + _run local_routing_test $* +} diff --git a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend index 2c45985..441fdf0 100644 --- a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend +++ b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend @@ -1,9 +1,10 @@ # # for test # -#FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI_append += " \ http://googletest.googlecode.com/files/gtest-1.7.0.zip \ + file://${BPN}_t.inc \ " SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7" SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d" @@ -14,10 +15,11 @@ do_configure_prepend() { } do_compile_append() { - perl -pi -e 's|-Wl,-rpath,/storage/.*||' examples/CMakeFiles/*/link.txt + _B=`pwd` + perl -pi -e "s|-Wl,-rpath,${_B}:||" examples/CMakeFiles/*/link.txt make examples - perl -pi -e 's|-Wl,-rpath,/storage/.*||' test/CMakeFiles/*/link.txt + perl -pi -e "s|-Wl,-rpath,${_B}||" test/CMakeFiles/*/link.txt make build_tests } @@ -27,6 +29,8 @@ do_install_append() { for i in sh json test client service; do cp -f ${B}/test/*${i} ${D}/opt/tests/${PN} done + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" diff --git a/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc b/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc index 2503c10..09199db 100644 --- a/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc +++ b/meta-ivi-test/recipes-extended/common-api/capicxx-perf/capicxx-perf_t.inc @@ -7,9 +7,25 @@ get_title() { echo "Common API C++ test code" } -run_1() { - /opt/tests/capicxx-perf/capicxx-server & - /opt/tests/capicxx-perf/capicxx-client +_run_dir=/opt/tests/capicxx-perf +_run_1() { + ${_run_dir}/capicxx-server & + ${_run_dir}/capicxx-client kill -9 `pidof capicxx-server` sleep 1 } + +run_1() { + if [ "x${1}" != "x" ]; then + _run_1 >& /tmp/t + _test_completed=`cat /tmp/t | grep "test completed"` + _10000_sent=`cat /tmp/t | grep "sync messages sent" | grep 10000` + if [ "x${_test_completed}" != "x" -a "y${_10000_sent}" != "y" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc b/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc index 8b304f1..1c7cca9 100644 --- a/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc +++ b/meta-ivi-test/recipes-extended/common-api/common-api-test/common-api-test_t.inc @@ -7,11 +7,30 @@ get_title() { echo "Common API C++ runtime" } -run_1() { - /opt/tests/common-api-test/E05ManagerService & - /opt/tests/common-api-test/E05ManagerClient & +_run_dir=/opt/tests/common-api-test +_run_1() { + ${_run_dir}/E05ManagerService & + ${_run_dir}/E05ManagerClient & sleep 5 kill -9 `pidof E05ManagerClient` kill -9 `pidof E05ManagerService` sleep 1 } + +run_1() { + if [ "x${1}" != "x" ]; then + _run_1 >& /tmp/t + _c1=`cat /tmp/t | grep "Special device 0 detected"` + _c2=`cat /tmp/t | grep "Special device 0 removed"` + _c3=`cat /tmp/t | grep "Device 1 detected"` + _c4=`cat /tmp/t | grep "Device 1 removed"` + if [ "x${_c1}" != "x" -a "x${_c2}" != "x" -a \ + "x${_c3}" != "x" -a "x${_c4}" != "x" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + _run_1 + fi +} diff --git a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc index 195db76..ab96fa0 100644 --- a/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc +++ b/meta-ivi-test/recipes-extended/dlt-daemon/dlt-daemon/dlt-daemon_t.inc @@ -7,10 +7,31 @@ get_title() { echo "dlt-daemon" } +_run_dir=/opt/tests/dlt-daemon run_1() { - /opt/tests/dlt-daemon/dlt-test-filetransfer + if [ "x${1}" != "x" ]; then + ${_run_dir}/dlt-test-filetransfer > /tmp/t + _c1=$? + if [ "x${_c1}" = "x0" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + ${_run_dir}/dlt-test-filetransfer + fi } run_2() { - /opt/tests/dlt-daemon/dlt-test-user + if [ "x${1}" != "x" ]; then + ${_run_dir}/dlt-test-user > /tmp/t + _c1=`cat /tmp/t | grep -v -E Test.. | grep -v "locally printed"` + if [ "x${_c1}" = "x" ]; then + echo " PASSED" + else + echo " FAILED" + fi + else + ${_run_dir}/dlt-test-user + fi } diff --git a/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor/node-health-monitor_t.inc b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor/node-health-monitor_t.inc new file mode 100644 index 0000000..2afbc92 --- /dev/null +++ b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor/node-health-monitor_t.inc @@ -0,0 +1,45 @@ +#!/bin/sh +get_list() { + return 2 +} + +get_title() { + echo "Node Health Monitor" +} + +_run_dir=/opt/tests/node-health-monitor +_run_() { + systemctl start nsm-dummy + node-health-monitor & + + cd ${_run_dir} + ./${1} + + kill -9 `pidof node-health-monitor` + systemctl stop nsm-dummy +} + +_run() { + echo "[ FAILED ] node-head-monitor is not working properly" + return 0 + + if [ "x${2}" != "x" ]; then + _run_ $1 > /tmp/t 2> /tmp/t.err + _c1=$? + if [ "x${_c1}" = "x0" ]; then + echo "[ PASSED ]" + else + echo "[ FAILED ]" + fi + else + _run_ $1 2> /tmp/t.err + fi +} + +run_1() { + _run nhm-main-test $* +} + +run_2() { + _run nhm-systemd-test $* +} diff --git a/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend index fa2055a..fbe0ad1 100644 --- a/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend +++ b/meta-ivi-test/recipes-extended/node-health-monitor/node-health-monitor_%.bbappend @@ -1,6 +1,11 @@ # # for test # +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append += " \ + file://${BPN}_t.inc \ + " + do_compile_append() { make -C tst nhm-main-test make -C tst nhm-systemd-test @@ -11,6 +16,8 @@ do_install_append() { install -m 0755 ${S}/tst/nhm-main-test ${D}/opt/tests/${PN} install -m 0755 ${S}/tst/nhm-systemd-test ${D}/opt/tests/${PN} ln -s /etc ${D}/opt/tests/cfg + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += "${PN}-test" @@ -20,6 +27,6 @@ FILES_${PN}-dbg += " \ /opt/tests/${PN}/.debug/* \ " FILES_${PN}-test = " \ - /opt/tests/${PN}/* \ + /opt/tests/${PN}/ \ /opt/tests/cfg \ " diff --git a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc new file mode 100644 index 0000000..6516461 --- /dev/null +++ b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc @@ -0,0 +1,69 @@ +#!/bin/sh +get_list() { + return 1 +} + +get_title() { + echo "Node Startup Controller" +} + +_run_dir=/opt/tests/node-startup-controller +_luc_check() { + while true; do + ${_run_dir}/luc_check.sh > /tmp/t + is_nsc=`grep LUC is not required` + if [ "x${is_nsc}" != "x" ]; then + echo "restart node-startup-controller" + systemctl stop node-startup-controller + sleep 1 + systemctl start node-startup-controller + else + break + fi + done +} +_run_() { + systemctl start dlt-receive + systemctl start nsm-dummy + systemctl start node-startup-controller + + _luc_check + ${_run_dir}/${1} + + systemctl stop node-startup-controller + systemctl stop nsm-dummy + #systemctl stop dlt-receive +} + +_check_luc_test_01() { + cat /tmp/t | grep 'NSC-' | grep 'CTRL' > /tmp/t2 + _c1=`cat /tmp/t2 | grep "Updated LUC to:" | grep app1.unit` + _c2=`cat /tmp/t2 | grep "\[Starting LUC group: 0\]"` + _c3=`cat /tmp/t2 | grep "\[Starting LUC app: app1.unit\]"` + _c4=`cat /tmp/t2 | grep "\[Finished starting LUC app: app1.unit\]"` + _c5=`cat /tmp/t2 | grep "\[Finished starting LUC group: 0\]"` + if [ "x${_c1}" != "x" -a "x${_c2}" != "x" -a "x${_c3}" != "x" -a \ + "x${_c4}" != "x" -a "x${_c5}" != "x" ]; then + echo "[ PASSED ]" + else + echo "[ FAILED ]" + fi +} + +_run() { + if [ "x${2}" != "x" ]; then + _run_ ${1}.sh > /tmp/t 2> /tmp/t.err + eval _check_${1} + else + _run_ ${1}.sh 2> /tmp/t.err + fi +} + +run_1() { + _run luc_test_01 $* + +} + +run_2() { + _run nhm-systemd-test $* +} diff --git a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend index c9ccacc..1d8e2a1 100644 --- a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend +++ b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend @@ -4,16 +4,19 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI_append += " \ file://helper.zip \ + file://${BPN}_t.inc \ " do_install_append() { install -d ${D}/opt/tests/${PN} install -m 0755 ${WORKDIR}/helper/*.sh ${D}/opt/tests/${PN} install -m 0644 ${WORKDIR}/helper/*.service ${D}/${systemd_unitdir}/system + + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } FILES_${PN}-nsm-dummy += " \ - /opt/tests/${PN}/* \ + /opt/tests/${PN}/ \ ${systemd_unitdir}/system/example.service \ ${systemd_unitdir}/system/hello.service \ " diff --git a/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc b/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc index 6ac298c..f68b454 100644 --- a/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc +++ b/meta-ivi-test/recipes-extended/node-state-manager/node-state-manager/node-state-manager_t.inc @@ -7,22 +7,50 @@ get_title() { echo "Node State Manager" } +_run_dir=/opt/tests/node-state-manager +_run_1() { + ${_run_dir}/NodeStateTest +} + +_lib=/usr/lib/libNodeStateMachineStub.so +_lib_t=${_run_dir}/lib/libNodeStateMachineTest.so +_lib_bak=${_run_dir}/lib/libNodeStateMachineStub.so run_1() { - cd /usr/lib - mv libNodeStateMachineStub.so libNodeStateMachineStub.so.bak - cp /opt/tests/node-state-manager/lib/libNodeStateMachineTest.so \ - libNodeStateMachineStub.so + if [ ! -f ${_lib_bak} ]; then + cp ${_lib} ${_run_dir}/lib + fi + cp ${_lib_t} ${_lib} ldconfig sleep 1 systemctl start node-startup-controller - /opt/tests/node-state-manager/NodeStateTest + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t 2> /tmp/t.err + _c1=`cat /tmp/t | grep success | wc -l` + _c2=`cat /tmp/t | grep failed | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 2> /tmp/t.err + fi systemctl stop node-startup-controller - kill -9 `pidof NodeStateManager` + _p=`pidof NodeStateManager` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi + _p=`pidof nsm-dummy` + if [ "x${_p}" != "x" ]; then + kill -9 ${_p} >& /dev/null + fi - rm -f libNodeStateMachineStub.so - mv libNodeStateMachineStub.so.bak libNodeStateMachineStub.so + rm -f ${_lib} + cp ${_lib_bak} ${_lib} ldconfig } diff --git a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc index 0e3a65c..d9ff540 100644 --- a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc +++ b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator/persistence-administrator_t.inc @@ -7,21 +7,38 @@ get_title() { echo "persistence-administrator" } +_run_dir=/opt/tests/persistence-administrator +_run_1() { + persadmin_tool install /Data/Data.tar.gz > /tmp/t + ${_run_dir}/pers_admin_test_framework +} + run_1() { - echo "error!" - echo "segfault at 7fa2ac0b6010 ip 000000364d88e130 sp 00007fa2ae0f2aa8 error 4 in libc-2.23.so[364d800000+197000]" - exit -1 + echo "[ FAILED ] segfault at 7fa2ac0b6010 ip 000000364d88e130 sp 00007fa2ae0f2aa8 error 4 in libc-2.23.so[364d800000+197000]" + return 0 if [ ! -d /tmp/PAS ]; then rm -f /tmp/PAS mkdir -p /tmp/PAS fi - cp /opt/tests/persistence-administrator/resource*.tar.gz /tmp/PAS/ + cp ${_run_dir}/resource*.tar.gz /tmp/PAS/ systemctl restart dlt-dbus systemctl restart dlt-example-user systemctl restart pas-daemon systemctl restart node-startup-controller - persadmin_tool install /Data/Data.tar.gz - /opt/tests/persistence-administrator/pers_admin_test_framework + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t + _c1=`cat /tmp/t | grep :P: | wc -l` + _c2=`cat /tmp/t | grep :F: | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 + fi } diff --git a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc index 7fbec91..825fa32 100644 --- a/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc +++ b/meta-ivi-test/recipes-extended/persistence-client-library/persistence-client-library/persistence-client-library_t.inc @@ -7,11 +7,30 @@ get_title() { echo "persisitence-client-library" } +_run_dir=/opt/tests/persistence-client-library +_run_1() { + persadmin_tool install /Data/Data.tar.gz > /tmp/t + ${_run_dir}/persistence_client_library_test +} + run_1() { - systemctl restart dlt-dbus - systemctl restart dlt-example-user - systemctl restart pas-daemon - systemctl restart node-startup-controller - persadmin_tool install /Data/Data.tar.gz - /opt/tests/persistence-client-library/persistence_client_library_test + #systemctl restart dlt-dbus + #systemctl restart dlt-example-user + #systemctl restart pas-daemon + #systemctl restart node-startup-controller + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t + _c1=`cat /tmp/t | grep :P: | wc -l` + _c2=`cat /tmp/t | grep :F: | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 + fi + killall -9 nsm-dummy } diff --git a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc index c113bd3..bd45a3b 100644 --- a/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc +++ b/meta-ivi-test/recipes-extended/persistence-common-object/persistence-common-object/persistence-common-object_t.inc @@ -7,6 +7,24 @@ get_title() { echo "persisitence-common-object" } +_run_dir=/opt/tests/persistence-common-object +_run_1() { + ${_run_dir}/test_pco_key_value_store +} + run_1() { - /opt/tests/persistence-common-object/test_pco_key_value_store + if [ "x${1}" != "x" ]; then + _run_1 > /tmp/t + _c1=`cat /tmp/t | grep :P: | wc -l` + _c2=`cat /tmp/t | grep :F: | wc -l` + if [ "x${_c1}" = "x0" ]; then + echo "[ FAILED ] ${_c2} tests." + elif [ "x${_c2}" = "x0" ]; then + echo "[ PASSED ] ${_c1} tests." + else + echo " ${_c1} PASSED, ${_c2} FAILED" + fi + else + _run_1 + fi } diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins/AudioManagerPlugins_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins/AudioManagerPlugins_t.inc deleted file mode 100644 index ebd8958..0000000 --- a/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins/AudioManagerPlugins_t.inc +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -get_list() { - return 4 -} - -get_title() { - echo "AudioManagerPlugins" -} - -run_1() { - /opt/tests/AudioManagerPlugins/AmCommandSenderCAPITest -} - -run_2() { - /opt/tests/AudioManagerPlugins/AmControlReceiverShadowTest -} - -run_3() { - /opt/tests/AudioManagerPlugins/AmRoutingInterfaceCAPITests -} - -run_4() { - /opt/tests/AudioManagerPlugins/AmRoutingReceiveAsyncTest -} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins/remove_add_gmock.patch b/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins/remove_add_gmock.patch deleted file mode 100644 index 9386af2..0000000 --- a/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins/remove_add_gmock.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/PluginCommandInterfaceCAPI/CMakeLists.txt b/PluginCommandInterfaceCAPI/CMakeLists.txt -index a5ec2fc..5e8e4fe 100644 ---- a/PluginCommandInterfaceCAPI/CMakeLists.txt -+++ b/PluginCommandInterfaceCAPI/CMakeLists.txt -@@ -31,12 +31,6 @@ if (NOT DAEMONVERSION) - set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - -- if(WITH_TESTS) -- if(NOT TARGET gtest) -- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) -- endif(NOT TARGET gtest) -- endif(WITH_TESTS) -- - set(COMMONAPI_DBUS_CONFIGURATIONS "") - else(AUDIOMANAGER_FOUND) - message(FATAL_ERROR "Could not find audiomanager cmake configuration") -diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt -index 225fdc6..d6ef7e8 100644 ---- a/PluginCommandInterfaceDbus/CMakeLists.txt -+++ b/PluginCommandInterfaceDbus/CMakeLists.txt -@@ -26,11 +26,6 @@ if (NOT DAEMONVERSION) - include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") - set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -- if(WITH_TESTS) -- if(NOT TARGET gtest) -- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) -- endif() -- endif(WITH_TESTS) - - set(COMMONAPI_DBUS_CONFIGURATIONS "") - else(AUDIOMANAGER_FOUND) -diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt -index 137ca8f..53d71f3 100644 ---- a/PluginControlInterface/CMakeLists.txt -+++ b/PluginControlInterface/CMakeLists.txt -@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION) - include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") - set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -- if(WITH_TESTS) -- if(NOT TARGET gtest) -- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) -- endif() -- endif(WITH_TESTS) - - set(COMMONAPI_DBUS_CONFIGURATIONS "") - else(AUDIOMANAGER_FOUND) -diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt -index 85a7a04..010b7ee 100644 ---- a/PluginRoutingInterfaceAsync/CMakeLists.txt -+++ b/PluginRoutingInterfaceAsync/CMakeLists.txt -@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION) - include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") - set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -- if(WITH_TESTS) -- if(NOT TARGET gtest) -- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) -- endif() -- endif(WITH_TESTS) - - set(COMMONAPI_DBUS_CONFIGURATIONS "") - else(AUDIOMANAGER_FOUND) -diff --git a/PluginRoutingInterfaceCAPI/CMakeLists.txt b/PluginRoutingInterfaceCAPI/CMakeLists.txt -index 7b4b1af..bf52e4a 100644 ---- a/PluginRoutingInterfaceCAPI/CMakeLists.txt -+++ b/PluginRoutingInterfaceCAPI/CMakeLists.txt -@@ -30,11 +30,6 @@ if (NOT DAEMONVERSION) - include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") - set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -- if(WITH_TESTS) -- if(NOT TARGET gtest) -- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) -- endif() -- endif(WITH_TESTS) - - set(COMMONAPI_DBUS_CONFIGURATIONS "") - else(AUDIOMANAGER_FOUND) -diff --git a/PluginRoutingInterfaceDBus/CMakeLists.txt b/PluginRoutingInterfaceDBus/CMakeLists.txt -index e08b591..09a0696 100644 ---- a/PluginRoutingInterfaceDBus/CMakeLists.txt -+++ b/PluginRoutingInterfaceDBus/CMakeLists.txt -@@ -26,9 +26,6 @@ if (NOT DAEMONVERSION) - include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake") - set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) -- if(WITH_TESTS) -- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock) -- endif(WITH_TESTS) - - set(COMMONAPI_DBUS_CONFIGURATIONS "") - else(AUDIOMANAGER_FOUND) diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc index 99edf49..ea9b942 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager/audiomanager_t.inc @@ -7,30 +7,40 @@ get_title() { echo "audiomanager" } +_run_dir=/opt/tests/audiomanager +_run() { + if [ "x${2}" != "x" ]; then + ${_run_dir}/$1 > /tmp/t + tail /tmp/t | grep -E 'PASS|FAIL' + else + ${_run_dir}/$1 + fi +} + run_1() { - /opt/tests/audiomanager/AmControlInterfaceTest + _run AmControlInterfaceTest $* } run_2() { - /opt/tests/audiomanager/AmMapHandlerTest + _run AmMapHandlerTest $* } run_3() { - /opt/tests/audiomanager/AmRouterMapTest + _run AmRouterMapTest $* } run_4() { - /opt/tests/audiomanager/AmRouterTest + _run AmRouterTest $* } run_5() { - /opt/tests/audiomanager/AmRoutingInterfaceTest + _run AmRoutingInterfaceTest $* } run_6() { - /opt/tests/audiomanager/AmSocketHandlerTest + _run AmSocketHandlerTest $* } run_7() { - /opt/tests/audiomanager/AmTelnetServerTest + _run AmTelnetServerTest $* } diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend index ba56fef..5a90214 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend @@ -10,18 +10,19 @@ EXTRA_OECMAKE_append = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \ -DCMAKE_SKIP_RPATH=ON \ " +DEPENDS += "gtest gmock" + do_install_append() { mkdir -p ${D}/opt/tests/${PN} for i in `find ${B}/bin/ -type f -regex '.*[tT]est.*'`; do install -m 0755 ${i} ${D}/opt/tests/${PN} done - install -m 0755 ${B}/googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN} - install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += " ${PN}-test" FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " -FILES_${PN}-test = "/opt/tests/${PN}/ " +FILES_${PN}-test = "/opt/tests/${PN}/* " diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc new file mode 100644 index 0000000..d72db30 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc @@ -0,0 +1,38 @@ +#!/bin/sh +get_list() { + return 5 +} + +get_title() { + echo "audiomanagerplugins" +} + +_run_dir=/opt/tests/audiomanagerplugins +_run() { + if [ "x${2}" != "x" ]; then + ${_run_dir}/$1 > /tmp/t + tail /tmp/t | grep -E 'PASS|FAIL' + else + ${_run_dir}/$1 + fi +} + +run_1() { + _run AmCommandSenderCAPITest $* +} + +run_2() { + _run AmCommandSenderDbusSignalTest $* +} + +run_3() { + _run AmCommandSenderDbusTest $*s +} + +run_4() { + _run AmRoutingInterfaceCAPITests $* +} + +run_5() { + _run AmRoutingReceiveAsyncTest $* +} diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend index 4ca93e4..3692ff2 100644 --- a/meta-ivi-test/recipes-multimedia/audiomanager/AudioManagerPlugins_%.bbappend +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend @@ -1,21 +1,19 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append = " file://remove_add_gmock.patch \ +SRC_URI_append += " \ file://${BPN}_t.inc \ " -EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF" EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON" DEPENDS += "gtest gmock" do_install_append() { - make plugin-test-install mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN} - install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} + install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN} } PACKAGES += " ${PN}-test" FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* " -FILES_${PN}-test = "/opt/tests/${PN}/ " +FILES_${PN}-test = "/opt/tests/${PN}/* " diff --git a/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb b/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb index a89e26b..909182d 100644 --- a/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb +++ b/meta-ivi-test/recipes-yocto-ivi/images/test-image.bb @@ -3,7 +3,7 @@ require recipes-yocto-ivi/images/ivi-image.bb PV = "${DATE}" IMAGE_INSTALL_append += " openssh test-fw \ - audiomanager-test AudioManagerPlugins-test \ + audiomanager-test audiomanagerplugins-test \ common-api-test capicxx-perf \ persistence-client-library-test \ persistence-common-object-test \ diff --git a/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh b/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh index bfd29b7..b2f4c3e 100755 --- a/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh +++ b/meta-ivi-test/recipes-yocto-ivi/test-fw/test-fw/test-fw.sh @@ -1,7 +1,23 @@ #!/bin/bash # create dbus-session -dbus-launch >& /tmp/t -export `grep -r DBUS_SESSION_BUS_ADDRESS /tmp/t` +dbus_live_p() { + dbus-send --bus=$1 \ + --dest=org.freedesktop.DBus --type=method_call --print-reply \ + /org/freedesktop/DBus org.freedesktop.DBus.ListNames > /tmp/dbus_check +} + +if [ -f /tmp/dbus_test-fw ]; then + _bus_str=`grep -r DBUS_SESSION_BUS_ADDRESS /tmp/dbus_test-fw` + _bus_addr=`echo ${_bus_str} | awk -F_BUS_ADDRESS= '{print $2}'` + dbus_live_p ${_bus_addr} + _dbus_live_p=`grep "method return" /tmp/dbus_check` + if [ "x${_dbus_live_p}" = "x" ]; then + dbus-launch >& /tmp/dbus_test-fw + fi +else + dbus-launch >& /tmp/dbus_test-fw +fi +export `grep -r DBUS_SESSION_BUS_ADDRESS /tmp/dbus_test-fw` test_list=`ls /opt/tests/*/*_t.inc | awk -F/ '{print $4}' | awk -F_t '{print $1}'` @@ -16,8 +32,8 @@ _test_run() { cnt=$? echo "[ number of tests:" $cnt "]" for k in `seq $cnt`; do - echo "[" run_${k} "]" - eval run_${k} + echo -n "[" run_${k} "]" + eval run_${k} "no_verbose_output" done else echo "[" run_${n} "]" @@ -57,4 +73,5 @@ for i in $test_list; do continue; fi _test_run -done
\ No newline at end of file + sleep 2 +done diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch index 3f2c2ef..b44ad1c 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch @@ -9,52 +9,48 @@ Signed-off-by: Clement Dransart <clement.dransart@awtce.be> 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e3cb5..0004b07 100755 +index b977b76..d5fbc4a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS) - endif(NOT DEFINED CONTROLLER_PLUGIN) - else(USE_BUILD_LIBS) - if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) -- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") -+ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") - endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) - if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) -- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") -+ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") - endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) - if(NOT DEFINED CONTROLLER_PLUGIN) -- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") -+ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so") - endif(NOT DEFINED CONTROLLER_PLUGIN) - endif(USE_BUILD_LIBS) +@@ -116,11 +116,11 @@ GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) + GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) -@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) +- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") ++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") + endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) +- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") ++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") + endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + if(NOT DEFINED CONTROLLER_PLUGIN_DIR) +- set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control") ++ set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/control") + endif(NOT DEFINED CONTROLLER_PLUGIN_DIR) + + ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) +@@ -149,7 +149,7 @@ endif(WITH_TESTS) configure_package_config_file ( - ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake + ${CMAKE_SOURCE_DIR}/cmake/AudioManagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerConfig.cmake - INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake PATH_VARS AUDIO_INCLUDE_FOLDER ) write_basic_package_version_file( -@@ -237,14 +237,14 @@ write_basic_package_version_file( - COMPATIBILITY SameMajorVersion ) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake -- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake - COMPONENT dev) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h +@@ -169,5 +169,5 @@ add_subdirectory (AudioManagerDaemon) + install( + FILES ${CMAKE_BINARY_DIR}/AudioManagerConfig.cmake + ${CMAKE_BINARY_DIR}/AudioManagerConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/AudioManager-${DAEMONVERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/AudioManager-${DAEMONVERSION} + ) + +-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) ++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/audiomanagerconfig.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} COMPONENT dev) - - configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY ) --install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) -+install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) - - add_subdirectory (AudioManagerDaemon) - -- 1.9.1 diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb deleted file mode 100644 index 6986020..0000000 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Genivi AudioManager" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "multimedia" - -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" -PR = "r1" - -DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" - -SRCREV = "8725157e248c6706de59a02996f869b6ccdccb13" -SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ - file://AudioManager.service \ - file://setup_amgr.sh \ - file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ - " -S = "${WORKDIR}/git" - -inherit cmake pkgconfig systemd - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "AudioManager.service" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_CXX_FLAGS +="-ldl" -EXTRA_OECMAKE = " -DWITH_TESTS=OFF" - -FILES_${PN} = " \ - ${bindir}/* \ - ${systemd_unitdir}/AudioManager.service \ - ${systemd_unitdir}/scripts/setup_amgr.sh \ - " -FILES_${PN}-dev += " \ - ${libdir}/* \ - /usr/share/cmake/Modules/* \ - " -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - mkdir -p ${D}${systemd_unitdir}/scripts/ - install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system - fi - - install -d 0755 ${D}/usr/share/cmake/Modules - for i in `ls ${S}/cmake/*.cmake`; do - install -m 0644 ${i} ${D}/usr/share/cmake/Modules - done - perl -pi -e 's|COMMAND find "/usr/local/share/CommonAPI-\${CommonAPI_VERSION}"|COMMAND find "${PSEUDO_PREFIX}/share"|' \ - ${D}/usr/share/cmake/Modules/CommonAPI.cmake - - C_CMAKE=${D}${libdir}/cmake/audiomanagerConfig.cmake - perl -pi -e 's|;${S}/cmake||' ${C_CMAKE} - perl -pi -e 's|;(.*)/usr/share/cmake/Modules/||' ${C_CMAKE} - perl -pi -e 's|set\(WITH_TESTS|#set\(WITH_TESTS|' ${C_CMAKE} - perl -pi -e 's|.*set_and_check\(GOOGLE_MOCK_PROJECT_FOLDER \"(.+)\"\)\n||' ${C_CMAKE} - perl -pi -e 's|GOOGLE_TEST_INCLUDE_DIR \"(.+)\"|GOOGLE_TEST_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gtest\"|' ${C_CMAKE} - perl -pi -e 's|GMOCK_INCLUDE_DIR \"(.+)\"|GMOCK_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gmock\"|' ${C_CMAKE} -# perl -pi -e \ -# 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \ -# ${D}${libdir}/cmake/audiomanagerConfig.cmake -} - -python do_qa_staging() { - bb.note("QA checking staging - SKIP") -}
\ No newline at end of file diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb new file mode 100644 index 0000000..4144bd9 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb @@ -0,0 +1,55 @@ +SUMMARY = "Genivi AudioManager" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" + +DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" + +SRCREV = "5bcd206b9270d9a79e212f91723ea1a08a4d4859" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ + file://AudioManager.service \ + file://setup_amgr.sh \ + file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ + " +S = "${WORKDIR}/git" + +inherit gettext cmake pkgconfig systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "AudioManager.service" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_CXX_FLAGS +="-ldl" +EXTRA_OECMAKE = " -DWITH_DBUS_WRAPPER=ON -DWITH_TESTS=OFF" + +FILES_${PN} = " \ + ${bindir}/* \ + ${systemd_unitdir}/AudioManager.service \ + ${systemd_unitdir}/scripts/setup_amgr.sh \ + " +FILES_${PN}-dev += " \ + ${libdir}/* \ + " + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + mkdir -p ${D}${systemd_unitdir}/scripts/ + install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system + fi + + perl -pi -e 's|set_and_check\(|#set_and_check\(|' ${D}${libdir}/cmake/*/*.cmake + +} + +# replace function in poky/meta/classes/insane.bbclass +python do_qa_staging() { + bb.note("[workaround] QA checking staging") + + if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${STAGING_LIBDIR}'), d): + bb.fatal("QA staging was broken by the package built above") +} diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb deleted file mode 100644 index 035fa6b..0000000 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Genivi AudioManager Plugins" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "multimedia" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" - -DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" - -SRCREV = "a0ed3b8f05147e9240d941655488d505057bbae7" -SRC_URI = " \ - git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ - file://build-fixup.patch \ - " -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = " -DWITH_TESTS=OFF \ - -DWITH_COMMAND_INTERFACE_COMMON_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \ - -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \ - -DWITH_ROUTING_INTERFACE_ASYNC=ON \ - " - -FILES_${PN} += " \ - ${libdir}/* \ - /usr/share/* \ - " - -do_install_append() { - mv ${D}${libdir}/audiomanager/* ${D}${libdir} - rmdir ${D}${libdir}/audiomanager -} diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb new file mode 100644 index 0000000..73fc184 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -0,0 +1,54 @@ +SUMMARY = "Genivi AudioManager Plugins" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" +RDEPENDS_${PN} += "libxml2" + +SRCREV = "8096eee2649585d13464b23e9ab940f0e030c56a" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ + " +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DWITH_COMMAND_INTERFACE_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_ASYNC=ON \ + -DWITH_GENERIC_CONTROLLER=ON \ + " + +do_configure_prepend() { + perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerUtilities\)|' ${S}/CMakeLists.txt + perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerCore\)|' ${S}/CMakeLists.txt + perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager\)|' ${S}/CMakeLists.txt + + perl -pi -e 's|set\(LIBRARY_OUTPUT_PATH \${DEFAULT_PLUGIN_ROUTING_DIR}\)|set\(LIBRARY_OUTPUT_PATH ${B}\)|' ${S}/PluginRouting*/CMakeLists.txt + perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake + perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +} + +do_configure_append() { + perl -pi -e 's|/\* #undef LIBRARY_OUTPUT_PATH \*/|#define LIBRARY_OUTPUT_PATH "/usr/lib/command"|' ${S}/PluginCommandInterfaceDbus/include/configCommandDbus.h +} + +FILES_${PN} += " \ + ${libdir}/* \ + /usr/share/* \ + " + +FILES_${PN}-dev = " \ + /usr/include/ \ + ${libdir}/pkgconfig/ \ + " + +do_install_append() { + mv ${D}${libdir}/audiomanager/routing/* ${D}${libdir}/routing/ + rmdir ${D}${libdir}/audiomanager/routing + rmdir ${D}${libdir}/audiomanager +}
\ No newline at end of file diff --git a/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc new file mode 100644 index 0000000..0503b34 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc @@ -0,0 +1,56 @@ +PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages " +PACKAGESPLITFUNCS_append = " set_metapkg_rdepends " + +python split_gstreamer10_packages () { + gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') + postinst = d.getVar('plugin_postinst', True) + glibdir = d.getVar('libdir', True) + + do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) + do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) +} + +python set_metapkg_rdepends () { + import os + + pn = d.getVar('PN', True) + metapkg = pn + '-meta' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('FILES_' + metapkg, "") + blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] + metapkg_rdepends = [] + packages = d.getVar('PACKAGES', True).split() + pkgdest = d.getVar('PKGDEST', True) + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): + # See if the package is empty by looking at the contents of its PKGDEST subdirectory. + # If this subdirectory is empty, then the package is. + # Empty packages do not get added to the meta package's RDEPENDS + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') +} + +# metapkg has runtime dependency on PN +# each plugin depends on PN, plugin-dev on PN-dev, plugin-staticdev on PN-staticdev +# so we need them even when empty (like in gst-plugins-good case) +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dev = "1" +ALLOW_EMPTY_${PN}-staticdev = "1" + +PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" +FILES_${PN}-apps = "${bindir}" + +FILES_${PN} = "${datadir}/gstreamer-${LIBV}" +FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" +FILES_${PN}-glib = "${datadir}/glib-2.0" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb index 0903f12..41ebdb2 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +include recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc new file mode 100644 index 0000000..4028a67 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc @@ -0,0 +1,42 @@ +SUMMARY = "OpenMAX IL plugins for GStreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2.1" +LICENSE_FLAGS = "commercial" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" +RDEPENDS_${PN} = "libomxil" + +inherit autotools pkgconfig gettext + +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +PR = "r1" + +GSTREAMER_1_0_OMX_TARGET ?= "bellagio" +GSTREAMER_1_0_OMX_CORE_NAME ?= "/usr/lib/libomxil-bellagio.so.0" + +EXTRA_OECONF += "--disable-valgrind --disable-introspection --with-omx-target=${GSTREAMER_1_0_OMX_TARGET}" + +python __anonymous () { + omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True) + if omx_target in ['generic', 'bellagio']: + srcdir = d.getVar("S", True) + # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# + # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); + # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this + d.appendVar("CFLAGS", " -I%s/omx/openmax" % srcdir) + elif omx_target == "rpi": + # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific + d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True)) +} + +set_omx_core_name() { + sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}/etc/xdg/gstomx.conf" +} +do_install[postfuncs] += " set_omx_core_name " + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb index e11dd27..38bd0a9 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc #remove patch from poky that is not necessary in version 1.2.3 SRC_URI_remove = "file://configure-allow-to-disable-libssh2.patch" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc new file mode 100644 index 0000000..b755698 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc @@ -0,0 +1,121 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " + +DEPENDS += "gstreamer1.0-plugins-base bzip2" + +S = "${WORKDIR}/gst-plugins-bad-${PV}" + +inherit gettext bluetooth + + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + orc curl uvch264 neon \ + hls sbc dash bz2 smoothstreaming \ + " +# dash = Dynamic Adaptive Streaming over HTTP +PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" +PACKAGECONFIG[eglgles] = "--enable-eglgles,--disable-eglgles,virtual/egl virtual/libgles2" +PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" +PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" +PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" +PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" +PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev" +PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" +PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" +PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" +PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" +PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" +PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" +PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" +PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" +PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" +PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" +PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" + +# these plugins have not been ported to 1.0 (yet): +# directdraw vcd apexsink cdaudio dc1394 lv2 linsys musepack mythtv +# nas timidity teletextdec sdl sndfile xvid wininet acm gsettings +# sndio cdxaparse dccp faceoverlay hdvparse ivfparse jp2kdecimator +# linsys mve nuvdemux osx_video patchdetect quicktime real sdi stereo +# tta videomeasure videosignal vmnc + +EXTRA_OECONF += " \ + --enable-dvb \ + --enable-shm \ + --enable-mfc \ + --enable-fbdev \ + --enable-decklink \ + --disable-acm \ + --disable-android_media \ + --disable-apexsink \ + --disable-apple_media \ + --disable-avc \ + --disable-cdaudio \ + --disable-chromaprint \ + --disable-daala \ + --disable-dc1394 \ + --disable-direct3d \ + --disable-directdraw \ + --disable-directshow \ + --disable-directsound \ + --disable-dts \ + --disable-gme \ + --disable-gsettings \ + --disable-gsm \ + --disable-kate \ + --disable-ladspa \ + --disable-linsys \ + --disable-lv2 \ + --disable-mimic \ + --disable-mpeg2enc \ + --disable-mplex \ + --disable-musepack \ + --disable-mythtv \ + --disable-nas \ + --disable-ofa \ + --disable-openjpeg \ + --disable-opensles \ + --disable-osx_video \ + --disable-pvr \ + --disable-quicktime \ + --disable-resindvd \ + --disable-rtmp \ + --disable-sdl \ + --disable-sdltest \ + --disable-sndfile \ + --disable-sndio \ + --disable-soundtouch \ + --disable-spandsp \ + --disable-spc \ + --disable-srtp \ + --disable-teletextdec \ + --disable-timidity \ + --disable-vcd \ + --disable-vdpau \ + --disable-voaacenc \ + --disable-voamrwbenc \ + --disable-wasapi \ + --disable-webp \ + --disable-wildmidi \ + --disable-wininet \ + --disable-winscreencap \ + --disable-xvid \ + --disable-zbar \ + ${GSTREAMER_1_0_ORC} \ + --disable-introspection \ + " + +ARM_INSTRUCTION_SET = "arm" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb index aa7c448..8827900 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc new file mode 100644 index 0000000..993b51f --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc @@ -0,0 +1,40 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2+" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" +DEPENDS += "freetype liboil util-linux" + +inherit gettext + +PACKAGES_DYNAMIC =+ "^libgst.*" + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + orc ivorbis ogg theora vorbis \ + " + +X11DEPENDS = "virtual/libx11 libsm libxrender" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" + + +# cdparanoia and libvisual do not seem to exist anywhere in OE +EXTRA_OECONF += " \ + --disable-freetypetest \ + --disable-cdparanoia \ + --disable-libvisual \ + ${GSTREAMER_1_0_ORC} \ + --disable-introspection \ +" + +FILES_${PN} += "${datadir}/gst-plugins-base" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb index 4c01d28..8012c09 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc new file mode 100644 index 0000000..54c3af1 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc @@ -0,0 +1,56 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2.1+" + +# libid3tag +DEPENDS += "gstreamer1.0-plugins-base zlib bzip2" + +inherit gettext + + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ + " + +X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" +PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" +PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" +PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" +PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" +PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" + +# the 1394 plugins require both libraw1394 and libiec61883 +# the former is included in meta-oe, the latter isn't +# -> disabled + +EXTRA_OECONF += " \ + --enable-oss \ + --enable-gst_v4l2 \ + --without-libv4l2 \ + --disable-directsound \ + --disable-waveform \ + --disable-oss4 \ + --disable-sunaudio \ + --disable-osx_audio \ + --disable-osx_video \ + --disable-aalib \ + --disable-libcaca \ + --disable-libdv \ + --disable-shout2 \ + --disable-examples \ + --disable-dv1394 \ + ${GSTREAMER_1_0_ORC} \ +" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb index 0ac7721..04f59fb 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc new file mode 100644 index 0000000..529d6cc --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc @@ -0,0 +1,31 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" +LICENSE_FLAGS = "commercial" + +DEPENDS += "gstreamer1.0-plugins-base libid3tag" + +inherit gettext + + +PACKAGECONFIG ??= " \ + orc a52dec lame mad mpeg2dec \ + " + +PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" +PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" +PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" + + +EXTRA_OECONF += " \ + --disable-amrnb \ + --disable-amrwb \ + --disable-sidplay \ + --disable-twolame \ + ${GSTREAMER_1_0_ORC} \ + " + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc new file mode 100644 index 0000000..7451b84 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc @@ -0,0 +1,59 @@ +SUMMARY = "Plugins for the GStreamer multimedia framework 1.x" +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +DEPENDS = "gstreamer1.0" + +inherit autotools pkgconfig + +FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" + +GSTREAMER_1_0_DEBUG ?= "--disable-debug" +GSTREAMER_1_0_GIT_BRANCH ?= "master" +EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples " + +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +LIBV = "1.0" +require gst-plugins-package_1.2.3.inc + +PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" + +PACKAGES_DYNAMIC = "^${PN}-.*" + +# apply gstreamer hack after Makefile.in.in in source is replaced by our version from +# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed +# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html +oe_runconf_prepend() { + if [ -e ${S}/po/Makefile.in.in ]; then + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in + fi +} + +SRC_URI = "${@get_gst_srcuri(d)}" + +def get_gst_srcuri(d): + # check if expected prefix is present + prefix = "gstreamer1.0-" + bpn = d.getVar("BPN", True) + if not bpn.startswith(prefix): + bb.fatal('Invalid GStreamer 1.0 plugin package name "%s" : must start with "%s"' % (bpn, prefix)) + + # replaced prefix with "gst-", which is what is used for the tarball and repository filenames + gstpkg_basename = "gst-" + bpn[len(prefix):] + pv = d.getVar("PV", True) + branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) + + if pv == "git": + s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch) + else: + s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv) + return s + +delete_liblink_m4_file() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm "${S}/m4/lib-link.m4" || true +} + +do_configure[prefuncs] += " delete_liblink_m4_file " + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb index caacc34..9a294aa 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0.inc +include recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc new file mode 100644 index 0000000..a349926 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc @@ -0,0 +1,28 @@ +SUMMARY = "GStreamer 1.0 multimedia framework" +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" +DEPENDS = "glib-2.0 libxml2 bison-native flex-native" + +inherit autotools pkgconfig gettext + +GSTREAMER_1_DEBUG ?= "--disable-debug" +EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \ + --disable-dependency-tracking --disable-check \ + --disable-examples --disable-tests \ + --disable-valgrind ${GSTREAMER_1_DEBUG} \ + --disable-introspection \ + " + +RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + +CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" + +FILES_${PN} += " ${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += " ${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-dbg += " ${libdir}/gstreamer-1.0/.debug/ ${libexecdir}/gstreamer-1.0/.debug/" + diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch new file mode 100644 index 0000000..aff1cb1 --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch @@ -0,0 +1,41 @@ +Upstream-Status: Inappropriate [configuration] + +From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Fri, 8 Apr 2011 10:05:49 -0700 +Subject: [PATCH 10/10] Fix --enable-vfp flag + +Patch from Christophe Lyon, fixes #36084. +--- + configure.ac | 4 ++-- + liboil/arm/Makefile.am | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 98c81fb..407d88c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,8 +188,8 @@ fi + AC_ARG_ENABLE(vfp, + AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]), + enable_vfp=$enableval,enable_vfp=yes) +-if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then +- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], ++if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then ++ AS_COMPILER_FLAG(["-mfpu=vfp"], + [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], + true) + #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], +diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am +index ead08ed..cd8d9fa 100644 +--- a/liboil/arm/Makefile.am ++++ b/liboil/arm/Makefile.am +@@ -6,4 +6,5 @@ libarm_la_SOURCES = \ + math_vfp_asm.S + + libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) ++libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS) + +-- +1.7.6 + diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch new file mode 100644 index 0000000..c8e3c1f --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch @@ -0,0 +1,19 @@ +Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=31358 + +configure: fix whitelisting of x86_64 unaligned memory access + +Fix typo in whitelist so cross-compile works for x86_64. + +Upstream-Status: Inappropriate [configuration] + +--- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500 ++++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400 +@@ -9,7 +9,7 @@ + _AS_ECHO_N([(blacklisted) ]) + as_cv_unaligned_access=no + ;; +- i?86*|x86_64|amd64|powerpc*|m68k*|cris*) ++ i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*) + _AS_ECHO_N([(whitelisted) ]) + as_cv_unaligned_access=yes + ;; diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch new file mode 100644 index 0000000..473380e --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch @@ -0,0 +1,222 @@ +Upstream-Status: Pending + +Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2011/12/01 + + +Index: liboil-0.3.17/liboil/amd64/wavelet.c +=================================================================== +--- liboil-0.3.17.orig/liboil/amd64/wavelet.c ++++ liboil-0.3.17/liboil/amd64/wavelet.c +@@ -21,14 +21,14 @@ deinterleave2_asm (int16_t *d1, int16_t + asm volatile ("\n" + " sub $2, %%rcx\n" + "1:\n" +- " movw (%1,%%rcx,4), %%ax\n" +- " movw %%ax, (%0,%%rcx,2)\n" +- " movw 2(%1,%%rcx,4), %%ax\n" +- " movw %%ax, (%2,%%rcx,2)\n" +- " movw 4(%1,%%rcx,4), %%ax\n" +- " movw %%ax, 2(%0,%%rcx,2)\n" +- " movw 6(%1,%%rcx,4), %%ax\n" +- " movw %%ax, 2(%2,%%rcx,2)\n" ++ " movw (%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, (%q0,%%rcx,2)\n" ++ " movw 2(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, (%q2,%%rcx,2)\n" ++ " movw 4(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, 2(%q0,%%rcx,2)\n" ++ " movw 6(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, 2(%q2,%%rcx,2)\n" + " sub $2, %%rcx\n" + " jge 1b\n" + : "+r" (d1), "+r" (s_2xn), "+r" (d2), "+c" (n) +@@ -53,20 +53,20 @@ deinterleave2_mmx (int16_t *d1, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm0\n" +- " movq 8(%1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm0\n" ++ " movq 8(%q1,%%rcx,4), %%mm1\n" + " pslld $16, %%mm0\n" + " pslld $16, %%mm1\n" + " psrad $16, %%mm0\n" + " psrad $16, %%mm1\n" + " packssdw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" +- " movq (%1,%%rcx,4), %%mm0\n" +- " movq 8(%1,%%rcx,4), %%mm1\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" ++ " movq (%q1,%%rcx,4), %%mm0\n" ++ " movq 8(%q1,%%rcx,4), %%mm1\n" + " psrad $16, %%mm0\n" + " psrad $16, %%mm1\n" + " packssdw %%mm1, %%mm0\n" +- " movq %%mm0, (%2,%%rcx,2)\n" ++ " movq %%mm0, (%q2,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -93,10 +93,10 @@ deinterleave2_mmx_2 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " pshufw $0xd8, (%1,%%rcx,4), %%mm0\n" +- " movd %%mm0, (%0,%%rcx,2)\n" +- " pshufw $0x8d, (%1,%%rcx,4), %%mm0\n" +- " movd %%mm0, (%2,%%rcx,2)\n" ++ " pshufw $0xd8, (%q1,%%rcx,4), %%mm0\n" ++ " movd %%mm0, (%q0,%%rcx,2)\n" ++ " pshufw $0x8d, (%q1,%%rcx,4), %%mm0\n" ++ " movd %%mm0, (%q2,%%rcx,2)\n" + " add $2, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -123,16 +123,16 @@ deinterleave2_mmx_3 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm1\n" +- " movq (%1,%%rcx,4), %%mm2\n" +- " movq 8(%1,%%rcx,4), %%mm0\n" ++ " movq (%q1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm2\n" ++ " movq 8(%q1,%%rcx,4), %%mm0\n" + " punpcklwd %%mm0, %%mm1\n" + " punpckhwd %%mm0, %%mm2\n" + " movq %%mm1, %%mm0\n" + " punpcklwd %%mm2, %%mm0\n" + " punpckhwd %%mm2, %%mm1\n" +- " movq %%mm0, (%0,%%rcx,2)\n" +- " movq %%mm1, (%2,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" ++ " movq %%mm1, (%q2,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -159,26 +159,26 @@ deinterleave2_mmx_4 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm1\n" + " movq %%mm1, %%mm2\n" +- " movq 8(%1,%%rcx,4), %%mm0\n" +- " movq 16(%1,%%rcx,4), %%mm5\n" ++ " movq 8(%q1,%%rcx,4), %%mm0\n" ++ " movq 16(%q1,%%rcx,4), %%mm5\n" + " punpcklwd %%mm0, %%mm1\n" + " movq %%mm5, %%mm6\n" + " punpckhwd %%mm0, %%mm2\n" +- " movq 24(%1,%%rcx,4), %%mm4\n" ++ " movq 24(%q1,%%rcx,4), %%mm4\n" + " movq %%mm1, %%mm0\n" + " punpcklwd %%mm4, %%mm5\n" + " punpcklwd %%mm2, %%mm0\n" + " punpckhwd %%mm4, %%mm6\n" + " punpckhwd %%mm2, %%mm1\n" + " movq %%mm5, %%mm4\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " punpcklwd %%mm6, %%mm4\n" +- " movq %%mm1, (%2,%%rcx,2)\n" ++ " movq %%mm1, (%q2,%%rcx,2)\n" + " punpckhwd %%mm6, %%mm5\n" +- " movq %%mm4, 8(%0,%%rcx,2)\n" +- " movq %%mm5, 8(%2,%%rcx,2)\n" ++ " movq %%mm4, 8(%q0,%%rcx,2)\n" ++ " movq %%mm5, 8(%q2,%%rcx,2)\n" + " add $8, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -252,13 +252,13 @@ interleave2_mmx (int16_t *d_2xn, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,2), %%mm0\n" +- " movq (%2,%%rcx,2), %%mm1\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" + " movq %%mm0, %%mm2\n" + " punpckhwd %%mm1, %%mm0\n" + " punpcklwd %%mm1, %%mm2\n" +- " movq %%mm2, (%0,%%rcx,4)\n" +- " movq %%mm0, 8(%0,%%rcx,4)\n" ++ " movq %%mm2, (%q0,%%rcx,4)\n" ++ " movq %%mm0, 8(%q0,%%rcx,4)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -285,12 +285,12 @@ lift_add_shift1_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" + " paddw %%mm2, %%mm1\n" + " psraw $1, %%mm1\n" +- " paddw (%1,%%rcx,2), %%mm1\n" +- " movq %%mm1, (%0,%%rcx,2)\n" ++ " paddw (%q1,%%rcx,2), %%mm1\n" ++ " movq %%mm1, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -317,13 +317,13 @@ lift_sub_shift1_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" +- " movq (%1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" + " paddw %%mm2, %%mm1\n" + " psraw $1, %%mm1\n" + " psubw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -350,12 +350,12 @@ lift_add_shift2_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" + " paddw %%mm2, %%mm1\n" + " psraw $2, %%mm1\n" +- " paddw (%1,%%rcx,2), %%mm1\n" +- " movq %%mm1, (%0,%%rcx,2)\n" ++ " paddw (%q1,%%rcx,2), %%mm1\n" ++ " movq %%mm1, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -382,13 +382,13 @@ lift_sub_shift2_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" +- " movq (%1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" + " paddw %%mm2, %%mm1\n" + " psraw $2, %%mm1\n" + " psubw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" diff --git a/meta-ivi/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/meta-ivi/recipes-support/liboil/liboil-0.3.17/no-tests.patch new file mode 100644 index 0000000..892d441 --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil-0.3.17/no-tests.patch @@ -0,0 +1,24 @@ +Upstream-Status: Inappropriate [disable feature] + +--- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100 ++++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100 +@@ -345,7 +345,9 @@ + return; + } + +- test = oil_test_new (klass); ++ klass->chosen_impl = klass->reference_impl; ++ klass->func = klass->reference_impl->func; ++/* test = oil_test_new (klass); + if (test == NULL) { + OIL_ERROR ("failed to test function class %s", klass->name); + return; +@@ -385,7 +387,7 @@ + klass->chosen_impl = min_impl; + klass->func = min_impl->func; + +- oil_test_free (test); ++ oil_test_free (test);*/ + } + + static void diff --git a/meta-ivi/recipes-support/liboil/liboil_0.3.17.bb b/meta-ivi/recipes-support/liboil/liboil_0.3.17.bb new file mode 100644 index 0000000..03b7785 --- /dev/null +++ b/meta-ivi/recipes-support/liboil/liboil_0.3.17.bb @@ -0,0 +1,27 @@ +SUMMARY = "Library of simple functions optimized for various CPUs" +HOMEPAGE = "http://liboil.freedesktop.org/" +BUGTRACKER = "https://bugs.freedesktop.org/" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \ + file://liboil/liboil.h;endline=28;md5=95c794a66b88800d949fed17e437d9fb \ + file://liboil/liboilcpu.c;endline=28;md5=89da69a61d88eedcba066f42353fb75a \ + file://examples/example1.c;endline=29;md5=9d4dad9fcbbdf0441ee063f8af5170c9 \ + file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" + +DEPENDS = "glib-2.0" +PR = "r5" + +SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ + file://no-tests.patch \ + file://fix-unaligned-whitelist.patch \ + file://0001-Fix-enable-vfp-flag.patch \ + file://liboil_fix_for_x32.patch \ + " + +SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" +SRC_URI[sha256sum] = "105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" |