diff options
71 files changed, 3 insertions, 2628 deletions
diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf deleted file mode 100644 index 4b98b39..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel/panel.conf +++ /dev/null @@ -1,118 +0,0 @@ -[General] -__userfile__=true - -[desktopswitch] -alignment=Left -type=desktopswitch - -[mainmenu] -alignment=Left -type=mainmenu - -[mount] -alignment=Right -type=mount - -[panel1] -alignment=-1 -animation-duration=0 -background-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -background-image= -desktop=0 -font-color=@Variant(\0\0\0\x43\0\xff\xff\0\0\0\0\0\0\0\0) -hidable=false -iconSize=22 -lineCount=1 -lockPanel=false -opacity=100 -panelSize=32 -plugins=mainmenu, desktopswitch, quicklaunch, taskbar, tray, statusnotifier, mount, volume, clock, showdesktop, sensors, sysstat, worldclock2 -position=Bottom -reserve-space=true -show-delay=0 -width=100 -width-percent=true - -[quicklaunch] -alignment=Left -apps\1\desktop=/usr/share/applications/pcmanfm-qt.desktop -apps\2\desktop=/usr/share/applications/qterminal.desktop -apps\size=2 -type=quicklaunch - -[sensors] -alignment=Right -chips\imx_thermal_zone-virtual-0\temp1\color=#628cb2 -chips\imx_thermal_zone-virtual-0\temp1\enabled=true -tempBarWidth=8 -type=sensors -updateInterval=1 -useFahrenheitScale=false -warningAboutHighTemperature=true - -[showdesktop] -alignment=Right -type=showdesktop - -[statusnotifier] -alignment=Right -type=statusnotifier - -[sysstat] -alignment=Right -cpu\frequencyColour=#808080 -cpu\niceColour=#008000 -cpu\otherColour=#808000 -cpu\systemColour=#800000 -cpu\useFrequency=false -cpu\userColour=#00ff7f -data\source=cpu -data\type=CPU -graph\minimalSize=30 -graph\updateInterval=1 -graph\useThemeColours=false -grid\colour=#808080 -grid\lines=1 -mem\appsColour=#000080 -mem\buffersColour=#008000 -mem\cachedColour=#808000 -mem\swapColour=#800000 -net\logarithmicScale=true -net\logarithmicScaleSteps=4 -net\maximumSpeed=1 MB/s -net\receivedColour=#000080 -net\transmittedColour=#808000 -title\colour=#000000 -title\label= -type=sysstat - -[taskbar] -alignment=Left -autoRotate=true -buttonHeight=100 -buttonStyle=IconText -buttonWidth=200 -closeOnMiddleClick=true -cycleOnWheelScroll=true -groupingEnabled=true -iconByClass=false -raiseOnCurrentDesktop=false -showDesktopNum=0 -showGroupOnHover=true -showOnlyCurrentScreenTasks=false -showOnlyMinimizedTasks=false -showOnlyOneDesktopTasks=false -type=taskbar - -[tray] -alignment=Right -type=tray - -[volume] -alignment=Right -audioEngine=Alsa -type=volume - -[worldclock2] -alignment=Right -type=worldclock diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend deleted file mode 100644 index 8d437cb..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-panel:" - -# add some widgets, add some applications to quicklaunch by injecting -# panel.conf configured on the target - -SRC_URI += "file://panel.conf" -do_configure:prepend () { - cp ${WORKDIR}/panel.conf ${S}/panel/resources/ -} diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch deleted file mode 100644 index f4ecae4..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session/0001-session.conf-add-qterminal-as-default-terminal.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d75c0cc25075b78730a4ef29823d6fabe2d46a6b Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Tue, 2 Jan 2018 10:44:43 +0100 -Subject: [PATCH] session.conf: add qterminal as default terminal - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - config/session.conf | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config/session.conf b/config/session.conf -index ded6aa8..c0aacf5 100644 ---- a/config/session.conf -+++ b/config/session.conf -@@ -3,8 +3,10 @@ window_manager=openbox - leave_confirmation=true - - [Environment] -+BROWSER= - GTK_CSD=0 - GTK_OVERLAY_SCROLLING=0 -+TERM=qterminal - - [Mouse] - cursor_size=18 --- -2.13.6 - diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend deleted file mode 100644 index c3b8be2..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-session:" - -SRC_URI += "file://0001-session.conf-add-qterminal-as-default-terminal.patch" diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png Binary files differdeleted file mode 100755 index 5f145d3..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6D.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png Binary files differdeleted file mode 100755 index 72623c1..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ApalisiMX6Q.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png Binary files differdeleted file mode 100644 index d28e967..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF50.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png Binary files differdeleted file mode 100644 index 404ae0f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriVF61.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png Binary files differdeleted file mode 100644 index 37e8c2f..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6DL.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png Binary files differdeleted file mode 100644 index faca0ad..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6S.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png Binary files differdeleted file mode 100644 index 7fc1228..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX6ULL.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png Binary files differdeleted file mode 100644 index c0fb9a1..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7D.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png Binary files differdeleted file mode 100644 index 18d671d..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_ColibriiMX7S.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png Binary files differdeleted file mode 100644 index dc56b11..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes/Wallpaper_Toradex.png +++ /dev/null diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend deleted file mode 100644 index f88e38b..0000000 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ /dev/null @@ -1,90 +0,0 @@ -WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE:colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE:colibri-imx6ull-emmc = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE:colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" - -FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-themes:" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI += " \ - file://Wallpaper_Toradex.png \ - file://${WALLPAPER-MACHINE} \ -" - -# for apalis-imx6/colibri-imx6, we decide on the target during postinst -SRC_URI:append:apalis-imx6 += " \ - file://Wallpaper_ApalisiMX6D.png \ - file://Wallpaper_ApalisiMX6Q.png \ -" -SRC_URI:append:colibri-imx6 += " \ - file://Wallpaper_ColibriiMX6DL.png \ - file://Wallpaper_ColibriiMX6S.png \ -" - -# for colibri-imx7 we decide on the target during postinst -SRC_URI:append:colibri-imx7 += " \ - file://Wallpaper_ColibriiMX7D.png \ - file://Wallpaper_ColibriiMX7S.png \ -" -SRC_URI:append:colibri-imx7-emmc += " \ - file://Wallpaper_ColibriiMX7D.png \ -" - -do_install:append () { - install -m 0755 -d ${D}/${datadir}/lxqt/themes/toradex - install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxqt/themes/toradex - ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxqt/themes/toradex/toradex.png -} - -pkg_postinst_ontarget:${PN}:apalis-imx6 () { - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 4) - ln -sf Wallpaper_ApalisiMX6Q.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 2) - ln -sf Wallpaper_ApalisiMX6D.png ${datadir}/lxqt/themes/toradex/toradex.png - fi - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} -pkg_postinst_ontarget:${PN}:colibri-imx6 () { - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 2) - ln -sf Wallpaper_ColibriiMX6DL.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 1) - ln -sf Wallpaper_ColibriiMX6S.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} - -pkg_postinst_ontarget:${PN}:colibri-imx7 () { -# Currently the soc bus subsystem seems not to work on i.MX 7Solo -# SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` -# if [ "x$SOC_TYPE" = "xi.MX7D" ]; then -# ln -sf Wallpaper_ColibriiMX7D.png ${datadir}/lxqt/themes/toradex/toradex.png -# else -# ln -sf Wallpaper_ColibriiMX7S.png ${datadir}/lxqt/themes/toradex/toradex.png -# fi - CORES=`grep -c processor /proc/cpuinfo` - case $CORES in - 2) - ln -sf Wallpaper_ColibriiMX7D.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - 1) - ln -sf Wallpaper_ColibriiMX7S.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - *) - ln -sf Wallpaper_Toradex.png ${datadir}/lxqt/themes/toradex/toradex.png - ;; - esac -} diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch deleted file mode 100644 index cffad50..0000000 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt/0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 12a1469fa171f5d0e50b536a6e073ea5ca45a152 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 3 Jan 2018 14:33:37 +0100 -Subject: [PATCH] settings.conf.in: change to use a toradex wallpaper - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - config/pcmanfm-qt/lxqt/settings.conf.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/pcmanfm-qt/lxqt/settings.conf.in b/config/pcmanfm-qt/lxqt/settings.conf.in -index b7ef002..70a1d18 100644 ---- a/config/pcmanfm-qt/lxqt/settings.conf.in -+++ b/config/pcmanfm-qt/lxqt/settings.conf.in -@@ -14,9 +14,9 @@ SingleClick=false - ConfirmDelete=true - - [Desktop] --WallpaperMode=stretch --Wallpaper=@LXQT_SHARE_DIR@/themes/frost/lxqt-origami-light.png --BgColor=#000000 -+WallpaperMode=center -+Wallpaper=@LXQT_SHARE_DIR@/themes/toradex/toradex.png -+BgColor=#00508c - FgColor=#ffffff - ShadowColor=#000000 - ShowHidden=false --- -2.13.6 - diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend deleted file mode 100644 index 13ce53d..0000000 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/pcmanfm-qt:" - -SRC_URI += "file://0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch" diff --git a/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf b/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf deleted file mode 100644 index 720f45c..0000000 --- a/meta-qt5-extra/recipes-misc/sddm/files/sddm.conf +++ /dev/null @@ -1,120 +0,0 @@ -[Autologin] -# Whether sddm should automatically log back into sessions when they exit -Relogin=false - -# Name of session file for autologin session (if empty try last logged in) -Session=lxqt - -# Username for autologin session -User=root - - -[General] -# Halt command -HaltCommand=/usr/bin/systemctl poweroff - -# Input method module -InputMethod= - -# Initial NumLock state. Can be on, off or none. -# If property is set to none, numlock won't be changed -# NOTE: Currently ignored if autologin is enabled. -Numlock=none - -# Reboot command -RebootCommand=/usr/bin/systemctl reboot - - -[Theme] -# Current theme name -Current= - -# Cursor theme used in the greeter -CursorTheme= - -# Number of users to use as threshold -# above which avatars are disabled -# unless explicitly enabled with EnableAvatars -DisableAvatarsThreshold=7 - -# Enable display of custom user avatars -EnableAvatars=true - -# Global directory for user avatars -# The files should be named <username>.face.icon -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - - -[Users] -# Default $PATH for logged in users -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Comma-separated list of shells. -# Users with these shells as their default won't be listed -HideShells=/bin/sync,/bin/false,/bin/nologin,/usr/sbin/ppp-dialin - -# Comma-separated list of users that should not be listed -HideUsers=daemon,bin,sys,games,man,lp,mail,news,uucp,proxy,www-data,backup,list,irc,gnats,polkitd - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=0 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - - -[Wayland] -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Directory containing available Wayland sessions -SessionDir=/usr/share/wayland-sessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/wayland-session.log - - -[X11] -# Path to a script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Path to a script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# The lowest virtual terminal number that will be used. -MinimumVT=1 - -# Arguments passed to the X server invocation -ServerArguments=-nolisten tcp - -# Path to X server binary -ServerPath=/usr/bin/X - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Directory containing available X sessions -SessionDir=/usr/share/xsessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/xorg-session.log - -# Path to the Xauthority file -UserAuthFile=.Xauthority - -# Path to xauth binary -XauthPath=/usr/bin/xauth - -# Path to Xephyr binary -XephyrPath=/usr/bin/Xephyr - - diff --git a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend b/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend deleted file mode 100644 index 8802adb..0000000 --- a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb deleted file mode 100644 index 034342f..0000000 --- a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Falkon Webbrowser" -HOMEPAGE = "http://www.falkon.org" -SECTION = "x11" - -LICENSE = "GPL-3.0-only & LGPL-3.0-only & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" - -DEPENDS = "libxcb ki18n openssl qtbase qttools-native qtwebengine qtx11extras" - -inherit cmake_qt5_extra gettext kde-base - -SRC_URI = "https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz" -SRC_URI[md5sum] = "9255fb335d3ba361dea44b7b297ddf7d" -SRC_URI[sha256sum] = "ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587" - -PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" - -export USE_LIBPATH = "${libdir}" -export QUPZILLA_PREFIX = "${prefix}" -export SHARE_FOLDER = "${datadir}" -export QMAKE_LRELEASE = "${RECIPE_SYSROOT_NATIVE}/usr/bin/qt5" - -FILES:${PN} += " \ - ${OE_QMAKE_PATH_DATA}/icons \ - ${OE_QMAKE_PATH_DATA}/metainfo \ - ${OE_QMAKE_PATH_DATA}/bash-completion/completions \ - ${OE_QMAKE_PATH_PLUGINS}/falkon \ -" diff --git a/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch b/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch deleted file mode 100644 index 7c7f563..0000000 --- a/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0c9e80df71bde69179edcb6847eb381eeec5cf7c Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Tue, 26 Dec 2017 20:05:37 +0100 -Subject: [PATCH] Options.cpp: provide default for - SIDE_PANEL_TOOLBAR_TEXT_POSITION - -prevents the following: - -| # qedit -| 2017/12/26 17:24:23 Options::_find - invalid option: SIDE_PANEL_TOOLBAR_TEXT_POSITION -| Segmentation fault (core dumped) - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - base/Options.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/base/Options.cpp b/base/Options.cpp -index 2fb2c9f..cd099c6 100644 ---- a/base/Options.cpp -+++ b/base/Options.cpp -@@ -62,6 +62,8 @@ void Options::installDefaultOptions() - set( "FIXED_FONT_NAME", "Sans Serif,10" ); - set( "FONT_NAME", "Monospace,10" ); - -+ set<int>( "SIDE_PANEL_TOOLBAR_TEXT_POSITION", 0 ); -+ - // toolbars default configuration - set<int>( "TOOLBUTTON_ICON_SIZE", 0 ); - set<int>( "TOOLBUTTON_TEXT_POSITION", -1 ); --- -2.13.6 - diff --git a/qt5-layer/recipes-qt/qedit/files/qedit.desktop b/qt5-layer/recipes-qt/qedit/files/qedit.desktop deleted file mode 100644 index 14f5669..0000000 --- a/qt5-layer/recipes-qt/qedit/files/qedit.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=QEdit -Comment=A Qt Text editor -Exec=qedit %F -Terminal=false -Type=Application -MimeType=text/plain; -Icon=qedit -Categories=Utility;TextEditor;Qt;
\ No newline at end of file diff --git a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb deleted file mode 100644 index 11bb90d..0000000 --- a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "QEdit Text Editor" -HOMEPAGE = "http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt&package=qedit&full=0" -SECTION = "x11" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d" - -DEPENDS = "qtbase qtx11extras" - -inherit cmake_qt5 - -SRC_URI = " \ - http://hugo.pereira.free.fr/software/tgz/qedit-2.8.2.tar.gz \ - file://qedit.desktop \ - file://0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch \ -" -SRC_URI[md5sum] = "7cca177ea042b230678ba0bb36269665" -SRC_URI[sha256sum] = "cc0686927ec8ffe44527f682b3a8d9585f753d643543fae061cb023a3b71ddb0" - -EXTRA_OECMAKE = "-DUSE_QT5=ON" -#export EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX=/usr" -do_configure() { - # Ensure we get the cmake configure and not qmake - cmake_do_configure -} - -do_install:append () { - install -d ${D}/${datadir}/applications - install -m 755 ${WORKDIR}/qedit.desktop ${D}/${datadir}/applications/ -} - -FILES:${PN} += "" -FILES:${PN}-dev += "" diff --git a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb deleted file mode 100644 index 81769ff..0000000 --- a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb +++ /dev/null @@ -1,24 +0,0 @@ -SECTION = "x11/libs" -SUMMARY = "systemd qtapplication autostart" -# The license is meant for this recipe and the files it installs. -# RNDIS is part of the kernel, udhcpd is part of busybox -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit allarch systemd - -SRC_URI = " \ - file://qt5-x11-demo.service \ - file://qt5-x11-demo-init \ -" - -do_install () { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/qt5-x11-demo-init ${D}/${bindir} - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/qt5-x11-demo.service ${D}${systemd_unitdir}/system -} - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "qt5-x11-demo.service" diff --git a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init deleted file mode 100644 index 76922ec..0000000 --- a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo-init +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -set -e - -cd /usr/share/qtsmarthome-1.0 -QTAPP="smarthome" -QTAPPSTART="./${QTAPP} > /var/log/Xsession.log 2>&1" - -case "$1" in - start) - echo "Starting ${QTAPP}" - if [ -f /etc/profile.d/tslib.sh ]; then - source /etc/profile.d/tslib.sh - fi - if [ -e "$TSLIB_TSDEVICE" ]; then - if [ ! -f /etc/pointercal ]; then - /usr/bin/ts_calibrate - fi - else - if [ -e "/usr/bin/xinput_calibrator_once.sh" ]; then - xinput_calibrator_once.sh - fi - fi - Xorg & - export DISPLAY=:0 - eval $QTAPPSTART & - ;; - stop) - echo "Stopping ${QTAPP}" - killall $QTAPP - killall Xorg - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 { start | stop | restart }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service deleted file mode 100644 index 053f273..0000000 --- a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd/qt5-x11-demo.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=start X and a qt application - -[Service] -Type=forking -ExecStart=/usr/bin/qt5-x11-demo-init start -ExecStop=/usr/bin/qt5-x11-demo-init stop - -[Install] -WantedBy=graphical.target diff --git a/qt5-layer/recipes-qt/qt5/qtbase/qt5-x11.sh b/qt5-layer/recipes-qt/qt5/qtbase/qt5-x11.sh deleted file mode 100644 index 8bbd73b..0000000 --- a/qt5-layer/recipes-qt/qt5/qtbase/qt5-x11.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -export QT_QPA_PLATFORM=xcb diff --git a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb deleted file mode 100644 index 8a89f83..0000000 --- a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GNOME disk utility" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "avahi-ui glib-2.0 gnome-doc-utils gtk+3 intltool-native \ - libatasmart libcanberra libdvdread libgnome-keyring \ - libnotify libpwquality libsecret libunique libxslt-native \ - pkgconfig-native udisks2 virtual/libx11 xmlto-native xz" - -PR = "r4" - -inherit gnomebase gtk-icon-cache -SRC_URI[archive.md5sum] = "265ed1aede9ef0570228ca6908e9df59" -SRC_URI[archive.sha256sum] = "f39508226268f39dafa8977ebcec1d36e694f8aa7c4a404d1ac50f76e8e57739" -GNOME_COMPRESS_TYPE = "xz" - -EXTRA_OECONF += "--disable-gsd-plugin" - -do_configure:prepend() { - sed -i -e "s: help : :g" ${S}/Makefile.am -} - -FILES:${PN} += "${datadir}/appdata ${datadir}/dbus-1/services" -FILES:${PN}-libs += "${libdir}/libgdu*.so.*" diff --git a/recipes-graphics/rdesktop/rdesktop.inc b/recipes-graphics/rdesktop/rdesktop.inc deleted file mode 100644 index 025c4e9..0000000 --- a/recipes-graphics/rdesktop/rdesktop.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Rdesktop rdp client for X" -HOMEPAGE = "http://www.rdesktop.org" -DEPENDS = "virtual/libx11 openssl pcsc-lite" -SECTION = "x11/network" -LICENSE = "GPL" - -INC_PR = "r2" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ - file://add_ioctl_serial_get_properties.patch \ -"
\ No newline at end of file diff --git a/recipes-graphics/rdesktop/rdesktop/add_ioctl_serial_get_properties.patch b/recipes-graphics/rdesktop/rdesktop/add_ioctl_serial_get_properties.patch deleted file mode 100644 index 8214f2b..0000000 --- a/recipes-graphics/rdesktop/rdesktop/add_ioctl_serial_get_properties.patch +++ /dev/null @@ -1,22 +0,0 @@ -If an application on the windows host uses rdesktops serial forwarding -the SERIAL_GET_PROPERTIES might get called and leads to an error returned. - -This patch implements the ioctl without giving back any data, however no -error state is returned either. - -Taken from: -http://sourceforge.net/p/rdesktop/bugs/372/#20fd - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- rdesktop-1.8.3/serial.c.orig 2015-01-21 12:46:35.222209021 +0100 -+++ rdesktop-1.8.3/serial.c 2015-01-21 12:52:53.739897582 +0100 -@@ -935,6 +935,9 @@ - DEBUG_SERIAL(("serial_ioctl -> SERIAL_SET_XON\n")); - tcflow(handle, TCION); - break; -+ case SERIAL_GET_PROPERTIES: -+ DEBUG_SERIAL(("serial_ioctl -> SERIAL_GET_PROPERTIES\n")); -+ break; - default: - unimpl("SERIAL IOCTL %d\n", request); - return RD_STATUS_INVALID_PARAMETER; diff --git a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb b/recipes-graphics/rdesktop/rdesktop_1.8.3.bb deleted file mode 100644 index 78faa6c..0000000 --- a/recipes-graphics/rdesktop/rdesktop_1.8.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION-${PN}-client = "A remote desktop protocol client" -HOMEPAGE = "http://www.rdesktop.org/" -SECTION = "utils" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -require rdesktop.inc - -PR = "${INC_PR}.3" - -inherit autotools - -EXTRA_OECONF = "--disable-credssp --with-openssl=${STAGING_EXECPREFIXDIR} " - -SRC_URI[md5sum] = "86e8b368a7c715e74ded92e0d7912dc5" -SRC_URI[sha256sum] = "88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4" diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb deleted file mode 100644 index 8abd7d7..0000000 --- a/recipes-graphics/scrot/imlib2_git.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "Imlib2" -LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" - -DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PROVIDES = "virtual/imlib2" -PV = "1.4.6+gitr${SRCPV}" -SRCREV = "560a58e61778d84953944f744a025af6ce986334" - -inherit autotools binconfig pkgconfig -SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;branch=master" -S = "${WORKDIR}/git" - -# autotools-brokensep -B = "${S}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" -PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag" - -EXTRA_OECONF = "--with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} " - -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters ${PN}-bin imlib2-themes " -FILES:${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES:${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" -FILES:${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES:${PN}-bin = "${bindir}" -FILES:imlib2-themes = "${datadir}/imlib2/data" -FILES:imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES:imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES:imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES:imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" - -# png.so jpeg.so id3.so are also provided by lightmediascanner -PRIVATE_LIBS:imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so" - -PRIVATE_LIBS:imlib2-filters = "bumpmap.so colormod.so testfilter.so" - -do_configure:prepend() { - autopoint || touch config.rpath -} - -do_install:prepend () { - for i in `find ${B}/ -name "*.pc" -type f` ; do \ - sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i - done -} diff --git a/recipes-graphics/unclutter/files/cross-compile.patch b/recipes-graphics/unclutter/files/cross-compile.patch deleted file mode 100644 index f1277f5..0000000 --- a/recipes-graphics/unclutter/files/cross-compile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Dont hardcode CC. Thus allow to use a cross-compiler - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- unclutter-1.09/Makefile.orig 2007-02-05 23:52:40.000000000 +0100 -+++ unclutter-1.09/Makefile 2013-05-14 19:08:13.612112758 +0200 -@@ -1,7 +1,6 @@ - # Makefile for unclutter. Throw this away and use the Imakefile if you can. - TOP = . - CURRENT_DIR = . -- CC = gcc - LKED = $(CC) - INSTALL = install - MAKE = make diff --git a/recipes-graphics/unclutter/files/fix_include_path.patch b/recipes-graphics/unclutter/files/fix_include_path.patch deleted file mode 100644 index 618cee8..0000000 --- a/recipes-graphics/unclutter/files/fix_include_path.patch +++ /dev/null @@ -1,26 +0,0 @@ -Remove include path to /usr/include. -Fixes bitbake warning: -| WARNING: unclutter-1.09-r0 do_package_qa: QA Issue: unclutter: The compile log indicates that host include and/or library paths were used. -| Please check the log '/mnt/sdc2/oe-disk/oe-core_master/build/out-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/unclutter/1.09-r0/temp/log.do_compile' for more information. [compile-host-path] - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> -diff -Naur unclutter-1.09.orig/Makefile unclutter-1.09/Makefile ---- unclutter-1.09.orig/Makefile 2016-07-30 16:43:56.730859141 +0200 -+++ unclutter-1.09/Makefile 2016-07-30 16:49:19.603890691 +0200 -@@ -10,7 +10,7 @@ - MFLAGS = -$(MAKEFLAGS) - INSTPGMFLAGS = -c -s - INSTMANFLAGS = -c -- TOP_INCLUDES = -I$(INCROOT) -+ TOP_INCLUDES = - CDEBUGFLAGS = -O - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) -@@ -21,7 +21,6 @@ - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - BINDIR = $(DESTDIR)/usr/bin/X11 -- INCROOT = $(DESTDIR)/usr/include - MANPATH = $(DESTDIR)/usr/catman/x11_man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)1 diff --git a/recipes-graphics/unclutter/files/fix_missing_int_declarators.patch b/recipes-graphics/unclutter/files/fix_missing_int_declarators.patch deleted file mode 100644 index f2acc6a..0000000 --- a/recipes-graphics/unclutter/files/fix_missing_int_declarators.patch +++ /dev/null @@ -1,61 +0,0 @@ -Modern C compiler warn about the usage of declaring variables with out type -which then default to int. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- unclutter-1.09.orig/unclutter.c 2007-02-06 00:13:12.000000000 +0100 -+++ unclutter-1.09/unclutter.c 2016-07-30 16:44:37.462489217 +0200 -@@ -37,14 +37,15 @@ - #include <X11/Xutil.h> - #include <X11/Xproto.h> - #include <stdio.h> -+#include <stdlib.h> - #include "vroot.h" - - char *progname; --pexit(str)char *str;{ -+int pexit(str)char *str;{ - fprintf(stderr,"%s: %s\n",progname,str); - exit(1); - } --usage(){ -+void usage(void){ - pexit("usage:\n\ - -display <display>\n\ - -idle <seconds> time between polls to detect idleness.\n\ -@@ -87,7 +88,7 @@ - * return true if window has a wm_name and the start of it matches - * one of the given names to avoid - */ --nameinlist(display,window) -+int nameinlist(display,window) - Display *display; - Window window; - { -@@ -109,7 +110,7 @@ - * return true if window has a wm_name and one of the given names to avoid - * matches anywhere in that string - */ --matchinlist(display,window) -+int matchinlist(display,window) - Display *display; - Window window; - { -@@ -131,7 +132,7 @@ - /* - * create a small 1x1 cursor with all pixels masked out on the given screen. - */ --createnullcursor(display,root) -+Cursor createnullcursor(display,root) - Display *display; - Window root; - { -@@ -155,7 +156,8 @@ - return cursor; - } - --main(argc,argv)char **argv;{ -+int main(argc,argv) -+int argc; char **argv;{ - Display *display; - int screen,oldx = -99,oldy = -99,numscreens; - int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0, diff --git a/recipes-graphics/unclutter/unclutter_1.09.bb b/recipes-graphics/unclutter/unclutter_1.09.bb deleted file mode 100644 index 80dc8d3..0000000 --- a/recipes-graphics/unclutter/unclutter_1.09.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Hides the cursor after inactivity" -LICENSE = "PD" - -DEPENDS = "virtual/xserver" - -S = "${WORKDIR}/unclutter-${PV}" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/unclutter/unclutter-${PV}.tar.gz \ - file://cross-compile.patch \ - file://fix_include_path.patch \ - file://fix_missing_int_declarators.patch \ -" -LIC_FILES_CHKSUM = "file://README;md5=7c9b6681ac4b35194de7d5f3585702b6" -SRC_URI[md5sum] = "8c4464367b2db1d15fe36a8752e917c8" -SRC_URI[sha256sum] = "3a53575fe2a75a34bc9a2b0ad92ee0f8a7dbedc05d8783f191c500060a40a9bd" - -# link for hash-style=gnu -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - install -d ${D}${bindir}/ ${D}${mandir}/man1 - install -m 0755 ${S}/unclutter ${D}${bindir}/ - install -m 0644 ${S}/unclutter.man ${D}${mandir}/man1/unclutter.1 -} diff --git a/recipes-graphics/vnc/directvnc_0.7.8.bb b/recipes-graphics/vnc/directvnc_0.7.8.bb deleted file mode 100644 index 6f82628..0000000 --- a/recipes-graphics/vnc/directvnc_0.7.8.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Provides a very thin VNC client for unix framebuffer systems" -HOMEPAGE = "http://drinkmilk.github.com/directvnc/" -SECTION = "utils" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" - -DEPENDS = "zlib libpng jpeg directfb xproto" - -SRC_URI = "https://github.com/downloads/drinkmilk/directvnc/directvnc-${PV}.tar.gz" -SRC_URI[md5sum] = "063f9d98956006f230dcbc05f822525b" -SRC_URI[sha256sum] = "07d6109aef5bba2df86f0dd658be7ed9d828801be0878eba3d32f041189d3330" - -inherit autotools diff --git a/recipes-graphics/vnc/tightvnc/Makefile b/recipes-graphics/vnc/tightvnc/Makefile deleted file mode 100644 index 3f720f8..0000000 --- a/recipes-graphics/vnc/tightvnc/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -OBJS = argsresources.o \ -caps.o \ -colour.o \ -cursor.o \ -desktop.o \ -dialogs.o \ -fullscreen.o \ -listen.o \ -misc.o \ -popup.o \ -rfbproto.o \ -selection.o \ -shm.o \ -sockets.o \ -tunnel.o \ -vncviewer.o \ -../libvncauth/vncauth.o \ -../libvncauth/d3des.o - -tightvncviewer : $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -lX11 -lXaw6 -ljpeg -lz -lXt -lXmu -lXext -o tightvncviewer - -%.o: %.c Makefile - $(CC) -c $(CFLAGS) -I. -I../include -I../libvncauth/ -o $@ $< diff --git a/recipes-graphics/vnc/tightvnc/Vncviewer b/recipes-graphics/vnc/tightvnc/Vncviewer deleted file mode 100644 index ed60ecd..0000000 --- a/recipes-graphics/vnc/tightvnc/Vncviewer +++ /dev/null @@ -1,66 +0,0 @@ -Vncviewer.title: TightVNC: %s -Vncviewer.translations:\ - <Enter>: SelectionToVNC()\n\ - <Leave>: SelectionFromVNC() -*form.background: black -*viewport.allowHoriz: True -*viewport.allowVert: True -*viewport.useBottom: True -*viewport.useRight: True -*viewport*Scrollbar*thumb: None -*desktop.baseTranslations:\ - <Key>F8: ShowPopup()\n\ - <ButtonPress>: SendRFBEvent()\n\ - <ButtonRelease>: SendRFBEvent()\n\ - <Motion>: SendRFBEvent()\n\ - <KeyPress>: SendRFBEvent()\n\ - <KeyRelease>: SendRFBEvent() -*serverDialog.dialog.label: VNC server: -*serverDialog.dialog.value: -*serverDialog.dialog.value.translations: #override\n\ - <Key>Return: ServerDialogDone() -*passwordDialog.dialog.label: Password: -*passwordDialog.dialog.value: -*passwordDialog.dialog.value.AsciiSink.echo: False -*passwordDialog.dialog.value.translations: #override\n\ - <Key>Return: PasswordDialogDone() -*popup.title: TightVNC popup -*popup*background: grey -*popup*font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 -*popup.buttonForm.Command.borderWidth: 0 -*popup.buttonForm.Toggle.borderWidth: 0 -*popup.translations: #override <Message>WM_PROTOCOLS: HidePopup() -*popup.buttonForm.translations: #override\n\ - <KeyPress>: SendRFBEvent() HidePopup() -*popupButtonCount: 8 -*popup*button1.label: Dismiss popup -*popup*button1.translations: #override\n\ - <Btn1Down>,<Btn1Up>: HidePopup() -*popup*button2.label: Quit viewer -*popup*button2.translations: #override\n\ - <Btn1Down>,<Btn1Up>: Quit() -*popup*button3.label: Full screen -*popup*button3.type: toggle -*popup*button3.translations: #override\n\ - <Visible>: SetFullScreenState()\n\ - <Btn1Down>,<Btn1Up>: toggle() HidePopup() ToggleFullScreen() -*popup*button4.label: Clipboard: local -> remote -*popup*button4.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SelectionToVNC(always) HidePopup() -*popup*button5.label: Clipboard: local <- remote -*popup*button5.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SelectionFromVNC(always) HidePopup() -*popup*button6.label: Request refresh -*popup*button6.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SendRFBEvent(fbupdate) HidePopup() -*popup*button7.label: Send ctrl-alt-del -*popup*button7.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SendRFBEvent(keydown,Control_L)\ - SendRFBEvent(keydown,Alt_L)\ - SendRFBEvent(key,Delete)\ - SendRFBEvent(keyup,Alt_L)\ - SendRFBEvent(keyup,Control_L)\ - HidePopup() -*popup*button8.label: Send F8 -*popup*button8.translations: #override\n\ - <Btn1Down>,<Btn1Up>: SendRFBEvent(key,F8) HidePopup() diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb deleted file mode 100644 index 29435d0..0000000 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "A lightweight VNC viewer" -HOMEPAGE = "http://www.tightvnc.com/" -SECTION = "utils" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://../LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" - -DEPENDS = "virtual/libx11 zlib libxmu libxaw jpeg libxt libxext libxmu" - -PR = "r2" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/vnc-tight/tightvnc-${PV}_unixsrc.tar.bz2 \ - file://Makefile \ - file://Vncviewer \ -" - -S = "${WORKDIR}/vnc_unixsrc/vncviewer" - -PACKAGES = "${PN}-viewer-dbg ${PN}-viewer" -FILES:${PN}-viewer-dbg = "${bindir}/.debug" -FILES:${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" - -do_compile () { - install ${WORKDIR}/Makefile ${S} - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install ${PN}viewer ${D}${bindir} - install -d ${D}${sysconfdir}/X11/app-defaults - install -m 644 ${WORKDIR}/Vncviewer ${D}${sysconfdir}/X11/app-defaults/Vncviewer -} - -pkg_postinst:${PN}-viewer () { - update-alternatives --install ${bindir}/vncviewer vncviewer tightvncviewer 100 -} - - -pkg_prerm:${PN}-viewer () { - update-alternatives --remove ${bindir}/vncviewer vncviewer tightvncviewer 100 -} - -SRC_URI[md5sum] = "397b35faad32d5246b6d44b142f8304f" -SRC_URI[sha256sum] = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d" diff --git a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb deleted file mode 100644 index 9543156..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "qtbase-examples" -INITIAL_PATH ?= "" -X_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb deleted file mode 100644 index 4921351..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "cinematicexperience" -INITIAL_PATH ?= "/usr/share/cinematicexperience-1.0" -X_APPLICATION ?= "${INITIAL_PATH}/Qt5_CinematicExperience" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb deleted file mode 100644 index 098dec6..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "qtsmarthome" -INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0" -X_APPLICATION ?= "${INITIAL_PATH}/smarthome" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc b/recipes-graphics/x-window-simple-app/x-window-simple-app.inc deleted file mode 100644 index a96a0d5..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "x11/libs" -SUMMARY = "x11 application autostart" -DESCRIPTION = \ -"This installs a /usr/bin/x-window-manager script. The script will start the \ -one and only application X_APPLICATION as the last step of the \ -xserver-nodm-init X initialization. \ -If the script ever returns, X will be killed." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit allarch - -RDEPENDS:${PN} += "${INITIAL_APP_PKGS} xserver-nodm-init" - -S = "${WORKDIR}" - -SRC_URI = " \ - file://x-window-manager.in \ - file://set_have_touch.sh \ -" - -do_compile () { - sed -e "s:@PATH@:${INITIAL_PATH}:" -e "s:@APP@:${X_APPLICATION}:" x-window-manager.in > x-window-manager -} - -do_install () { - install -d ${D}/${bindir} ${D}${sysconfdir}/X11/Xsession.d - install -m 0755 ${S}/x-window-manager ${D}/${bindir} - install -m 0644 ${S}/set_have_touch.sh ${D}/${sysconfdir}/X11/Xsession.d/29set_have_touch.sh -} - -# make sure xinput_calibrator is only started once -pkg_postinst:${PN}() { - rm -f /etc/xdg/autostart/xinput_calibrator.desktop -} diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app/set_have_touch.sh b/recipes-graphics/x-window-simple-app/x-window-simple-app/set_have_touch.sh deleted file mode 100644 index d4d49d5..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app/set_have_touch.sh +++ /dev/null @@ -1,2 +0,0 @@ -# force have touchscreen -HAVE_TOUCHSCREEN=1 diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app/x-window-manager.in b/recipes-graphics/x-window-simple-app/x-window-simple-app/x-window-manager.in deleted file mode 100644 index b3e0e8f..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app/x-window-manager.in +++ /dev/null @@ -1,6 +0,0 @@ -RET=1 -while [ $RET -ne 0 ]; do - cd @PATH@ - @APP@ - RET=$? -done diff --git a/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb deleted file mode 100644 index da711c7..0000000 --- a/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# set the following variable to your one and only application which should -# be started - -INITIAL_APP_PKGS ?= "xterm" -INITIAL_PATH ?= "" -X_APPLICATION ?= "/usr/bin/xterm" - -FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" -require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index 99e9cb3..2cd8a57 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -130,6 +130,7 @@ RRECOMMENDS:packagegroup-utils-tdx-cli = "\ alsa-utils \ alsa-utils-aplay \ alsa-utils-amixer \ + alsa-ucm-conf-tdx \ bluealsa \ bzip2 \ e2fsprogs \ diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index 6f7ff2a..6fdb6d7 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -10,8 +10,6 @@ PACKAGES += " \ packagegroup-gstreamer-tdx-graphical \ packagegroup-gpu-tdx-graphical \ packagegroup-vulkan-tools-tdx-graphical \ - packagegroup-x11-components-tdx-graphical \ - packagegroup-x11-utils-tdx-graphical \ " RRECOMMENDS:packagegroup-tdx-graphical = " \ @@ -19,11 +17,6 @@ RRECOMMENDS:packagegroup-tdx-graphical = " \ packagegroup-gpu-tdx-graphical \ ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', \ 'packagegroup-vulkan-tools-tdx-graphical', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', \ - 'packagegroup-x11-components-tdx-graphical \ - packagegroup-x11-utils-tdx-graphical', \ - '', d), d)} \ " RRECOMMENDS:packagegroup-tdx-graphical:append:k3 = " \ packagegroup-drm-utils-tdx-graphical \ @@ -109,31 +102,3 @@ SUMMARY:packagegroup-vulkan-tools-tdx-graphical = "Vulkan tools" RRECOMMENDS:packagegroup-vulkan-tools-tdx-graphical = " \ vulkan-tools \ " - -SUMMARY:packagegroup-x11-components-tdx-graphical = "Components of X11" -RRECOMMENDS:packagegroup-x11-components-tdx-graphical = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', \ - 'libxcursor \ - libxdamage \ - libxres \ - libxvmc \ - xcursor-transparent-theme \ - xorg-minimal-fonts \ - xrdb \ - xserver-xorg-extension-dbe \ - xserver-xorg-extension-extmod \ - xserver-xorg-multimedia-modules \ - xserver-xorg-utils', \ - '', d), d)} \ -" - -SUMMARY:packagegroup-x11-utils-tdx-graphical = "Utilities for X11" -RRECOMMENDS:packagegroup-x11-utils-tdx-graphical = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', \ - 'scrot \ - setxkbmap \ - unclutter', \ - '', d), d)} \ -" diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index 4299e81..bd7b43c 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -9,8 +9,7 @@ inherit populate_sdk_qt5 export IMAGE_BASENAME = "Reference-Multimedia-Image" IMAGE_FEATURES += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston', '', d)} \ " APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience" @@ -20,19 +19,11 @@ APP_LAUNCH_WAYLAND:colibri-imx7 ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock" APP_LAUNCH_WAYLAND:verdin-am62 ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience" -APP_LAUNCH_X11:colibri-imx6ull ?= "x-window-analogclock" -APP_LAUNCH_X11:colibri-imx6ull-emmc ?= "x-window-analogclock" -APP_LAUNCH_X11:colibri-imx7 ?= "x-window-analogclock" -APP_LAUNCH_X11:colibri-imx7-emmc ?= "x-window-analogclock" -APP_LAUNCH_X11:verdin-am62 ?= "x-window-analogclock" - IMAGE_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ '${APP_LAUNCH_WAYLAND}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ - 'weston-xwayland xterm', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', '${APP_LAUNCH_X11}', '', d), d)} \ + 'weston-xwayland xterm', '', d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "tpm2", "packagegroup-tpm2-tdx-cli", "",d)} \ \ packagegroup-tdx-cli \ diff --git a/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch b/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch deleted file mode 100755 index f578148..0000000 --- a/recipes-multimedia/tinycompress/tinycompress/0001-tinycompress-Add-id3-decoding.patch +++ /dev/null @@ -1,1001 +0,0 @@ -From 16f6b7a5baec41f18fde75fd311fb988e3c31810 Mon Sep 17 00:00:00 2001 -From: Shengjiu Wang <shengjiu.wang@nxp.com> -Date: Fri, 13 Jul 2018 18:13:24 +0800 -Subject: [PATCH] tinycompress: Add id3 decoding - -Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> ---- - include/tinycompress/id3_tag_decode.h | 198 +++++++++++ - src/utils/Makefile.am | 2 +- - src/utils/cplay.c | 88 +++++ - src/utils/id3_tag_decode.c | 642 ++++++++++++++++++++++++++++++++++ - 4 files changed, 929 insertions(+), 1 deletion(-) - create mode 100644 include/tinycompress/id3_tag_decode.h - create mode 100644 src/utils/id3_tag_decode.c - -diff --git a/include/tinycompress/id3_tag_decode.h b/include/tinycompress/id3_tag_decode.h -new file mode 100644 -index 0000000..1a911d7 ---- /dev/null -+++ b/include/tinycompress/id3_tag_decode.h -@@ -0,0 +1,198 @@ -+/* -+ * Copyright (c) 2006-2017 Cadence Design Systems, Inc. -+ * Copyright 2018 NXP -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included -+ * in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/****************************************************************** -+ * file name : id3_tag_decode.h -+ * -+ * description : stores typedefs of structures specific to MP3 tag -+ * -+ * revision history: -+ * 29 04 2004 DK creation -+ *****************************************************************/ -+ -+#ifndef ID3_TAG_DECODE_H -+#define ID3_TAG_DECODE_H -+ -+typedef signed char WORD8; -+typedef signed char * pWORD8; -+typedef unsigned char UWORD8; -+typedef unsigned char * pUWORD8; -+ -+typedef signed short WORD16; -+typedef signed short * pWORD16; -+typedef unsigned short UWORD16; -+typedef unsigned short * pUWORD16; -+ -+typedef signed int WORD24; -+typedef signed int * pWORD24; -+typedef unsigned int UWORD24; -+typedef unsigned int * pUWORD24; -+ -+typedef signed int WORD32; -+typedef signed int * pWORD32; -+typedef unsigned int UWORD32; -+typedef unsigned int * pUWORD32; -+ -+typedef void VOID; -+typedef void * pVOID; -+ -+typedef signed int BOOL; -+typedef unsigned int UBOOL; -+typedef signed int FLAG; -+typedef unsigned int UFLAG; -+typedef signed int LOOPIDX; -+typedef unsigned int ULOOPIDX; -+typedef signed int WORD; -+typedef unsigned int UWORD; -+ -+#define MAX_TAG_FRAME_SIZE 100 -+ -+#define ID3V1 (0x544147) /* 0x544147 is TAG in WORD8 */ -+ -+#define ID3V2 (0x494433) /* 0x494433 is ID3 in WORD8 */ -+ -+/* -+ * structure corresponding to ID3 tag v1 header. -+ * this structure has all the field corresponding to ID3 tag v1 header. -+ */ -+ -+typedef struct { -+ WORD32 tag; // 3 bytes -+ -+ WORD16 version; // 2 bytes -+ -+ WORD8 flag; //1 byte -+ -+ WORD32 size; //4 bytes -+ -+} id3_v2_header_struct; -+ -+/* structure which will store the frame data and -+ * also put a limit max data to be stored -+ */ -+typedef struct { -+ WORD8 frame_data[MAX_TAG_FRAME_SIZE]; -+ -+ WORD32 max_size; //4 bytes -+ -+ WORD16 tag_present; -+ -+ WORD16 exceeds_buffer_size; -+ -+} id3_v2_frame_struct; -+ -+/* -+ * structure corresponding to ID3 tag v2. -+ * this structure has some of the field corresponding to ID3 tag v2. -+ * if user wants to read some more tag information from -+ * the MP3 file, he can add that field in this structure and pass address -+ * of that element to get_inf function in id3_tag_decode.c under the -+ * corresponding field frame header. few fields which are needed are already -+ * populated by reading from the TAG header. -+ */ -+typedef struct { -+ id3_v2_frame_struct album_movie_show_title; -+ -+ id3_v2_frame_struct composer_name; -+ -+ id3_v2_frame_struct content_type; -+ -+ id3_v2_frame_struct encoded_by; -+ -+ id3_v2_frame_struct lyricist_text_writer; -+ -+ id3_v2_frame_struct content_group_description; -+ -+ id3_v2_frame_struct title_songname_content_description; -+ -+ id3_v2_frame_struct medxa_type; -+ -+ id3_v2_frame_struct original_album_movie_show_title; -+ -+ id3_v2_frame_struct original_filename; -+ -+ id3_v2_frame_struct original_lyricist_text_writer; -+ -+ id3_v2_frame_struct original_artist_performer; -+ -+ id3_v2_frame_struct file_owner_licensee; -+ -+ id3_v2_frame_struct lead_performer_soloist; -+ -+ id3_v2_frame_struct publisher; -+ -+ id3_v2_frame_struct private_frame; -+ -+ id3_v2_frame_struct other_info; -+ -+ id3_v2_header_struct id3_v2_header; -+ -+ WORD32 header_end; -+ -+ WORD32 bytes_consumed; -+ -+} id3v2_struct; -+ -+/* -+ * structure corresponding to ID3 tag v1. -+ * this structure has all the field corresponding to ID3 tag v1. -+ */ -+typedef struct { -+ WORD8 song_title[30]; //30 word8acters -+ -+ WORD8 artist[30]; //30 word8acters -+ -+ WORD8 album[30]; //30 word8acters -+ -+ WORD8 year[4]; //4 word8acters -+ -+ WORD8 comment[30]; //30 word8acters -+ -+ WORD8 genre[1]; //1 byte -+ -+} id3v1_struct; -+ -+WORD32 get_info(const char *inp_buffer, -+ unsigned int avail_inp, -+ WORD32 tag_size, -+ id3_v2_frame_struct *dest); -+ -+WORD32 search_id3_v2(UWORD8 *buffer); -+ -+WORD32 decode_id3_v2(const char *const buffer, -+ id3v2_struct *id3v2, -+ WORD32 continue_flag, -+ WORD32 insize); -+ -+WORD32 get_id3_v2_bytes(UWORD8 *buffer); -+ -+WORD32 get_v1_info(UWORD8 *buffer, id3v1_struct *id3v1); -+ -+WORD32 search_id3_v1(UWORD8 *buffer); -+ -+WORD32 decode_id3_v1(UWORD8 *buffer, id3v1_struct *id3v1); -+ -+void init_id3v2_field(id3v2_struct *id3v2); -+ -+#endif -diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am -index 1b996d4..e813689 100644 ---- a/src/utils/Makefile.am -+++ b/src/utils/Makefile.am -@@ -1,6 +1,6 @@ - bin_PROGRAMS = cplay crecord - --cplay_SOURCES = cplay.c -+cplay_SOURCES = cplay.c id3_tag_decode.c - crecord_SOURCES = crecord.c - - cplay_CFLAGS = -I$(top_srcdir)/include -diff --git a/src/utils/cplay.c b/src/utils/cplay.c -index 87863a3..2a52b52 100644 ---- a/src/utils/cplay.c -+++ b/src/utils/cplay.c -@@ -72,6 +72,7 @@ - #include "sound/compress_params.h" - #include "tinycompress/tinycompress.h" - #include "tinycompress/tinymp3.h" -+#include "tinycompress/id3_tag_decode.h" - - static int verbose; - static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM; -@@ -245,12 +246,97 @@ int main(int argc, char **argv) - exit(EXIT_SUCCESS); - } - -+void shift_buffer(char *buf, int buf_size, int bytes_consumed) -+{ -+ int i; -+ -+ if (bytes_consumed <= 0) -+ return; -+ -+ for (i = 0; i < buf_size - bytes_consumed; i++) -+ buf[i] = buf[i + bytes_consumed]; -+} -+ -+void parse_id3(FILE *file, int *offset) { -+ /* ID3 tag specific declarations */ -+ unsigned char id3_buf[128]; -+ unsigned char id3v2_buf[4096]; -+ signed int id3_v1_found = 0, id3_v1_decoded = 0; -+ signed int id3_v2_found = 0, id3_v2_complete = 0; -+ signed int i_bytes_consumed = 0; -+ signed int i_fread_bytes; -+ id3v1_struct id3v1; -+ id3v2_struct id3v2; -+ -+ { -+ fseek(file, -128, SEEK_END); -+ fread(id3_buf, 1, 128, file); -+ -+ /* search for ID3V1 */ -+ id3_v1_found = search_id3_v1(id3_buf + 0); -+ if (id3_v1_found) { -+ /* if ID3V1 is found, decode ID3V1 */ -+ decode_id3_v1(id3_buf + 3, &id3v1); -+ id3_v1_decoded = 1; -+ } -+ fseek(file, 0, SEEK_SET); -+ } -+ -+ { -+ signed int flag = 0; -+ signed int continue_flag = 0; -+ -+ i_fread_bytes = fread(id3v2_buf, -+ sizeof(char), 0x1000, file); -+ -+ /* search for ID3V2 */ -+ id3_v2_found = -+ search_id3_v2(id3v2_buf); -+ -+ if (id3_v2_found) { -+ /* initialise the max fields */ -+ init_id3v2_field(&id3v2); -+ -+ while (!id3_v2_complete && id3_v2_found) { -+ /* if ID3V2 is found, decode ID3V2 */ -+ id3_v2_complete = decode_id3_v2((const char *const)id3v2_buf, -+ &id3v2, continue_flag, i_fread_bytes); -+ -+ if (!id3_v2_complete) { -+ continue_flag = 1; -+ i_bytes_consumed = id3v2.bytes_consumed; -+ -+ fseek(file, i_bytes_consumed, SEEK_SET); -+ -+ i_fread_bytes = fread(id3v2_buf, -+ sizeof(unsigned char), 0x1000, file); -+ if (i_fread_bytes <= 0) { -+ return; -+ } -+ } -+ } -+ -+ if (id3_v2_complete) { -+ i_bytes_consumed = id3v2.bytes_consumed; -+ fseek(file, i_bytes_consumed, SEEK_SET); -+ } -+ } -+ } -+ -+ *offset = i_bytes_consumed; -+} -+ - void get_codec_mp3(FILE *file, struct compr_config *config, - struct snd_codec *codec) - { - size_t read; - struct mp3_header header; - unsigned int channels, rate, bits; -+ int offset = 0; -+ -+ parse_id3(file, &offset); -+ -+ fseek(file, offset, SEEK_SET); - - read = fread(&header, 1, sizeof(header), file); - if (read != sizeof(header)) { -@@ -279,6 +365,8 @@ void get_codec_mp3(FILE *file, struct compr_config *config, - codec->level = 0; - codec->ch_mode = 0; - codec->format = 0; -+ -+ fseek(file, offset, SEEK_SET); - } - - void get_codec_iec(FILE *file, struct compr_config *config, -diff --git a/src/utils/id3_tag_decode.c b/src/utils/id3_tag_decode.c -new file mode 100644 -index 0000000..393967a ---- /dev/null -+++ b/src/utils/id3_tag_decode.c -@@ -0,0 +1,642 @@ -+/* -+ * Copyright (c) 2006-2017 Cadence Design Systems, Inc. -+ * Copyright 2018 NXP -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included -+ * in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+#include <ctype.h> -+#include "tinycompress/id3_tag_decode.h" -+ -+#define CHAR4(c1, c2, c3, c4) \ -+ (int)(((unsigned char)(c1) << 24) | \ -+ ((unsigned char)(c2) << 16) | \ -+ ((unsigned char)(c3) << 8) | \ -+ ((unsigned char)c4)) -+ -+#ifndef MSVC_BUILD -+unsigned int umin(unsigned int a, unsigned int b) -+{ -+ return (a < b ? a : b); -+} -+ -+#else -+unsigned int umin(unsigned int a, unsigned int b) -+{ -+ return (a < b ? a : b); -+} -+#endif -+ -+/*********************************************************** -+ * function name : display -+ * -+ * description : display ID3 tag contents. -+ * -+ * arguments : input parameters -+ * -+ * values returned : 0 -+ ***********************************************************/ -+ -+static void display2(const id3_v2_frame_struct * const src, -+ int size, -+ const char * const disp) -+{ -+ int j; -+ -+ -+ for (j = 0; j < size; j++) { -+ int c = src->frame_data[j]; -+ -+ if (c) { -+ if (!isprint(c)) -+ break; -+ } -+ } -+} -+ -+static VOID display1(WORD8 src[], WORD32 size, WORD8 disp[]) -+{ -+ WORD32 j; -+ -+ for (j = 0; j < size ; j++) { -+ int c = src[j]; -+ -+ if (c) { -+ if (!isprint(c)) -+ break; -+ } -+ } -+} -+ -+/***************************************************************** -+ * function name : init_id3_header -+ * -+ * description : initialise the max filed size of teh farem. -+ * -+ * arguments : input parameters -+ * -+ * values returned : 0 -+ ****************************************************************/ -+ -+VOID init_id3v2_field(id3v2_struct *id3v2) -+{ -+ id3v2->album_movie_show_title.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->composer_name.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->content_type.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->encoded_by.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->lyricist_text_writer.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->content_group_description.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->title_songname_content_description.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->medxa_type.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->original_album_movie_show_title.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->original_filename.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->original_lyricist_text_writer.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->original_artist_performer.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->file_owner_licensee.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->lead_performer_soloist.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->publisher.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->private_frame.max_size = MAX_TAG_FRAME_SIZE; -+ id3v2->other_info.max_size = MAX_TAG_FRAME_SIZE; -+ -+ /* resetting the flag to indicate presese of frame */ -+ id3v2->album_movie_show_title.tag_present = 0; -+ id3v2->composer_name.tag_present = 0; -+ id3v2->content_type.tag_present = 0; -+ id3v2->encoded_by.tag_present = 0; -+ id3v2->lyricist_text_writer.tag_present = 0; -+ id3v2->content_group_description.tag_present = 0; -+ id3v2->title_songname_content_description.tag_present = 0; -+ id3v2->medxa_type.tag_present = 0; -+ id3v2->original_album_movie_show_title.tag_present = 0; -+ id3v2->original_filename.tag_present = 0; -+ id3v2->original_lyricist_text_writer.tag_present = 0; -+ id3v2->original_artist_performer.tag_present = 0; -+ id3v2->file_owner_licensee.tag_present = 0; -+ id3v2->lead_performer_soloist.tag_present = 0; -+ id3v2->publisher.tag_present = 0; -+ id3v2->private_frame.tag_present = 0; -+ id3v2->other_info.tag_present = 0; -+ -+ /* resetting the flag which indicates that size of the frame has -+ * exceeded the max buffer size -+ */ -+ id3v2->album_movie_show_title.exceeds_buffer_size = 0; -+ id3v2->composer_name.exceeds_buffer_size = 0; -+ id3v2->content_type.exceeds_buffer_size = 0; -+ id3v2->encoded_by.exceeds_buffer_size = 0; -+ id3v2->lyricist_text_writer.exceeds_buffer_size = 0; -+ id3v2->content_group_description.exceeds_buffer_size = 0; -+ id3v2->title_songname_content_description.exceeds_buffer_size = 0; -+ id3v2->medxa_type.exceeds_buffer_size = 0; -+ id3v2->original_album_movie_show_title.exceeds_buffer_size = 0; -+ id3v2->original_filename.exceeds_buffer_size = 0; -+ id3v2->original_lyricist_text_writer.exceeds_buffer_size = 0; -+ id3v2->original_artist_performer.exceeds_buffer_size = 0; -+ id3v2->file_owner_licensee.exceeds_buffer_size = 0; -+ id3v2->lead_performer_soloist.exceeds_buffer_size = 0; -+ id3v2->publisher.exceeds_buffer_size = 0; -+ id3v2->private_frame.exceeds_buffer_size = 0; -+ id3v2->other_info.exceeds_buffer_size = 0; -+ -+ id3v2->bytes_consumed = 0; -+ id3v2->header_end = 0; -+} -+ -+/*************************************************************** -+ * function name : search_id3_v2 -+ * -+ * description : finds if ID3V2 starts at the start of given buffer. -+ * -+ * arguments : input parameters -+ * buffer input buffer -+ * -+ * values returned : FLAG 1: ID3 found 0: ID3 not found -+ ***************************************************************/ -+WORD32 search_id3_v2(UWORD8 *buffer) -+{ -+ UWORD32 temp; -+ -+ temp = buffer[0] << 16; -+ temp |= buffer[1] << 8; -+ temp |= buffer[2]; -+ -+ if (temp == ID3V2) -+ return 1; /* ID3 found */ -+ -+ return 0; /* ID3 not found */ -+} -+ -+/************************************************************** -+ * function name : search_id3_v1 -+ * -+ * description : finds if ID3V1 starts at the start of given buffer. -+ * -+ * arguments : input parameters -+ * buffer input buffer -+ * -+ * values returned : FLAG 1: ID3 found 0: ID3 not found -+ **************************************************************/ -+WORD32 search_id3_v1(UWORD8 *buffer) -+{ -+ UWORD32 temp; -+ -+ temp = buffer[0] << 16; -+ temp |= buffer[1] << 8; -+ temp |= buffer[2]; -+ -+ if (temp == ID3V1) -+ return 1; /* ID3 found */ -+ -+ return 0; /* ID3 not found */ -+} -+ -+/*************************************************************** -+ * function name : decode_id3_v1 -+ * -+ * description : decodes ID3V1 tag. -+ * -+ * arguments : input parameters -+ * buffer input buffer -+ * id3v1 structure -+ * -+ * values returned : bytes consumed -+ **************************************************************/ -+WORD32 decode_id3_v1(UWORD8 *buffer, id3v1_struct *id3v1) -+{ -+ WORD32 bytes_consumed = 0; -+ short tag_type; -+ -+ /* setting the tag type */ -+ tag_type = 1; -+ -+ bytes_consumed = get_v1_info(buffer, id3v1); -+ -+ return bytes_consumed; -+} -+ -+/*********************************************************** -+ * function name : get_v1_info -+ * -+ * description : gets ID3V1 information fields. -+ * -+ * arguments : input parameters -+ * buffer input buffer -+ * id3v1 structure -+ * -+ * values returned : bytes consumed -+ ***********************************************************/ -+WORD32 get_v1_info(UWORD8 *buffer, id3v1_struct *id3v1) -+{ -+ WORD32 i; -+ WORD32 bytes_consumed = 0; -+ -+ /* get song_title */ -+ for (i = 0; i < 30; i++) -+ id3v1->song_title[i] = buffer[i]; -+ -+ buffer += 30; -+ bytes_consumed += 30; -+ display1(id3v1->song_title, 30, (WORD8 *)"song_title : "); -+ -+ /* get artist */ -+ for (i = 0; i < 30; i++) -+ id3v1->artist[i] = buffer[i]; -+ -+ buffer += 30; -+ bytes_consumed += 30; -+ display1(id3v1->artist, 30, (WORD8 *)"artist : "); -+ -+ /* get album */ -+ for (i = 0; i < 30; i++) -+ id3v1->album[i] = buffer[i]; -+ -+ buffer += 30; -+ bytes_consumed += 30; -+ display1(id3v1->album, 30, (WORD8 *)"album : "); -+ -+ /* get year */ -+ for (i = 0; i < 4; i++) -+ id3v1->year[i] = buffer[i]; -+ -+ buffer += 4; -+ bytes_consumed += 4; -+ display1(id3v1->year, 4, (WORD8 *)"year : "); -+ -+ /* get comment */ -+ for (i = 0; i < 30; i++) -+ id3v1->comment[i] = buffer[i]; -+ -+ buffer += 30; -+ bytes_consumed += 30; -+ display1(id3v1->comment, 30, (WORD8 *)"comment : "); -+ -+ /* get genre */ -+ for (i = 0; i < 1; i++) -+ id3v1->genre[i] = buffer[i]; -+ -+ buffer += 1; -+ bytes_consumed += 1; -+ -+ return bytes_consumed; -+} -+ -+/***************************************************** -+ * function name : decode_id3_v2 -+ * -+ * description : decodes ID3V2 tag. -+ * -+ * arguments : input parameters -+ * buffer input buffer -+ * id3v2 structure -+ * continue_flag FLAG to indicate whether -+ * it is first call or not -+ * insize input buffer size -+ * -+ * values returned : bytes consumed -+ ******************************************************/ -+WORD32 decode_id3_v2(const char *const buffer, -+ id3v2_struct *const id3v2, -+ WORD32 continue_flag, -+ WORD32 insize) -+{ -+ UWORD32 size = 0, flag; -+ WORD32 i, buf_update_val; -+ UWORD8 buf[4], frame_header[10], id3_buffer[10]; -+ WORD8 *bitstream_ptr; -+ short tag_type; -+ -+ WORD32 bytes_consumed = 0; -+ -+ if (id3v2->header_end == 1) { -+ id3v2->bytes_consumed += insize; -+ if (id3v2->bytes_consumed < id3v2->id3_v2_header.size) -+ return 0; -+ -+ id3v2->bytes_consumed = (id3v2->id3_v2_header.size + 10); -+ return 1; -+ } -+ -+ bitstream_ptr = (WORD8 *)id3_buffer; -+ -+ if (!continue_flag) { -+ bytes_consumed += 3; -+ /* setting the tag type */ -+ tag_type = 2; -+ id3v2->id3_v2_header.version = buffer[bytes_consumed + 0] << 8; -+ id3v2->id3_v2_header.version |= buffer[bytes_consumed + 1]; -+ id3v2->id3_v2_header.flag = buffer[bytes_consumed + 2]; -+ -+ /* making the msb of each byte zero */ -+ buf[0] = buffer[bytes_consumed + 6] & 0x7f; -+ buf[1] = buffer[bytes_consumed + 5] & 0x7f; -+ buf[2] = buffer[bytes_consumed + 4] & 0x7f; -+ buf[3] = buffer[bytes_consumed + 3] & 0x7f; -+ -+ bytes_consumed += 7; -+ -+ /* concatenation the bytes after making -+ * 7th bit zero to get 28 bits size -+ */ -+ size = buf[0]; -+ size |= (buf[1] << 7); -+ size |= (buf[2] << 14); -+ size |= (buf[3] << 21); -+ /* storing the size */ -+ id3v2->id3_v2_header.size = size; -+ -+ /* check for extended header */ -+ if (id3v2->id3_v2_header.flag & 0x20) { -+ for (i = 0; i < 10; i++) -+ bitstream_ptr[i] = buffer[bytes_consumed + i]; -+ -+ i = 0; -+ bytes_consumed += 10; -+ -+ size = bitstream_ptr[i++] << 24; -+ size |= bitstream_ptr[i++] << 16; -+ size |= bitstream_ptr[i++] << 8; -+ size |= bitstream_ptr[i++]; -+ -+ /* two bytes for flag */ -+ i += 2; -+ { -+ UWORD32 padding_size; -+ -+ padding_size = bitstream_ptr[i++] << 24; -+ padding_size |= bitstream_ptr[i++] << 16; -+ padding_size |= bitstream_ptr[i++] << 8; -+ padding_size |= bitstream_ptr[i++]; -+ -+ /* skipping the padding and frame size -+ * number of bytes -+ */ -+ bytes_consumed += (padding_size + size); -+ } -+ } -+ } -+ -+ while (id3v2->header_end != 1) { -+ char *key; -+ id3_v2_frame_struct *value; -+ unsigned int avail_inp; -+ -+ /* reading the 10 bytes to get the frame header */ -+ -+ for (i = 0; i < 10; i++) -+ frame_header[i] = buffer[bytes_consumed + i]; -+ bytes_consumed += 10; -+ -+ /* getting the size from the header */ -+ size = frame_header[4] << 24; -+ size |= frame_header[5] << 16; -+ size |= frame_header[6] << 8; -+ size |= frame_header[7]; -+ -+ /* decoding the flag, currently not used */ -+ flag = frame_header[8] << 8; -+ flag |= frame_header[9]; -+ -+ avail_inp = insize - bytes_consumed; -+ -+ /* switching to the frame type */ -+ switch (CHAR4(frame_header[0], -+ frame_header[1], -+ frame_header[2], -+ frame_header[3])) { -+ case CHAR4('A', 'E', 'N', 'C'): -+ case CHAR4('A', 'P', 'I', 'C'): -+ case CHAR4('C', 'O', 'M', 'M'): -+ case CHAR4('C', 'O', 'M', 'R'): -+ case CHAR4('E', 'N', 'C', 'R'): -+ case CHAR4('E', 'Q', 'U', 'A'): -+ case CHAR4('E', 'T', 'C', 'O'): -+ case CHAR4('G', 'E', 'O', 'B'): -+ case CHAR4('G', 'R', 'I', 'D'): -+ case CHAR4('I', 'P', 'L', 'S'): -+ case CHAR4('L', 'I', 'N', 'K'): -+ case CHAR4('M', 'C', 'D', 'I'): -+ case CHAR4('M', 'L', 'L', 'T'): -+ case CHAR4('O', 'W', 'N', 'E'): -+ case CHAR4('P', 'C', 'N', 'T'): -+ case CHAR4('P', 'O', 'P', 'M'): -+ case CHAR4('P', 'O', 'S', 'S'): -+ case CHAR4('R', 'B', 'U', 'F'): -+ case CHAR4('R', 'V', 'A', 'D'): -+ case CHAR4('R', 'V', 'R', 'B'): -+ case CHAR4('S', 'Y', 'L', 'T'): -+ case CHAR4('S', 'Y', 'T', 'C'): -+ case CHAR4('T', 'B', 'P', 'M'): -+ case CHAR4('T', 'C', 'O', 'P'): -+ case CHAR4('T', 'D', 'A', 'T'): -+ case CHAR4('T', 'D', 'L', 'Y'): -+ case CHAR4('T', 'F', 'L', 'T'): -+ case CHAR4('T', 'I', 'M', 'E'): -+ case CHAR4('T', 'K', 'E', 'Y'): -+ case CHAR4('T', 'L', 'A', 'N'): -+ case CHAR4('T', 'L', 'E', 'N'): -+ case CHAR4('T', 'M', 'E', 'D'): -+ case CHAR4('T', 'O', 'F', 'N'): -+ case CHAR4('T', 'O', 'L', 'Y'): -+ case CHAR4('T', 'O', 'R', 'Y'): -+ case CHAR4('T', 'P', 'E', '2'): -+ case CHAR4('T', 'P', 'E', '3'): -+ case CHAR4('T', 'P', 'E', '4'): -+ case CHAR4('T', 'P', 'O', 'S'): -+ case CHAR4('T', 'R', 'C', 'K'): -+ case CHAR4('T', 'R', 'D', 'A'): -+ case CHAR4('T', 'R', 'S', 'N'): -+ case CHAR4('T', 'R', 'S', 'O'): -+ case CHAR4('T', 'S', 'I', 'Z'): -+ case CHAR4('T', 'S', 'R', 'C'): -+ case CHAR4('T', 'S', 'S', 'E'): -+ case CHAR4('T', 'Y', 'E', 'R'): -+ case CHAR4('T', 'X', 'X', 'X'): -+ case CHAR4('U', 'F', 'I', 'D'): -+ case CHAR4('U', 'S', 'E', 'R'): -+ case CHAR4('U', 'S', 'L', 'T'): -+ case CHAR4('W', 'C', 'O', 'M'): -+ case CHAR4('W', 'C', 'O', 'P'): -+ case CHAR4('W', 'O', 'A', 'F'): -+ case CHAR4('W', 'O', 'A', 'R'): -+ case CHAR4('W', 'O', 'A', 'S'): -+ case CHAR4('W', 'O', 'R', 'S'): -+ case CHAR4('W', 'P', 'A', 'Y'): -+ case CHAR4('W', 'P', 'U', 'B'): -+ case CHAR4('W', 'X', 'X', 'X'): -+ case CHAR4('T', 'I', 'T', '3'): -+ key = "other_info : "; -+ value = &id3v2->other_info; -+ break; -+ case CHAR4('P', 'R', 'I', 'V'): -+ key = "private_frame : "; -+ value = &id3v2->private_frame; -+ break; -+ case CHAR4('T', 'A', 'L', 'B'): -+ key = "album_movie_show_title : "; -+ value = &id3v2->album_movie_show_title; -+ break; -+ case CHAR4('T', 'C', 'O', 'M'): -+ key = "composer_name : "; -+ value = &id3v2->composer_name; -+ break; -+ case CHAR4('T', 'C', 'O', 'N'): -+ key = "content_type : "; -+ value = &id3v2->content_type; -+ break; -+ case CHAR4('T', 'E', 'N', 'C'): -+ key = "encoded_by : "; -+ value = &id3v2->encoded_by; -+ break; -+ case CHAR4('T', 'E', 'X', 'T'): -+ key = "lyricist_text_writer : "; -+ value = &id3v2->lyricist_text_writer; -+ break; -+ case CHAR4('T', 'I', 'T', '1'): -+ key = "content_group_description : "; -+ value = &id3v2->content_group_description; -+ break; -+ case CHAR4('T', 'I', 'T', '2'): -+ key = "title_songname_content_description : "; -+ value = &id3v2->title_songname_content_description; -+ break; -+ case CHAR4('T', 'O', 'A', 'L'): -+ key = "original_album_movie_show_title : "; -+ value = &id3v2->original_album_movie_show_title; -+ break; -+ case CHAR4('T', 'O', 'P', 'E'): -+ key = "original_artist_performer : "; -+ value = &id3v2->original_artist_performer; -+ break; -+ case CHAR4('T', 'O', 'W', 'N'): -+ key = "file_owner_licensee : "; -+ value = &id3v2->file_owner_licensee; -+ break; -+ case CHAR4('T', 'P', 'E', '1'): -+ key = "lead_performer_soloist : "; -+ value = &id3v2->lead_performer_soloist; -+ break; -+ case CHAR4('T', 'P', 'U', 'B'): -+ key = "publisher : "; -+ value = &id3v2->publisher; -+ break; -+ default: -+ /* skipping the read 10 bytes */ -+ buf_update_val = -10; -+ id3v2->header_end = 1; -+ value = 0; -+ key = 0; -+ break; -+ } -+ -+ if (value != 0) -+ buf_update_val = get_info(&buffer[bytes_consumed], -+ avail_inp, size, value); -+ -+ /* Negative value for buf_update_val means one of two things: -+ * 1. The default case happened and we're done with ID3V2 tag -+ * frames, or -+ * 2. get_info() returned -1 to indicate that more input is -+ * required to decode this frame of the tag. -+ */ -+ if (buf_update_val >= 0) -+ display2(value, -+ umin(value->max_size, buf_update_val), key); -+ -+ if (buf_update_val == -1) { -+ id3v2->bytes_consumed += bytes_consumed; -+ return 1; -+ } -+ -+ bytes_consumed += buf_update_val; -+ -+ /* Is there enough input left (10 bytes) to begin -+ * decoding another frame? If not, bag out temporarily -+ * now. The caller will refill our input buffer and -+ * call us again with continue_flag == 1. -+ */ -+ if (insize - bytes_consumed < 10) { -+ id3v2->bytes_consumed += bytes_consumed; -+ return 0; /* not completely decoded */ -+ } -+ } -+ -+ id3v2->bytes_consumed += bytes_consumed; -+ if ((id3v2->bytes_consumed + 10) < id3v2->id3_v2_header.size) -+ return 0; /* not completely decoded */ -+ -+ return 1; /* completely decoded */ -+} -+ -+/******************************************************* -+ * function name : get_id3_v2_bytes -+ * -+ * description : tells the size of ID3V2 tag. -+ * -+ * arguments : input parameters -+ * buffer input buffer -+ * -+ * values returned : bytes consumed -+ ********************************************************/ -+WORD32 get_id3_v2_bytes(UWORD8 *buffer) -+{ -+ WORD32 size; -+ -+ /* making the msb of each byte zero */ -+ size = (buffer[9] & 0x7f); -+ size |= ((buffer[8] & 0x7f) << 7); -+ size |= ((buffer[7] & 0x7f) << 14); -+ size |= ((buffer[6] & 0x7f) << 21); -+ -+ return (size + 10); -+} -+ -+/**************************************************** -+ * function name : get_info -+ * -+ * description : read the frame information from the input buffer. -+ * -+ * arguments : input parameters -+ * -+ * values returned : update value for buffer -+ ****************************************************/ -+WORD32 get_info(const char *inp_buffer, -+ unsigned int avail_inp, -+ WORD32 tag_size, -+ id3_v2_frame_struct *dest) -+{ -+ WORD32 j; -+ -+ /* setting the tag to indicate the presence of frame */ -+ dest->tag_present = 1; -+ /* If there isn't enough input available, we punt back to the top -+ * level and ask for more. -+ */ -+ if (avail_inp < umin(tag_size, dest->max_size)) -+ return -1; -+ -+ if (dest->max_size >= tag_size) { -+ for (j = 0; j < tag_size ; j++) -+ dest->frame_data[j] = inp_buffer[j]; -+ } else { -+ dest->exceeds_buffer_size = 1; -+ for (j = 0; j < dest->max_size ; j++) -+ dest->frame_data[j] = inp_buffer[j]; -+ } -+ return tag_size; -+} --- -2.7.4 - diff --git a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb b/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb deleted file mode 100644 index 610d521..0000000 --- a/recipes-multimedia/tinycompress/tinycompress_1.1.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "tinycompress library for compress audio offload in alsa" -DESCRIPTION = "A library to handle compressed formats like MP3 etc" -LICENSE = "BSD-3-Clause | LGPL-2.1-only" - -inherit autotools pkgconfig -LIC_FILES_CHKSUM = "file://COPYING;md5=cf9105c1a2d4405cbe04bbe3367373a0" - -SRC_URI = "git://github.com/alsa-project/tinycompress.git;protocol=https;branch=master \ - file://0001-tinycompress-Add-id3-decoding.patch \ -" -SRCREV = "995f2ed91045dad8c20485ab1a64727d22cd92e5" - -S = "${WORKDIR}/git" diff --git a/recipes-support/florence/files/0001-make-sound-a-configure-option.patch b/recipes-support/florence/files/0001-make-sound-a-configure-option.patch deleted file mode 100644 index d4d4f7c..0000000 --- a/recipes-support/florence/files/0001-make-sound-a-configure-option.patch +++ /dev/null @@ -1,154 +0,0 @@ -From ec1ede35d043cbbe33a40aa8e0e9901a507f4328 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Thu, 23 Jun 2016 20:12:25 +0200 -Subject: [PATCH] make sound a configure option - -add a --without-sound switch which builds without soundeffect and -drops the dependency on gstreamer 0.10 - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - configure.ac | 9 ++++++++- - src/Makefile.am | 4 ++-- - src/main.c | 4 ++++ - src/style.c | 15 ++++++++++++++- - 4 files changed, 28 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8629509..a147ed3 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -11,6 +11,8 @@ AC_ARG_WITH([xtst], AS_HELP_STRING([--without-xtst], [Build without Xtst extensi - AM_CONDITIONAL([WITH_XTST], [test "x$with_xtst" != "xno"]) - AC_ARG_WITH([xrecord], AS_HELP_STRING([--without-xrecord], [Build without XRecord extension (requires the Xtst extension) (default: enabled)])) - AM_CONDITIONAL([WITH_XRECORD], [test "x$with_xrecord" != "xno" -a "x$with_xtst" != "xno"]) -+AC_ARG_WITH([sound], AS_HELP_STRING([--without-sound], [Build without sound extension (default: enabled)])) -+AM_CONDITIONAL([WITH_SOUND], [test "x$with_sound" != "xno"]) - AC_ARG_WITH([at-spi], AS_HELP_STRING([--without-at-spi], [Build without at-spi(default: enabled)])) - AM_CONDITIONAL([WITH_AT_SPI], [test "x$with_at_spi" != "xno"]) - AC_ARG_WITH([panelapplet], AS_HELP_STRING([--without-panelapplet], [Build without libpanelapplet(default: enabled)])) -@@ -61,7 +63,7 @@ if test "x$with_docs" != "xno"; then - fi - - # Checks for libraries. --DEP_MODULES="x11 gmodule-2.0 cairo librsvg-2.0 libxml-2.0 gconf-2.0 gtk+-2.0 >= 2.12.0 gstreamer-0.10" -+DEP_MODULES="x11 gmodule-2.0 cairo librsvg-2.0 libxml-2.0 gconf-2.0 gtk+-2.0 >= 2.12.0" - PKG_CHECK_MODULES(DEPS, $DEP_MODULES) - - if test "x$with_docs" != "xno"; then -@@ -84,6 +86,9 @@ if test "x$with_xtst" != "xno"; then - AC_DEFINE(ENABLE_XRECORD, ["xrecord"], [xrecord extension is enabled]) - fi - fi -+if test "x$with_sound" != "xno"; then -+ PKG_CHECK_MODULES([SOUND], gstreamer-0.10, AC_DEFINE([ENABLE_SOUND], [], [Sound enabled.]), AC_MSG_ERROR(Could not configure gstreamer 0.10. Please either install gstreamer 0.10 or disable sound: --without-sound configure option)) -+fi - if test "x$with_at_spi" != "xno"; then - PKG_CHECK_MODULES([AT_SPI2], [atspi-2], AC_DEFINE([ENABLE_AT_SPI2], [], [dbus at-spi enabled.]), [at_spi2=x]) - if test "x$at_spi2" = "xx"; then -@@ -116,6 +121,8 @@ AC_SUBST(LIBPANELAPPLET_CFLAGS) - AC_SUBST(LIBPANELAPPLET_LIBS) - AC_SUBST(XTST_CFLAGS) - AC_SUBST(XTST_LIBS) -+AC_SUBST(SOUND_CFLAGS) -+AC_SUBST(SOUND_LIBS) - AC_SUBST(AT_SPI2_CFLAGS) - AC_SUBST(AT_SPI2_LIBS) - AC_SUBST(AT_SPI_CFLAGS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 586d6a2..6af8772 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -15,8 +15,8 @@ endif - - florence_CPPFLAGS = -DICONDIR="\"$(ICONDIR)\""\ - -DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS)\ -- $(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(AT_SPI_CFLAGS) $(AT_SPI2_CFLAGS) $(INCLUDES) --florence_LDADD = $(DEPS_LIBS) $(LIBM) $(X11_LIBS) $(LIBGNOME_LIBS) $(LIBNOTIFY_LIBS) $(XTST_LIBS) $(AT_SPI2_LIBS) $(AT_SPI_LIBS) -+ $(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(SOUND_CFLAGS) $(AT_SPI_CFLAGS) $(AT_SPI2_CFLAGS) $(INCLUDES) -+florence_LDADD = $(DEPS_LIBS) $(LIBM) $(X11_LIBS) $(LIBGNOME_LIBS) $(LIBNOTIFY_LIBS) $(XTST_LIBS) $(SOUND_LIBS) $(AT_SPI2_LIBS) $(AT_SPI_LIBS) - - if WITH_PANELAPPLET - -diff --git a/src/main.c b/src/main.c -index 6134c2a..180585d 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -23,7 +23,9 @@ - #include <sys/types.h> - #include <getopt.h> - #include <gtk/gtk.h> -+#ifdef ENABLE_SOUND - #include <gst/gst.h> -+#endif - #include <gconf/gconf-client.h> - #include "system.h" - #include "trace.h" -@@ -72,7 +74,9 @@ int main (int argc, char **argv) - gtk_init(&argc, &argv); - gconf_init(argc, argv, NULL); - g_type_init(); -+#ifdef ENABLE_SOUND - gst_init(&argc, &argv); -+#endif - - program_name=argv[0]; - config=decode_switches (argc, argv); -diff --git a/src/style.c b/src/style.c -index 2a81d01..8d31976 100644 ---- a/src/style.c -+++ b/src/style.c -@@ -27,8 +27,10 @@ - #include <libxml/parser.h> - #include <libxml/tree.h> - #include <libxml/xmlsave.h> --#include <gst/gst.h> - #include "system.h" -+#ifdef ENABLE_SOUND -+#include <gst/gst.h> -+#endif - #include "trace.h" - #include "key.h" - #include "style.h" -@@ -562,6 +564,7 @@ GdkPixbuf *style_pixbuf_draw(struct style *style) - } - - /* Liberate the pipeline */ -+#ifdef ENABLE_SOUND - void style_sound_pipeline_free(GstElement *pipeline) - { - START_FUNC -@@ -675,6 +678,14 @@ void style_sound_play(struct style *style, const gchar *match, enum style_sound_ - } - END_FUNC - } -+#else -+void style_sound_free(gpointer data, gpointer userdata) -+{ -+} -+void style_sound_play(struct style *style, const gchar *match, enum style_sound_type type) -+{ -+} -+#endif - - /* create a new style from the layout file */ - struct style *style_new(gchar *base_uri) -@@ -711,6 +722,7 @@ struct style *style_new(gchar *base_uri) - } - } - -+#ifdef ENABLE_SOUND - layoutreader_reset(layout); - layoutreader_element_open(layout, "style"); - if (layoutreader_element_open(layout, "sounds")) { -@@ -719,6 +731,7 @@ struct style *style_new(gchar *base_uri) - layoutreader_sound_free(sound); - } - } -+#endif - - layoutreader_free(layout); - if (!base_uri) g_free(uri); --- -2.6.6 - diff --git a/recipes-support/florence/files/fix-no-atspi-compile.patch b/recipes-support/florence/files/fix-no-atspi-compile.patch deleted file mode 100644 index 0bb5dee..0000000 --- a/recipes-support/florence/files/fix-no-atspi-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/florence.c b/src/florence.c -index b27c31b..feadefe 100644 ---- a/src/florence.c -+++ b/src/florence.c -@@ -44,12 +44,6 @@ - /* exit signal */ - static int flo_exit=FALSE; - --#ifdef ENABLE_AT_SPI2 --void flo_check_show (struct florence *florence, AtspiAccessible *obj); --#else --void flo_check_show (struct florence *florence, Accessible *obj); --#endif -- - /* Called on destroy event (systray quit or close window) */ - void flo_destroy (void) - { -@@ -61,6 +55,12 @@ void flo_destroy (void) - } - - #ifdef AT_SPI -+#ifdef ENABLE_AT_SPI2 -+void flo_check_show (struct florence *florence, AtspiAccessible *obj); -+#else -+void flo_check_show (struct florence *florence, Accessible *obj); -+#endif -+ - /* Called to destroy the icon */ - void flo_icon_destroy (GtkWidget *widget, gpointer user_data) - { diff --git a/recipes-support/florence/files/fix_garbled_titlebar.patch b/recipes-support/florence/files/fix_garbled_titlebar.patch deleted file mode 100644 index 097f7ef..0000000 --- a/recipes-support/florence/files/fix_garbled_titlebar.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- florence-0.5.1/src/view.c~ 2011-08-20 16:23:52.000000000 +0200 -+++ florence-0.5.1/src/view.c 2013-04-02 13:06:58.769584033 +0200 -@@ -441,8 +441,8 @@ - } else { - flo_info(_("Your screen does not support alpha channel. Semi-transparency is disabled")); - if (view) view->composite=FALSE; -- colormap=gdk_screen_get_rgb_colormap(screen); - } -+ colormap=gdk_colormap_get_system(); - gtk_widget_set_colormap(widget, colormap); - } - diff --git a/recipes-support/florence/florence3/0001-make-sound-a-configure-option.patch b/recipes-support/florence/florence3/0001-make-sound-a-configure-option.patch deleted file mode 100644 index f2c0164..0000000 --- a/recipes-support/florence/florence3/0001-make-sound-a-configure-option.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 3a252ca6f0a5afb04f3874267bfc0a569446bca8 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Thu, 23 Jun 2016 20:12:25 +0200 -Subject: [PATCH] make sound a configure option - -add a --without-sound switch which builds without soundeffect and -drops the dependency on gstreamer - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - configure.ac | 9 ++++++++- - src/Makefile.am | 5 +++-- - src/main.c | 4 ++++ - src/style.c | 15 ++++++++++++++- - 4 files changed, 29 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 971f3df..b12244a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -12,6 +12,8 @@ AC_ARG_WITH([xtst], AS_HELP_STRING([--without-xtst], [Build without Xtst extensi - AM_CONDITIONAL([WITH_XTST], [test "x$with_xtst" != "xno"]) - AC_ARG_WITH([xrecord], AS_HELP_STRING([--without-xrecord], [Build without XRecord extension (requires the Xtst extension) (default: enabled)])) - AM_CONDITIONAL([WITH_XRECORD], [test "x$with_xrecord" != "xno" -a "x$with_xtst" != "xno"]) -+AC_ARG_WITH([sound], AS_HELP_STRING([--without-sound], [Build without sound extension (default: enabled)])) -+AM_CONDITIONAL([WITH_SOUND], [test "x$with_sound" != "xno"]) - AC_ARG_WITH([at-spi], AS_HELP_STRING([--without-at-spi], [Build without at-spi(default: enabled)])) - AM_CONDITIONAL([WITH_AT_SPI], [test "x$with_at_spi" != "xno"]) - AC_ARG_WITH([panelapplet], AS_HELP_STRING([--without-panelapplet], [Build without libpanelapplet(default: enabled)])) -@@ -61,7 +63,7 @@ if test "x$with_docs" != "xno"; then - fi - - # Checks for libraries. --DEP_MODULES="xext gmodule-2.0 cairo librsvg-2.0 libxml-2.0 gstreamer-1.0" -+DEP_MODULES="xext gmodule-2.0 cairo librsvg-2.0 libxml-2.0" - PKG_CHECK_MODULES(DEPS, $DEP_MODULES) - - PKG_CHECK_MODULES([GTK3], [gtk+-3.0], AC_DEFINE([ENABLE_GTK3], [], [GTK3 enabled.]), -@@ -86,6 +88,9 @@ if test "x$with_xtst" != "xno"; then - AC_DEFINE(ENABLE_XRECORD, ["xrecord"], [xrecord extension is enabled]) - fi - fi -+if test "x$with_sound" != "xno"; then -+ PKG_CHECK_MODULES([SOUND], gstreamer-1.0, AC_DEFINE([ENABLE_SOUND], [], [Sound enabled.]), AC_MSG_ERROR(Could not configure gstreamer 1.0. Please either install gstreamer 1.0 or disable sound: --without-sound configure option)) -+fi - if test "x$with_at_spi" != "xno"; then - PKG_CHECK_MODULES([AT_SPI2], [atspi-2], AC_DEFINE([ENABLE_AT_SPI2], [], [dbus at-spi enabled.]), - AC_MSG_ERROR(Could not configure at-spi. Please either install at-spi or disable it: --without-at-spi configure option)) -@@ -103,6 +108,8 @@ AC_SUBST(LIBNOTIFY_CFLAGS) - AC_SUBST(LIBNOTIFY_LIBS) - AC_SUBST(XTST_CFLAGS) - AC_SUBST(XTST_LIBS) -+AC_SUBST(SOUND_CFLAGS) -+AC_SUBST(SOUND_LIBS) - AC_SUBST(AT_SPI2_CFLAGS) - AC_SUBST(AT_SPI2_LIBS) - AC_SUBST(LIBGNOME_CFLAGS) -diff --git a/src/Makefile.am b/src/Makefile.am -index 9d38512..9d5a417 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -14,9 +14,10 @@ endif - florence_CPPFLAGS = -I$(top_srcdir) -DICONDIR="\"$(ICONDIR)\""\ - -DFLORENCELOCALEDIR=\""$(florencelocaledir)"\"\ - -DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS) $(GTK3_CFLAGS)\ -- $(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(AT_SPI2_CFLAGS) $(INCLUDES) -+ $(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(SOUND_CFLAGS)\ -+ $(AT_SPI2_CFLAGS) $(INCLUDES) - florence_LDADD = $(DEPS_LIBS) $(LIBM) $(X11_LIBS) $(LIBGNOME_LIBS) $(LIBNOTIFY_LIBS)\ -- $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) -lflorence-1.0 -+ $(XTST_LIBS) $(SOUND_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) -lflorence-1.0 - - libflorence_1_0_la_SOURCES = lib/florence.c - library_includedir=$(includedir)/florence-1.0 -diff --git a/src/main.c b/src/main.c -index c5def08..8fe5514 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -23,7 +23,9 @@ - #include <sys/types.h> - #include <getopt.h> - #include <gtk/gtk.h> -+#ifdef ENABLE_SOUND - #include <gst/gst.h> -+#endif - #include "system.h" - #include "trace.h" - #include "settings.h" -@@ -128,7 +130,9 @@ int main (int argc, char **argv) - close(pipefd[0]); - gtk_init(&argc, &argv); - settings_init(FALSE, config_file); -+#ifdef ENABLE_SOUND - gst_init(&argc, &argv); -+#endif - - if (signal(SIGINT, sig_handler)==SIG_ERR) - flo_error(_("Failed to register SIGINT signal handler.")); -diff --git a/src/style.c b/src/style.c -index e7f58c5..673d348 100644 ---- a/src/style.c -+++ b/src/style.c -@@ -26,8 +26,10 @@ - #include <libxml/parser.h> - #include <libxml/tree.h> - #include <libxml/xmlsave.h> --#include <gst/gst.h> - #include "system.h" -+#ifdef ENABLE_SOUND -+#include <gst/gst.h> -+#endif - #include "trace.h" - #include "key.h" - #include "style.h" -@@ -546,6 +548,7 @@ GdkPixbuf *style_pixbuf_draw(struct style *style) - } - - /* Liberate the pipeline */ -+#ifdef ENABLE_SOUND - void style_sound_pipeline_free(GstElement *pipeline) - { - START_FUNC -@@ -660,6 +663,14 @@ void style_sound_play(struct style *style, const gchar *match, enum style_sound_ - } - END_FUNC - } -+#else -+void style_sound_free(gpointer data, gpointer userdata) -+{ -+} -+void style_sound_play(struct style *style, const gchar *match, enum style_sound_type type) -+{ -+} -+#endif - - /* create a new style from the layout file */ - struct style *style_new(gchar *base_uri) -@@ -696,6 +707,7 @@ struct style *style_new(gchar *base_uri) - } - } - -+#ifdef ENABLE_SOUND - layoutreader_reset(layout); - layoutreader_element_open(layout, "style"); - if (layoutreader_element_open(layout, "sounds")) { -@@ -704,6 +716,7 @@ struct style *style_new(gchar *base_uri) - layoutreader_sound_free(sound); - } - } -+#endif - - layoutreader_free(layout); - if (!base_uri) g_free(uri); --- -2.6.6 - diff --git a/recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch b/recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch deleted file mode 100644 index 12f5c99..0000000 --- a/recipes-support/florence/florence3/0001-src-Makefile.am-add-missing-dependency.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 77755186ad2fb61e8bc0bc68684e3bd631084906 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 15 Feb 2017 00:40:27 +0100 -Subject: [PATCH] src/Makefile.am: add missing dependency - -Fix race condition in which libflorence is not yet ready when florence -is linked. - -Upstream-Status: Pending - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - src/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9d5a417..d1cd944 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,6 +11,7 @@ if WITH_RAMBLE - florence_SOURCES += ramble.c - endif - -+florence_DEPENDENCIES = ${lib_LTLIBRARIES} - florence_CPPFLAGS = -I$(top_srcdir) -DICONDIR="\"$(ICONDIR)\""\ - -DFLORENCELOCALEDIR=\""$(florencelocaledir)"\"\ - -DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS) $(GTK3_CFLAGS)\ --- -2.6.6 - diff --git a/recipes-support/florence/florence3_0.6.3.bb b/recipes-support/florence/florence3_0.6.3.bb deleted file mode 100644 index b37fd30..0000000 --- a/recipes-support/florence/florence3_0.6.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen." -HOMEPAGE = "http://florence.sourceforge.net/english.html" - -#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PR = "r1" - -DEPENDS = "cairo gconf glib-2.0-native gnome-doc-utils gstreamer1.0 gtk+3 intltool-native libglade libnotify librsvg libxml2 libxtst" - -PROVIDES += "florence" - -RPROVIDES:${PN} += "florence" -RREPLACES:${PN} += "florence" -RCONFLICTS:${PN} += "florence" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2 \ - file://0001-src-Makefile.am-add-missing-dependency.patch \ -" -SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0" -SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e" -S = "${WORKDIR}/florence-${PV}" -inherit gettext autotools gconf pkgconfig gsettings - -FILES:${PN} += "${datadir}/florence" - -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord --without-sound" diff --git a/recipes-support/florence/florence3_0.6.3.bbappend b/recipes-support/florence/florence3_0.6.3.bbappend deleted file mode 100644 index ddddf4b..0000000 --- a/recipes-support/florence/florence3_0.6.3.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/florence3:" -SRC_URI += "file://0001-make-sound-a-configure-option.patch" -EXTRA_OECONF += " --without-sound" diff --git a/recipes-support/florence/florence_0.5.4.bb b/recipes-support/florence/florence_0.5.4.bb deleted file mode 100644 index 486bb9c..0000000 --- a/recipes-support/florence/florence_0.5.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen." -HOMEPAGE = "http://florence.sourceforge.net/english.html" - -#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once. - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PR = "r1" - -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \ - file://fix-no-atspi-compile.patch \ - file://fix_garbled_titlebar.patch \ -" -SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7" -SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1" - -inherit gettext autotools gconf pkgconfig - -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord" diff --git a/recipes-support/florence/florence_0.5.4.bbappend b/recipes-support/florence/florence_0.5.4.bbappend deleted file mode 100644 index a2c751d..0000000 --- a/recipes-support/florence/florence_0.5.4.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI += "file://0001-make-sound-a-configure-option.patch" -EXTRA_OECONF += " --without-sound" diff --git a/recipes-support/gpio-tool/files/apalis-imx6/gpio-tool b/recipes-support/gpio-tool/files/apalis-imx6/gpio-tool Binary files differdeleted file mode 100755 index 7011019..0000000 --- a/recipes-support/gpio-tool/files/apalis-imx6/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/colibri-imx6/gpio-tool b/recipes-support/gpio-tool/files/colibri-imx6/gpio-tool Binary files differdeleted file mode 100755 index f80347f..0000000 --- a/recipes-support/gpio-tool/files/colibri-imx6/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/colibri-imx6ull/gpio-tool b/recipes-support/gpio-tool/files/colibri-imx6ull/gpio-tool Binary files differdeleted file mode 100755 index 77d4fa6..0000000 --- a/recipes-support/gpio-tool/files/colibri-imx6ull/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/colibri-imx7-emmc/gpio-tool b/recipes-support/gpio-tool/files/colibri-imx7-emmc/gpio-tool deleted file mode 120000 index 7616811..0000000 --- a/recipes-support/gpio-tool/files/colibri-imx7-emmc/gpio-tool +++ /dev/null @@ -1 +0,0 @@ -../colibri-imx7/gpio-tool
\ No newline at end of file diff --git a/recipes-support/gpio-tool/files/colibri-imx7/gpio-tool b/recipes-support/gpio-tool/files/colibri-imx7/gpio-tool Binary files differdeleted file mode 100755 index 318137f..0000000 --- a/recipes-support/gpio-tool/files/colibri-imx7/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/gpio-tool b/recipes-support/gpio-tool/files/gpio-tool Binary files differdeleted file mode 100755 index 85a2fe8..0000000 --- a/recipes-support/gpio-tool/files/gpio-tool +++ /dev/null diff --git a/recipes-support/gpio-tool/files/gpio-tool.desktop b/recipes-support/gpio-tool/files/gpio-tool.desktop deleted file mode 100644 index a862332..0000000 --- a/recipes-support/gpio-tool/files/gpio-tool.desktop +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env xdg-open - -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Icon[C]=gpio-tool.png -Exec=/usr/bin/gpio-tool -Name[C]=GPIO Tool -Name=GPIO Tool -Icon=gpio-tool.png diff --git a/recipes-support/gpio-tool/files/gpio-tool.png b/recipes-support/gpio-tool/files/gpio-tool.png Binary files differdeleted file mode 100644 index 2227e81..0000000 --- a/recipes-support/gpio-tool/files/gpio-tool.png +++ /dev/null diff --git a/recipes-support/gpio-tool/gpio-tool.bb b/recipes-support/gpio-tool/gpio-tool.bb deleted file mode 100644 index 52d2477..0000000 --- a/recipes-support/gpio-tool/gpio-tool.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "GPIOConfig tool for Toradex Modules" -SECTION = "base" -LICENSE = "CLOSED" -PR = "r3" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEPENDS = "glib-2.0 gtk+" - -SRC_URI = " \ - file://gpio-tool \ - file://gpio-tool.desktop \ - file://gpio-tool.png \ -" - -inherit bin_package - -#no gnu_hash in binaries, skip QA dev-so for this package -#we have symlinks ending in .so, skip QA ldflags for this package -#inhibit warnings about files being stripped -INSANE_SKIP:${PN} = "ldflags already-stripped" - -do_install() { - install -d ${D}/${bindir} - install -d ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -d ${D}${ROOT_HOME}/Desktop - install -m 755 ${WORKDIR}/gpio-tool ${D}/${bindir}/ - install -m 644 ${WORKDIR}/gpio-tool.desktop ${D}/${datadir}/applications/ - install -m 644 ${WORKDIR}/gpio-tool.png ${D}/${datadir}/pixmaps/ - ln -s ${datadir}/applications/gpio-tool.desktop ${D}${ROOT_HOME}/Desktop/ -} diff --git a/recipes-support/joe/joe_4.6.bb b/recipes-support/joe/joe_4.6.bb deleted file mode 100644 index ed0bf33..0000000 --- a/recipes-support/joe/joe_4.6.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "console/utils" -SUMMARY = "Console text editor with good functionality, good choice for vi-haters" -HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" - -PACKAGECONFIG ??= "curses" -PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" - -inherit autotools-brokensep mime-xdg - -SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43" -SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" |
