ti-codecs-omap3530: Use real version number, remove duplicate

   * Start using new SRC_URI link without binary suffix (-42/-44)
   * Rename to reflect real version number
   * Remove (source) duplicate version (-42)
   * Bump PE to account for negative version number change
   * Bump PR for consistency

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

diff --git a/recipes/ti/ti-codecs-omap3530_1.00.01.42.bb b/recipes/ti/ti-codecs-omap3530_1.00.01.42.bb
deleted file mode 100644 (file)
index 59d211c..0000000
--- a/recipes/ti/ti-codecs-omap3530_1.00.01.42.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-require ti-codec.inc
-
-SRC_URI        = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/3_00_00_42/exports/cs1omap3530_setuplinux_1_00_01-42.bin"
-
-# Specify names of the InstallJammer binary file and the tarball it extracts
-BINFILE = "cs1omap3530_setuplinux_1_00_01-42.bin"
-TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
-
-require ti-eula-unpack.inc
-
-S = "${WORKDIR}/dvsdk_3_00_01_42/cs1omap3530_1_00_01"
-
-DEPENDS="ti-codec-engine ti-linuxutils"
-RREPLACES_${PN} = "ti-cs1-omap3530"
-
-export CODEGEN_INSTALL_DIR
-
-# Yes, the xdc stuff still breaks with a '.' in PWD
-PV = "1_00_01_42"
-PR = "r5"
-
-do_compile() {
-
-       make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
-                FC_INSTALL_DIR=${FC_INSTALL_DIR} \
-                LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
-                CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
-                LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
-            BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
-                CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
-                CODEC_INSTALL_DIR="${S}" \
-                XDCARGS="prod" \
-                clean
-
-       make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
-                FC_INSTALL_DIR=${FC_INSTALL_DIR} \
-                LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
-                CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
-                LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
-            BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
-                CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-                XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
-                CODEC_INSTALL_DIR="${S}" \
-                XDCARGS="prod" \
-}
-
-do_install () {
-    install -d ${D}/${installdir}/codec-combo
-       cd ${S}
-       for file in `find . -name *.x64P`; do
-               cp ${file} ${D}/${installdir}/codec-combo
-       done
-}

diff --git a/recipes/ti/ti-codecs-omap3530_1.00.01.44.bb b/recipes/ti/ti-codecs-omap3530_1.00.01.bb
similarity index 95%
rename from recipes/ti/ti-codecs-omap3530_1.00.01.44.bb
rename to recipes/ti/ti-codecs-omap3530_1.00.01.bb
index 55295b3..296ed72 100644 (file)
--- a/recipes/ti/ti-codecs-omap3530_1.00.01.44.bb
+++ b/recipes/ti/ti-codecs-omap3530_1.00.01.bb
@@ -4,12 +4,13 @@ SECTION = "multimedia"
 
 # TODO :: Move to common .inc (omap3 and omapl ready)
 
-PV = "1_00_01_44"
+PV = "1_00_01"
 
 SRC_URI[omap3codecsbin.md5sum] = "4db567252e6c43119e1c0aafe401a679"
 SRC_URI[omap3codecsbin.sha256sum] = "e042e1aad42a6728adf5c955dc38e4f8331fc0eacd833f1cd75d9cbb4faff0b5"
 
-PR = "r7"
+PE = "1"
+PR = "r8"
 
 require ti-paths.inc
 require ti-staging.inc
@@ -20,9 +21,9 @@ RREPLACES_${PN} = "ti-cs1-omap3530"
 
 S = "${WORKDIR}/dvsdk_3_00_02_44/cs1omap3530_1_00_01"
 
-SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/3_00_02_44/exports/cs1omap3530_setuplinux_1_00_01-44.bin;name=omap3codecsbin"
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/3_00_02_44/exports/cs1omap3530_setuplinux_1_00_01.bin;name=omap3codecsbin"
 
-BINFILE = "cs1omap3530_setuplinux_1_00_01-44.bin"
+BINFILE = "cs1omap3530_setuplinux_1_00_01.bin"
 TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
 
 DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"