summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README70
-rw-r--r--classes/sdcard_image-rpi.bbclass20
-rw-r--r--conf/machine/include/rpi-default-providers.inc3
-rw-r--r--conf/machine/raspberrypi.conf2
-rw-r--r--recipes-bcm/bcm2835/bcm2835_1.32.bb (renamed from recipes-bcm/bcm2835/bcm2835_1.9.bb)7
-rw-r--r--recipes-bcm/common/firmware.inc4
-rw-r--r--recipes-graphics/userland/userland_git.bb4
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_3.10.18.bb6
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_3.11.7.bb (renamed from recipes-kernel/linux/linux-raspberrypi_3.11.0.bb)2
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_3.12.0.bb6
-rw-r--r--recipes-kernel/linux/linux-raspberrypi_3.6.11.bb2
-rw-r--r--recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch49
-rw-r--r--recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch27
-rw-r--r--recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch20
-rw-r--r--recipes-multimedia/omxplayer/omxplayer_git.bb16
15 files changed, 153 insertions, 85 deletions
diff --git a/README b/README
index db88066..c1321a3 100644
--- a/README
+++ b/README
@@ -36,7 +36,12 @@ Contents:
36 2.E. Set overclocking options 36 2.E. Set overclocking options
373. Extra apps 373. Extra apps
38 3.A. omxplayer 38 3.A. omxplayer
394. Contribution 394. Source code and mirrors
405. Contribution
41 5.A. Mailing List
42 5.B. Gerrit Review Server
43 5.C. Trello Board
446. Maintainers
40 45
41 46
42 47
@@ -109,9 +114,11 @@ How to use it:
1092.A. Optional - compressed deployed files: 1142.A. Optional - compressed deployed files:
110========================================== 115==========================================
1111. Overwrite IMAGE_FSTYPES in local.conf 1161. Overwrite IMAGE_FSTYPES in local.conf
112 IMAGE_FSTYPES = "tar.bz2 ext3.xz rpi-sdimg.xz 117 IMAGE_FSTYPES = "tar.bz2 ext3.xz"
1132. Overwrite SDIMG_ROOTFS_TYPE in local.conf 1182. Overwrite SDIMG_ROOTFS_TYPE in local.conf
114 SDIMG_ROOTFS_TYPE = "ext3.xz" 119 SDIMG_ROOTFS_TYPE = "ext3.xz"
1203. Overwrite SDIMG_COMPRESSION in local.conf
121 SDIMG_COMPRESSION = "xz"
115*Accommodate the values above to your own needs (ex: ext3 / ext4). 122*Accommodate the values above to your own needs (ex: ext3 / ext4).
116 123
1172.B. Optional - GPU memory: 1242.B. Optional - GPU memory:
@@ -163,27 +170,64 @@ adding to you local.conf:
163LICENSE_FLAGS_WHITELIST = "commercial" 170LICENSE_FLAGS_WHITELIST = "commercial"
164 171
165 172
1664. Contributing 1734. Source code and mirrors
174==========================
175
176Main repo:
177 git://git.yoctoproject.org/meta-raspberrypi
178 http://git.yoctoproject.org/git/meta-raspberrypi
179
180Github mirror:
181 https://github.com/djwillis/meta-raspberrypi
182
183Gerrit review repo:
184 https://review.gherzan.ro:8443/meta-raspberrypi
185
186
1875. Contributing
167=============== 188===============
168 189
1905.A. Mailing list
191=================
169To contribute to this layer you should send the patches for review to the 192To contribute to this layer you should send the patches for review to the
170mailing list. 193mailing list.
171 194
172Mailing list: 195Mailing list:
173
174 https://lists.yoctoproject.org/listinfo/yocto 196 https://lists.yoctoproject.org/listinfo/yocto
175 197
176Source code: 198To send changes to mailing list use something like:
199 git send-email --to yocto@yoctoproject.org \
200 --subject-prefix='meta-raspberrypi][PATCH'
177 201
178 git://git.yoctoproject.org/meta-raspberrypi 202OPTIONALLY push changes to gerrit (help maintainers merge and review patches
179 http://git.yoctoproject.org/git/meta-raspberrypi 203easier in this way).
180 https://github.com/djwillis/meta-raspberrypi 204 git push ssh://<username>@review.gherzan.ro:29418/meta-raspberrypi
205 <local-branch>:refs/for/master
206 See 5.B. Gerrit Review Server.
181 207
182When sending patches, please use something like: 2085.B. Gerrit Review Server
209=========================
210We have a gerrit server configured at review.gherzan.ro. Changes made in gerrit
211are merged in git.yoctoproject.org/meta-raspberrypi.
183 212
184git send-email --to yocto@yoctoproject.org \ 213You can setup a gerrit account in less than 2 minutes:
185--subject-prefix='meta-raspberrypi][PATCH' 214A) Login / Register on https://review.gherzan.ro:8443.
215B) Add your PUBLIC key in Settings/SSH Public Keys.
216C) Add remote in your local repo:
217 git remote add gherzan ssh://<username>@review.gherzan.ro:29418/meta-raspberrypi
218D) Push changes to gerrit using:
219 git push gherzan <local-branch>:refs/for/master
186 220
221Please check your spam folder for gerrit messages. Sometimes they end up there.
222
2235.C. Trello Board
224=================
225A public Trello board is set to manage tasks and bugs. Join us there:
226 https://trello.com/b/QsYeVjVe/meta-raspberrypi
227
228
2296. Maintainers
230==============
187 231
188Layer maintainers: John Willis <John.Willis at distant-earth.com> 232 John Willis <John.Willis at distant-earth.com>
189 Andrei Gherzan <andrei at gherzan.ro> 233 Andrei Gherzan <andrei at gherzan.ro>
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index a2fcd52..3ee4e94 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -50,6 +50,13 @@ IMAGE_DEPENDS_rpi-sdimg = " \
50# SD card image name 50# SD card image name
51SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg" 51SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg"
52 52
53# Compression method to apply to SDIMG after it has been created. Supported
54# compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
55# is kept and a new compressed file is created if one of these compression
56# formats is chosen. If SDIMG_COMPRESSION is set to any other value it is
57# silently ignored.
58#SDIMG_COMPRESSION ?= ""
59
53# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. 60# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
54FATPAYLOAD ?= "" 61FATPAYLOAD ?= ""
55 62
@@ -107,6 +114,19 @@ IMAGE_CMD_rpi-sdimg () {
107 else 114 else
108 dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync 115 dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
109 fi 116 fi
117
118 # Optionally apply compression
119 case "${SDIMG_COMPRESSION}" in
120 "gzip")
121 gzip -k9 "${SDIMG}"
122 ;;
123 "bzip2")
124 bzip2 -k9 "${SDIMG}"
125 ;;
126 "xz")
127 xz -k "${SDIMG}"
128 ;;
129 esac
110} 130}
111 131
112ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " 132ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "
diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index 1a647c9..f86aab4 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -2,8 +2,9 @@
2 2
3PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi" 3PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi"
4# The default kernel version is the same as used by Raspbian 4# The default kernel version is the same as used by Raspbian
5PREFERRED_VERSION_linux-raspberrypi ?= "3.6.%" 5PREFERRED_VERSION_linux-raspberrypi ?= "3.10.%"
6 6
7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
8PREFERRED_PROVIDER_virtual/egl ?= "userland" 8PREFERRED_PROVIDER_virtual/egl ?= "userland"
9PREFERRED_PROVIDER_virtual/libgles2 ?= "userland" 9PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
10PREFERRED_PROVIDER_jpeg = "jpeg"
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index e25b59a..1e619a7 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -24,7 +24,7 @@ XSERVER = " \
24 24
25KERNEL_IMAGETYPE = "Image" 25KERNEL_IMAGETYPE = "Image"
26 26
27MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" 27MACHINE_FEATURES = "kernel26 apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
28 28
29#RaspberryPi has no hardware clock 29#RaspberryPi has no hardware clock
30MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" 30MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
diff --git a/recipes-bcm/bcm2835/bcm2835_1.9.bb b/recipes-bcm/bcm2835/bcm2835_1.32.bb
index d6858f4..2dc5b22 100644
--- a/recipes-bcm/bcm2835/bcm2835_1.9.bb
+++ b/recipes-bcm/bcm2835/bcm2835_1.32.bb
@@ -8,14 +8,13 @@ AUTHOR = "Mike McCauley (mikem@open.com.au)"
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
10 10
11PR = "r0"
12 11
13COMPATIBLE_MACHINE = "raspberrypi" 12COMPATIBLE_MACHINE = "raspberrypi"
14 13
15SRC_URI = "http://www.open.com.au/mikem/bcm2835/bcm2835-1.9.tar.gz" 14SRC_URI = "http://www.open.com.au/mikem/bcm2835/bcm2835-${PV}.tar.gz"
16 15
17SRC_URI[md5sum] = "c102938afe9f0cfa930a0255c422f792" 16SRC_URI[md5sum] = "085239569554de5ee6649fe8bb123379"
18SRC_URI[sha256sum] = "0dc6ee5a261e76b103a04534c1b8ebc20dce8921dec2452785100812f978c883" 17SRC_URI[sha256sum] = "97e8aece4ff45b1779212473aa3b1d3f43cc9a8427afa3be718f690949e0ec20"
19 18
20 19
21PACKAGES += "${PN}-tests" 20PACKAGES += "${PN}-tests"
diff --git a/recipes-bcm/common/firmware.inc b/recipes-bcm/common/firmware.inc
index 5bad182..c780e63 100644
--- a/recipes-bcm/common/firmware.inc
+++ b/recipes-bcm/common/firmware.inc
@@ -1,6 +1,6 @@
1# 19/08/2013 firmware; this can be overridden from distro config 1# 19/08/2013 firmware; this can be overridden from distro config
2RPIFW_SRCREV ?= "5b37b2a7f357236210eef1a438becaa2a57148f2" 2RPIFW_SRCREV ?= "3e92add424c3c2617d5df65caa307c808017a9ea"
3RPIFW_DATE ?= "20130819" 3RPIFW_DATE ?= "20131113"
4RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master" 4RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
5RPIFW_S ?= "${WORKDIR}/git" 5RPIFW_S ?= "${WORKDIR}/git"
6 6
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index c7ea522..18c74fa 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -5,13 +5,13 @@ vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG."
5LICENSE = "Broadcom" 5LICENSE = "Broadcom"
6LIC_FILES_CHKSUM = "file://LICENCE;md5=957f6640d5e2d2acfce73a36a56cb32f" 6LIC_FILES_CHKSUM = "file://LICENCE;md5=957f6640d5e2d2acfce73a36a56cb32f"
7 7
8PR = "r2" 8PR = "r3"
9 9
10PROVIDES = "virtual/libgles2 \ 10PROVIDES = "virtual/libgles2 \
11 virtual/egl" 11 virtual/egl"
12COMPATIBLE_MACHINE = "raspberrypi" 12COMPATIBLE_MACHINE = "raspberrypi"
13 13
14SRCREV = "23baee63495aa685e7693467b7a5469ff5ca4481" 14SRCREV = "628498eb6cf501554c98a5e6c7ea3855574fa43e"
15SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \ 15SRC_URI = "git://github.com/raspberrypi/userland.git;protocol=git;branch=master \
16 " 16 "
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.10.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.10.18.bb
new file mode 100644
index 0000000..83bf253
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.10.18.bb
@@ -0,0 +1,6 @@
1SRCREV = "b49aafd02fa7572d387acd34550beea5b4c3d239"
2SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.10.y \
3 file://sl030raspberrypii2ckernel.patch \
4 "
5
6require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb b/recipes-kernel/linux/linux-raspberrypi_3.11.7.bb
index 1ae39b2..68c890c 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.11.0.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.11.7.bb
@@ -1,4 +1,4 @@
1SRCREV = "d7474694bdc9836af17f4b4d839509f9aad7ffa7" 1SRCREV = "b975d0aab6816dd1dc4ff938a0c95bc551831163"
2SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \ 2SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.11.y \
3 file://sl030raspberrypii2ckernel.patch \ 3 file://sl030raspberrypii2ckernel.patch \
4 " 4 "
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.12.0.bb b/recipes-kernel/linux/linux-raspberrypi_3.12.0.bb
new file mode 100644
index 0000000..3631da5
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_3.12.0.bb
@@ -0,0 +1,6 @@
1SRCREV = "839f349b6ed2a63a2bff0b5f0d718a7b07ca2316"
2SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.12.y \
3 file://sl030raspberrypii2ckernel.patch \
4 "
5
6require linux-raspberrypi.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
index 5314f5d..ba2c704 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.6.11.bb
@@ -1,4 +1,4 @@
1SRCREV = "cbd6672e7e1b2dc5026f5dc7929a13a9a68f2a62" 1SRCREV = "10bc58289a7ebf6b1ab724636e0a16116278e339"
2SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \ 2SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.6.y \
3 file://sl030raspberrypii2ckernel.patch \ 3 file://sl030raspberrypii2ckernel.patch \
4 " 4 "
diff --git a/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch b/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch
index b68e351..151c33c 100644
--- a/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch
@@ -8,40 +8,34 @@ variables provided by build system.
8 8
9Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 10Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
11--- 11
12 Makefile | 2 -- 12Updated patch to apply to c0dd9502ed2c43c487674939195c69680f3d98b0 revision
13 Makefile.ffmpeg | 2 --
14 Makefile.include | 38 --------------------------------------
15 3 files changed, 42 deletions(-)
16 delete mode 100644 Makefile.include
17 13
18diff --git a/Makefile b/Makefile 14diff --git a/Makefile b/Makefile
19index 519048a..1faa779 100644 15index f348465..65f7637 100644
20--- a/Makefile 16--- a/Makefile
21+++ b/Makefile 17+++ b/Makefile
22@@ -1,5 +1,3 @@ 18@@ -1,4 +1,3 @@
23-include Makefile.include 19-include Makefile.include
24-
25 CFLAGS+=-std=c++0x -DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
26 20
27 LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/ 21 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
22
28diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg 23diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
29index 6ec94af..4297b1f 100644 24index 083e214..3b31a82 100644
30--- a/Makefile.ffmpeg 25--- a/Makefile.ffmpeg
31+++ b/Makefile.ffmpeg 26+++ b/Makefile.ffmpeg
32@@ -1,5 +1,3 @@ 27@@ -1,4 +1,3 @@
33-include Makefile.include 28-include Makefile.include
34-
35 CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT
36 29
37 WORK=$(PWD) 30 CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT
31
38diff --git a/Makefile.include b/Makefile.include 32diff --git a/Makefile.include b/Makefile.include
39deleted file mode 100644 33deleted file mode 100644
40index 501fd4f..0000000 34index 58e9560..0000000
41--- a/Makefile.include 35--- a/Makefile.include
42+++ /dev/null 36+++ /dev/null
43@@ -1,38 +0,0 @@ 37@@ -1,40 +0,0 @@
44-USE_BUILDROOT=1 38-USE_BUILDROOT=0
45-FLOAT=hard 39-FLOAT=hard
46- 40-
47-ifeq ($(USE_BUILDROOT), 1) 41-ifeq ($(USE_BUILDROOT), 1)
@@ -55,9 +49,10 @@ index 501fd4f..0000000
55-BUILDROOT :=/opt/bcm-rootfs 49-BUILDROOT :=/opt/bcm-rootfs
56-SDKSTAGE :=/opt/bcm-rootfs 50-SDKSTAGE :=/opt/bcm-rootfs
57-TARGETFS :=/opt/bcm-rootfs 51-TARGETFS :=/opt/bcm-rootfs
58-TOOLCHAIN :=/usr/local/bcm-gcc 52-TOOLCHAIN :=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/
59-HOST :=bcm2708 53-HOST :=arm-linux-gnueabihf
60-SYSROOT :=$(TOOLCHAIN)/arm-bcm2708-linux-gnueabi/sys-root 54-#SYSROOT :=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot
55-SYSROOT :=/opt/bcm-rootfs
61-endif 56-endif
62- 57-
63-JOBS=7 58-JOBS=7
@@ -76,9 +71,7 @@ index 501fd4f..0000000
76-CXXCP := $(CXX) -E 71-CXXCP := $(CXX) -E
77-PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) 72-PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
78- 73-
79-CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -O3 -mstructure-size-boundary=32 -mno-sched-prolog 74-CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
80-LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ 75-LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
81-INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 76-#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
82-- 77-INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
831.7.9.5
84
diff --git a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
index 00a1f29..4976995 100644
--- a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
@@ -7,26 +7,26 @@ Don't search for libraries and headers in /usr/local.
7 7
8Upstream-Status: Inappropriate [embedded specific] 8Upstream-Status: Inappropriate [embedded specific]
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10--- 10
11 Makefile | 6 +++--- 11Updated patch to apply to c0dd9502ed2c43c487674939195c69680f3d98b0 revision
12 Makefile.ffmpeg | 2 +-
13 2 files changed, 4 insertions(+), 4 deletions(-)
14 12
15diff --git a/Makefile b/Makefile 13diff --git a/Makefile b/Makefile
16index 1faa779..7b639f1 100644 14index 65f7637..5dc1832 100644
17--- a/Makefile 15--- a/Makefile
18+++ b/Makefile 16+++ b/Makefile
19@@ -1,7 +1,7 @@ 17@@ -1,9 +1,9 @@
20 CFLAGS+=-std=c++0x -DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST 18
19 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
20
21-LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
22+LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/lib/
21 23
22-LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
23-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ 24-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
24+LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/lib/
25+INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ 25+INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/
26 26
27 DIST ?= omxplayer-dist 27 DIST ?= omxplayer-dist
28 28
29@@ -66,5 +66,5 @@ dist: omxplayer.bin 29@@ -70,5 +70,5 @@ dist: omxplayer.bin
30 cp omxplayer omxplayer.bin $(DIST)/usr/bin 30 cp omxplayer omxplayer.bin $(DIST)/usr/bin
31 cp COPYING $(DIST)/usr/share/doc/ 31 cp COPYING $(DIST)/usr/share/doc/
32 cp README.md $(DIST)/usr/share/doc/README 32 cp README.md $(DIST)/usr/share/doc/README
@@ -34,16 +34,13 @@ index 1faa779..7b639f1 100644
34+ cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ 34+ cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
35 tar -czf omxplayer-dist.tar.gz $(DIST) 35 tar -czf omxplayer-dist.tar.gz $(DIST)
36diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg 36diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
37index 6ec94af..13e6c09 100644 37index 3b31a82..5f30b51 100644
38--- a/Makefile.ffmpeg 38--- a/Makefile.ffmpeg
39+++ b/Makefile.ffmpeg 39+++ b/Makefile.ffmpeg
40@@ -64,5 +64,5 @@ checkout: 40@@ -248,5 +248,5 @@ checkout:
41 41
42 install: 42 install:
43 cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install 43 cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install
44- $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so 44- $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so
45+ $(HOST)-strip ffmpeg_compiled/usr/lib/*.so 45+ $(HOST)-strip ffmpeg_compiled/usr/lib/*.so
46 46
47--
481.7.9.5
49
diff --git a/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch b/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch
index df15763..d1d3d8f 100644
--- a/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch
@@ -10,30 +10,26 @@ omxplayer was already stripped, this will prevent future debugging!
10 10
11Upstream-Status: Inappropriate [embedded specific] 11Upstream-Status: Inappropriate [embedded specific]
12Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 12Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
13--- 13
14 Makefile.ffmpeg | 4 ++-- 14Updated patch to apply to 0dd9502ed2c43c487674939195c69680f3d98b0 revision
15 1 file changed, 2 insertions(+), 2 deletions(-)
16 15
17diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg 16diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
18index 13e6c09..51c9514 100644 17index 5f30b51..e023927 100644
19--- a/Makefile.ffmpeg 18--- a/Makefile.ffmpeg
20+++ b/Makefile.ffmpeg 19+++ b/Makefile.ffmpeg
21@@ -53,7 +53,8 @@ configure: 20@@ -237,7 +237,8 @@ configure:
22 --enable-hardcoded-tables \ 21 --disable-decoder=bintext \
23 --disable-runtime-cpudetect \ 22 --disable-decoder=xbin \
24 --disable-debug \ 23 --disable-decoder=idf \
25- --cross-prefix=$(HOST)- 24- --cross-prefix=$(HOST)-
26+ --cross-prefix=$(HOST)- \ 25+ --cross-prefix=$(HOST)- \
27+ --disable-stripping 26+ --disable-stripping
28 27
29 clean: 28 clean:
30 @rm -rf ffmpeg 29 @rm -rf ffmpeg
31@@ -64,5 +65,4 @@ checkout: 30@@ -248,5 +249,4 @@ checkout:
32 31
33 install: 32 install:
34 cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install 33 cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install
35- $(HOST)-strip ffmpeg_compiled/usr/lib/*.so 34- $(HOST)-strip ffmpeg_compiled/usr/lib/*.so
36 35
37--
381.7.9.5
39
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
index a456026..c77f858 100644
--- a/recipes-multimedia/omxplayer/omxplayer_git.bb
+++ b/recipes-multimedia/omxplayer/omxplayer_git.bb
@@ -1,16 +1,17 @@
1DESCRIPTION = "OMXPlayer is a commandline OMX player for the Raspberry Pi" 1DESCRIPTION = "OMXPlayer is a commandline OMX player for the Raspberry Pi"
2HOMEPAGE = "https://github.com/huceke/omxplayer" 2HOMEPAGE = "https://github.com/popcornmix/omxplayer"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5 5
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8DEPENDS = "libpcre libav virtual/egl boost freetype" 8DEPENDS = "libpcre libav virtual/egl boost freetype dbus"
9 9
10PR = "r1" 10PR = "r1"
11 11
12SRCREV = "dae98a8bba9dc7410b0621134f6ebdb406adb1bd" 12SRCREV = "c0dd9502ed2c43c487674939195c69680f3d98b0"
13SRC_URI = "git://github.com/huceke/omxplayer.git;protocol=git;branch=master \ 13
14SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
14 file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ 15 file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
15 file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ 16 file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
16 file://0003-Remove-strip-step-in-Makefile.patch" 17 file://0003-Remove-strip-step-in-Makefile.patch"
@@ -37,6 +38,8 @@ export INCLUDES = "-isystem${STAGING_DIR_HOST}/usr/include \
37 -isystem${STAGING_DIR_HOST}/usr/include/interface/vcos/pthreads \ 38 -isystem${STAGING_DIR_HOST}/usr/include/interface/vcos/pthreads \
38 -isystem${STAGING_DIR_HOST}/usr/include/freetype2 \ 39 -isystem${STAGING_DIR_HOST}/usr/include/freetype2 \
39 -isystem${STAGING_DIR_HOST}/usr/include/interface/vmcs_host/linux \ 40 -isystem${STAGING_DIR_HOST}/usr/include/interface/vmcs_host/linux \
41 -isystem${STAGING_DIR_HOST}/usr/include/dbus-1.0 \
42 -isystem${STAGING_DIR_HOST}/usr/lib/dbus-1.0/include \
40 " 43 "
41 44
42# Install in ${D} 45# Install in ${D}
@@ -52,9 +55,12 @@ do_compile() {
52 55
53do_install() { 56do_install() {
54 oe_runmake dist 57 oe_runmake dist
58 mkdir -p ${D}/usr/share/fonts/truetype/freefont/
59 install ${S}/fonts/* ${D}/usr/share/fonts/truetype/freefont/
55} 60}
56 61
57FILES_${PN} = "${bindir}/omxplayer* \ 62FILES_${PN} = "${bindir}/omxplayer* \
58 ${libdir}/omxplayer/lib*${SOLIBS}" 63 ${libdir}/omxplayer/lib*${SOLIBS} \
64 /usr/share/fonts"
59 65
60FILES_${PN}-dev += "${libdir}/omxplayer/*.so" 66FILES_${PN}-dev += "${libdir}/omxplayer/*.so"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-03 17:58:26 +0000