[oe-commits] org.oe.dev merge of '5fce36059a59f5f0270baf7f4ddbb9cb496ea312'
mickeyl commit
oe at amethyst.openembedded.net
Mon Sep 1 17:52:28 UTC 2008
merge of '5fce36059a59f5f0270baf7f4ddbb9cb496ea312'
and 'b68ae87d8ee0969bc8a91ea0ac326fb34c5eb9a4'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 66f7e74e0e6de165fe1e68ec6ec71fbbd5641d2d
ViewMTN: http://monotone.openembedded.org/revision/info/66f7e74e0e6de165fe1e68ec6ec71fbbd5641d2d
Files:
1
packages/kexecboot/initramfs_kexecboot_1.0.bb
packages/kexecboot/initramfs-kexecboot_1.0.bb
packages/gsoap/gsoap-native
packages/nandlogical
packages/nandlogical/files
packages/gsoap/gsoap-native/use-just-built-binary.patch
packages/nandlogical/files/nandlogical.c
packages/nandlogical/nandlogical_1.0.0.bb
classes/kernel.bbclass
packages/ffmpeg/ffmpeg_git.bb
packages/glibc/glibc.inc
packages/glibc/glibc_2.6.1.bb
packages/gsoap/gsoap-native_2.7.7.bb
packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch
packages/dgen/dgen-sdl_1.23.bb
Diffs:
#
# mt diff -r5fce36059a59f5f0270baf7f4ddbb9cb496ea312 -r66f7e74e0e6de165fe1e68ec6ec71fbbd5641d2d
#
#
#
# rename "packages/kexecboot/initramfs_kexecboot_1.0.bb"
# to "packages/kexecboot/initramfs-kexecboot_1.0.bb"
#
# add_dir "packages/gsoap/gsoap-native"
#
# add_dir "packages/nandlogical"
#
# add_dir "packages/nandlogical/files"
#
# add_file "packages/gsoap/gsoap-native/use-just-built-binary.patch"
# content [3494a4c5a9654fc35b3d6f43f4b3cf74187df695]
#
# add_file "packages/nandlogical/files/nandlogical.c"
# content [3fd269d18fc80cb452eb8173dfcf8a67228ea72d]
#
# add_file "packages/nandlogical/nandlogical_1.0.0.bb"
# content [08c2eb3a4bb34c4e5c03d312718add26413df421]
#
# patch "classes/kernel.bbclass"
# from [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
# to [aaee7c587861c7c66d492ee0c8e7540f99932496]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [ef01666ee577eb22fd1c4f1eeedd7544540df46b]
# to [b95d010568a0ab37a6ab0ef5c267c9d3580ace9d]
#
# patch "packages/glibc/glibc.inc"
# from [616d34fb71075168d558a2c23652b0847b62e379]
# to [2d332284f28dce392d63f89441b2747b62db4751]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [77cf632ae1fc1464c20204d36e370aa655ffa09a]
# to [57bf7eb6dae142987a9e81c5916a9181d7ec554a]
#
# patch "packages/gsoap/gsoap-native_2.7.7.bb"
# from [e2f96667aeea0e85e754378570e59305d6476439]
# to [a137c032ea061e49419203c45e853ea4bd81b14e]
#
============================================================
--- packages/gsoap/gsoap-native/use-just-built-binary.patch 3494a4c5a9654fc35b3d6f43f4b3cf74187df695
+++ packages/gsoap/gsoap-native/use-just-built-binary.patch 3494a4c5a9654fc35b3d6f43f4b3cf74187df695
@@ -0,0 +1,19 @@
+---
+ soapcpp2/wsdl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am
++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am
+@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp
+ SOAPHEADER=wsdl.h
+ SOAP_FLAGS=-SC -pwsdl
+ BUILT_SOURCES=$(SOAP_CPP_SRC)
+
+ $(SOAP_CPP_SRC) : $(SOAPHEADER)
+- $(SOAP) $(SOAP_FLAGS) $(SOAPHEADER)
++ ../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER)
+
+ #LIBS=
+
+ bin_PROGRAMS=wsdl2h
+
============================================================
--- packages/nandlogical/files/nandlogical.c 3fd269d18fc80cb452eb8173dfcf8a67228ea72d
+++ packages/nandlogical/files/nandlogical.c 3fd269d18fc80cb452eb8173dfcf8a67228ea72d
@@ -0,0 +1,386 @@
+/*
+ NAND logical utility for Sharp Zaurus SL-C7x0/860/7500/Cxx00
+ version 1.0
+ Copyright 2006 Alexander Chukov <sash at pdaXrom.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ */
+
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <asm/types.h>
+#include <mtd/mtd-user.h>
+
+int fd;
+
+unsigned char *readbuf;
+unsigned char *oobbuf;
+unsigned long *log2phy;
+
+struct mtd_oob_buf oob = {0, 16, NULL};
+
+struct nand_oobinfo none_oobinfo = {
+ .useecc = MTD_NANDECC_OFF,
+};
+
+#define NAND_LOGICAL_SIZE (7 * 1024 * 1024)
+
+/////////////////////////////////////////////////////////////////////
+// oob structure
+/////////////////////////////////////////////////////////////////////
+
+#define NAND_NOOB_LOGADDR_00 8
+#define NAND_NOOB_LOGADDR_01 9
+#define NAND_NOOB_LOGADDR_10 10
+#define NAND_NOOB_LOGADDR_11 11
+#define NAND_NOOB_LOGADDR_20 12
+#define NAND_NOOB_LOGADDR_21 13
+
+static uint nand_get_logical_no(unsigned char *oob)
+{
+ unsigned short us,bit;
+ int par;
+ int good0, good1;
+
+ if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] &&
+ oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){
+ good0 = NAND_NOOB_LOGADDR_00;
+ good1 = NAND_NOOB_LOGADDR_01;
+ }else
+ if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] &&
+ oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){
+ good0 = NAND_NOOB_LOGADDR_10;
+ good1 = NAND_NOOB_LOGADDR_11;
+ }else
+ if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] &&
+ oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){
+ good0 = NAND_NOOB_LOGADDR_20;
+ good1 = NAND_NOOB_LOGADDR_21;
+ }else{
+ return (uint)-1;
+ }
+
+ us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) |
+ (((unsigned short)(oob[good1]) & 0x00ff) << 8);
+
+ par = 0;
+ for(bit = 0x0001; bit != 0; bit <<= 1){
+ if(us & bit){
+ par++;
+ }
+ }
+ if(par & 1){
+ return (uint)-2;
+ }
+
+ if(us == 0xffff){
+ return 0xffff;
+ }else{
+ return ((us & 0x07fe) >> 1);
+ }
+}
+
+static void nand_set_logical_no(uint log_no, unsigned char *oob)
+{
+ unsigned short us,bit;
+ int par;
+
+ us = (((log_no & 0x03ff) << 1) | 0x1000);
+
+ par = 0;
+ for(bit = 0x0001; bit != 0; bit <<= 1){
+ if(us & bit){
+ par++;
+ }
+ }
+ if(par & 1){
+ us |= 0x0001;
+ }
+
+ oob[NAND_NOOB_LOGADDR_00] = (unsigned char)((us & 0x00ff) >> 0);
+ oob[NAND_NOOB_LOGADDR_01] = (unsigned char)((us & 0xff00) >> 8);
+ oob[NAND_NOOB_LOGADDR_10] = oob[NAND_NOOB_LOGADDR_00];
+ oob[NAND_NOOB_LOGADDR_11] = oob[NAND_NOOB_LOGADDR_01];
+ oob[NAND_NOOB_LOGADDR_20] = oob[NAND_NOOB_LOGADDR_00];
+ oob[NAND_NOOB_LOGADDR_21] = oob[NAND_NOOB_LOGADDR_01];
+}
+
+void scan_logical(int blocks, int erasesize)
+{
+ int i;
+ unsigned long offset;
+ int ret = 1;
+ for (i = 0; i < blocks; i++)
+ log2phy[i] = (uint) -1;
+ offset = 0;
+ for (i = 0; i < blocks; i++) {
+ oob.start = offset;
+ ret = ioctl(fd, MEMREADOOB, &oob);
+
+ //ret = nand_read_raw(nand, oobuf, offset, nand->writesize, nand->oobsize);
+ if (!ret) {
+ int log_no = nand_get_logical_no(oobbuf);
+ if (((int)log_no >= 0) && (log_no < blocks)) {
+ log2phy[log_no] = offset;
+ //printf("NAND logical - %08X -> %04X\n", offset, log_no * erasesize);
+ } else {
+ //printf("NAND logical - %08X - skip (%x)\n", offset, log_no);
+ }
+ } else {
+ //printf("NAND logical - offset %x read OOB problem\n", offset);
+ }
+ offset += erasesize;
+ }
+}
+
+unsigned long add_logical(unsigned long ofs, int blocks, int erasesize, int bs)
+{
+ erase_info_t erase;
+ unsigned long offset = 0;
+ int i;
+ int ret;
+
+ erase.length = erasesize;
+
+ for (i = 0; i < blocks; i++) {
+ oob.start = offset;
+ ret = ioctl(fd, MEMREADOOB, &oob);
+
+ if (!ret) {
+ int log_no = nand_get_logical_no(oobbuf);
+
+//printf("-- %x\n", log_no);
+
+ if ((short)log_no == -1) {
+ int j = 0;
+ {
+ loff_t offs = offset;
+ erase.start = offset;
+ int ret = ioctl(fd, MEMGETBADBLOCK, &offs);
+ if (ret > 0) {
+ printf ("\nSkipping bad block at 0x%08x\n", erase.start);
+ goto nextblock;
+ } else if (ret < 0) {
+ perror("ioctl(MEMGETBADBLOCK)");
+ exit(1);
+ } else {
+ printf("%x - no bad block\n", offset);
+ }
+
+ if (ioctl(fd, MEMERASE, &erase) != 0) {
+ perror("ioctl(MEMERASE)");
+ goto nextblock;
+ }
+
+ //printf("%x - erased\n", offset);
+
+ }
+
+ //printf("NAND logical - found free block %x, mapped as %x\n", offset, ofs);
+
+ log2phy[ofs / erasesize] = offset;
+
+ return offset;
+ } else {
+ //fprintf(stderr, "found: %x\n", log_no);
+ }
+ } else {
+ perror ("ioctl(MEMREADOOB)");
+ }
+
+ nextblock:
+ offset += erasesize;
+ }
+
+ return (unsigned long)-1;
+}
+
+void usage(void)
+{
+ fprintf(stderr, "Usage:\nnandlogical <mtd char device> READ|WRITE <start> <length> <file>\n");
+ exit(1);
+}
+
+int main(int argc, char *argv[])
+{
+ mtd_info_t meminfo;
+ char *mtddev;
+ int blocks;
+ unsigned long start_addr;
+ unsigned long end_addr;
+ unsigned long length;
+ unsigned long ofs;
+ int bs;
+ int ofd;
+ int func_write = 0;
+ int oobinfochanged = 0;
+ struct nand_oobinfo old_oobinfo;
+
+ if (argc < 6)
+ usage();
+
+ if (strcmp(argv[2], "WRITE") == 0)
+ func_write = 1;
+ else if (strcmp(argv[2], "READ") != 0)
+ usage();
+
+ mtddev = argv[1];
+ start_addr = strtoul(argv[3], NULL, 0);
+ length = strtoul(argv[4], NULL, 0);
+
+ if (func_write) {
+ if ((ofd = open(argv[5], O_RDONLY)) == -1) {
+ perror("open input file");
+ exit(1);
+ }
+ /* Open MTD device */
+ if ((fd = open(mtddev, O_RDWR)) == -1) {
+ perror("open flash");
+ exit (1);
+ }
+ } else {
+ if ((ofd = open(argv[5], O_WRONLY | O_TRUNC | O_CREAT, 0644)) == -1) {
+ perror ("open outfile");
+ exit(1);
+ }
+ /* Open MTD device */
+ if ((fd = open(mtddev, O_RDONLY)) == -1) {
+ perror("open flash");
+ exit (1);
+ }
+ }
+
+ /* Fill in MTD device capability structure */
+ if (ioctl(fd, MEMGETINFO, &meminfo) != 0) {
+ perror("MEMGETINFO");
+ close(fd);
+ exit (1);
+ }
+
+ /* Make sure device page sizes are valid */
+ if (!(meminfo.oobsize == 64 && meminfo.writesize == 2048) &&
+ !(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
+ !(meminfo.oobsize == 8 && meminfo.writesize == 256)) {
+ fprintf(stderr, "Unknown flash (not normal NAND)\n");
+ close(fd);
+ exit(1);
+ }
+
+ //printf("erasesize %x\nwritesize %x\noobsize %x\nsize %x\n", meminfo.erasesize, meminfo.writesize, meminfo.oobsize, meminfo.size);
+
+ blocks = NAND_LOGICAL_SIZE / meminfo.erasesize;
+ log2phy = (unsigned long *) malloc(blocks * sizeof(unsigned long));
+ readbuf = (char *)malloc(meminfo.erasesize);
+ oobbuf = (char *)malloc(meminfo.writesize);
+ oob.ptr = oobbuf;
+
+ scan_logical(blocks, meminfo.erasesize);
+
+ //printf("Start: %x\nEnd: %x\n", start_addr, length);
+
+ end_addr = start_addr + length;
+ bs = meminfo.writesize;
+
+ for (ofs = start_addr; ofs < end_addr ; ofs+=bs) {
+ int new_logical_added = 0;
+ int offset = log2phy[ofs / meminfo.erasesize];
+
+ if ((int)offset < 0 && func_write) {
+ //printf("add logical block...\n");
+ offset = add_logical(ofs, blocks, meminfo.erasesize, bs);
+ new_logical_added = 1;
+ }
+
+ if ((int)offset < 0) {
+ printf("NAND logical - offset %08X not found\n", ofs);
+ goto closeall;
+ }
+
+ offset += ofs % meminfo.erasesize;
+
+ //printf(":%x\n", offset);
+
+ if (func_write) {
+ int len;
+ memset(readbuf, 0xff, bs);
+ len = read(ofd, readbuf, bs);
+ if (len > 0) {
+#if 1
+ if (ofs % meminfo.erasesize == 0) {
+ int j;
+ erase_info_t erase;
+ erase.start = offset;
+ erase.length = meminfo.erasesize;
+ if (ioctl(fd, MEMERASE, &erase) != 0) {
+ printf("ioctl(MEMERASE) %x\n", offset);
+ //goto nextblock;
+ }
+ //printf("Erased\n");
+
+ for (j = 0; j < meminfo.erasesize; j+=bs) {
+ int log_no;
+ oob.start = offset + j;
+ oob.length = 16;
+
+ memset(oobbuf, 0xff, 16);
+ nand_set_logical_no(ofs / meminfo.erasesize, oobbuf);
+ if (ioctl(fd, MEMWRITEOOB, &oob) != 0) {
+ //perror ("ioctl(MEMWRITEOOB)");
+ printf("NAND logical add - MEMWRITEOOB error %x\n", offset + j);
+ exit(1);
+ }
+ memset(oobbuf, 0xff, 16);
+ if (ioctl(fd, MEMREADOOB, &oob) != 0) {
+ perror ("ioctl(MEMREADOOB)");
+ exit(1);
+ }
+ log_no = nand_get_logical_no(oobbuf);
+ //printf("%x:1 write %x, read %x\n", offset + j, ofs / meminfo.erasesize, log_no);
+ }
+
+ }
+#endif
+ if (pwrite(fd, readbuf, bs, offset) != bs) {
+ perror ("pwrite");
+ goto closeall;
+ }
+
+ } else
+ break;
+ } else {
+ if (pread(fd, readbuf, bs, offset) != bs) {
+ perror("pread");
+ goto closeall;
+ }
+ write(ofd, readbuf, ((end_addr - ofs) < bs)?(end_addr - ofs):bs);
+ }
+ }
+
+ closeall:
+
+ free(log2phy);
+ free(readbuf);
+ free(oobbuf);
+ close(fd);
+ close(ofd);
+
+ return 0;
+}
============================================================
--- packages/nandlogical/nandlogical_1.0.0.bb 08c2eb3a4bb34c4e5c03d312718add26413df421
+++ packages/nandlogical/nandlogical_1.0.0.bb 08c2eb3a4bb34c4e5c03d312718add26413df421
@@ -0,0 +1,18 @@
+DESCRIPTION = "Nandlogical for Sharp mtd1"
+LICENSE = "GPL"
+DEPENDS = "mtd-utils"
+COMPATIBLE_MACHINE = "(c7x0)"
+PR = "r0"
+
+SRC_URI = "file://nandlogical.c"
+
+S = "${WORKDIR}/${P}"
+
+do_compile () {
+ ${CC} -o nandlogical ${WORKDIR}/nandlogical.c -static
+}
+
+do_install () {
+ install -d ${D}${bindir}/
+ install -m 0755 ${WORKDIR}/${P}/nandlogical ${D}${bindir}/
+}
============================================================
--- classes/kernel.bbclass 3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b
+++ classes/kernel.bbclass aaee7c587861c7c66d492ee0c8e7540f99932496
@@ -52,7 +52,7 @@ KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${H
KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
# Where built kernel lies in the kernel tree
-KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
+KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
KERNEL_IMAGEDEST = "boot"
#
@@ -451,9 +451,9 @@ do_sizecheck() {
# with a fixed length or there is a limit in transferring the kernel to memory
do_sizecheck() {
if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
- size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+ size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
- rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+ rm ${KERNEL_OUTPUT}
die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
fi
fi
@@ -466,7 +466,7 @@ do_deploy() {
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+ install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
if [ -d "${D}/lib" ]; then
============================================================
--- packages/ffmpeg/ffmpeg_git.bb ef01666ee577eb22fd1c4f1eeedd7544540df46b
+++ packages/ffmpeg/ffmpeg_git.bb b95d010568a0ab37a6ab0ef5c267c9d3580ace9d
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r20"
+PR = "r21"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
@@ -14,7 +14,7 @@ SRCREV = "3692b8de9fae73860be636606cb634
FFBRANCH ?= "master"
SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "af7bda5224b6cdfb0c1f03686d2a6b631a455668"
+SRCREV_arm = "3c4b8ba71b922be6559fcfea3cb990ea3ded234d"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
============================================================
--- packages/glibc/glibc.inc 616d34fb71075168d558a2c23652b0847b62e379
+++ packages/glibc/glibc.inc 2d332284f28dce392d63f89441b2747b62db4751
@@ -17,4 +17,6 @@ INHIBIT_DEFAULT_DEPS = "1"
GLIBC_EXTRA_OECONF ?= ""
INHIBIT_DEFAULT_DEPS = "1"
+ARM_INSTRUCTION_SET = "arm"
+
PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
============================================================
--- packages/glibc/glibc_2.6.1.bb 77cf632ae1fc1464c20204d36e370aa655ffa09a
+++ packages/glibc/glibc_2.6.1.bb 57bf7eb6dae142987a9e81c5916a9181d7ec554a
@@ -1,8 +1,6 @@ PR = "r10"
require glibc.inc
PR = "r10"
-ARM_INSTRUCTION_SET = "arm"
-
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
============================================================
--- packages/gsoap/gsoap-native_2.7.7.bb e2f96667aeea0e85e754378570e59305d6476439
+++ packages/gsoap/gsoap-native_2.7.7.bb a137c032ea061e49419203c45e853ea4bd81b14e
@@ -1,7 +1,10 @@ DEPENDS = ""
require gsoap_${PV}.bb
DEPENDS = ""
+PR = "r1"
+SRC_URI += "file://use-just-built-binary.patch;patch=1"
+
inherit native
do_stage() {
@@ -11,4 +14,3 @@ do_install() {
do_install() {
:
}
-
#
# mt diff -rb68ae87d8ee0969bc8a91ea0ac326fb34c5eb9a4 -r66f7e74e0e6de165fe1e68ec6ec71fbbd5641d2d
#
#
#
# patch "packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch"
# from [f5ec6489f490fbe135c91e1d2aa9145eacbabdd6]
# to [8d8a0491ca3bb65bbcb1eba647de9f447ce859c6]
#
# patch "packages/dgen/dgen-sdl_1.23.bb"
# from [a3aecaa526b1fad198c4eeff09990398df3eafbc]
# to [5385ad78b79a29edbb73c8dccd827c3466dc7881]
#
============================================================
--- packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch f5ec6489f490fbe135c91e1d2aa9145eacbabdd6
+++ packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch 8d8a0491ca3bb65bbcb1eba647de9f447ce859c6
@@ -1,7 +1,8 @@
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am 2001-02-22 00:14:21 +00:00
-+++ dgen-sdl-1.23/Makefile.am 2005-02-24 23:21:05 +00:00
-@@ -5,7 +5,7 @@
+Index: dgen-sdl-1.23/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.am
++++ dgen-sdl-1.23/Makefile.am
+@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.asm.am
DIST_SUBDIRS = star musa mz80 sdl
SUBDIRS = @CPUDIRS@ @INTERFACE@
@@ -10,9 +11,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
bin_PROGRAMS = dgen tobin
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makefile.asm.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am 2000-01-14 00:55:49 +00:00
-+++ dgen-sdl-1.23/Makefile.asm.am 2005-02-24 23:21:05 +00:00
+Index: dgen-sdl-1.23/Makefile.asm.am
+===================================================================
+--- dgen-sdl-1.23.orig/Makefile.asm.am
++++ dgen-sdl-1.23/Makefile.asm.am
@@ -1,5 +1,5 @@
# Tell how to make assembler files
-SUFFIXES += .asmu .asm
@@ -20,10 +22,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
.asm.o:
@NASM@ -f @NASM_FMT@ $<
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configure.in
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in 2001-07-02 19:34:18 +01:00
-+++ dgen-sdl-1.23/configure.in 2005-02-25 00:20:08 +00:00
-@@ -62,41 +62,39 @@
+Index: dgen-sdl-1.23/configure.in
+===================================================================
+--- dgen-sdl-1.23.orig/configure.in
++++ dgen-sdl-1.23/configure.in
+@@ -62,41 +62,39 @@ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
EXTRAOBJS=
dnl Check for SDL joystick
@@ -31,20 +34,15 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
-AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL,
- dnl Check for Linux joystick as a backup
- AC_CHECK_HEADER(linux/joystick.h, JOYSTICK_SUPPORT=LINUX))
-+AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
-
+-
-dnl Check for X (so we can find the OpenGL headers)
-AC_PATH_XTRA
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LIBS="$LIBS $X_LIBS"
-+#dnl Check for X (so we can find the OpenGL headers)
-+#AC_PATH_XTRA
-+#CFLAGS="$CFLAGS $X_CFLAGS"
-+#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-+#LIBS="$LIBS $X_LIBS"
++AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no)
- dnl Check for OpenGL support in SDL
+-dnl Check for OpenGL support in SDL
-AC_ARG_WITH(opengl,
- [ --without-opengl Don't use SDL OpenGL support],
- OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes)
@@ -66,8 +64,14 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
- LIBS=$oldLIBS
- CPPFLAGS=$oldCPPFLAGS
- fi
--
++#dnl Check for X (so we can find the OpenGL headers)
++#AC_PATH_XTRA
++#CFLAGS="$CFLAGS $X_CFLAGS"
++#CXXFLAGS="$CXXFLAGS $X_CFLAGS"
++#LIBS="$LIBS $X_LIBS"
+
-fi
++dnl Check for OpenGL support in SDL
+OPENGL_SUPPORT=no
+#AC_ARG_WITH(opengl,
+# [ --without-opengl Don't use SDL OpenGL support],
@@ -95,7 +99,7 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
if test x$OPENGL_SUPPORT \!= xno; then
AC_DEFINE(SDL_OPENGL_SUPPORT)
-@@ -166,8 +164,11 @@
+@@ -166,8 +164,11 @@ changequote([,])
else
CHOP_=cat
fi
@@ -109,10 +113,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
dnl Check for MMX
AC_ARG_WITH(mmx,
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am 2000-01-29 00:46:22 +00:00
-+++ dgen-sdl-1.23/musa/Makefile.am 2005-02-25 01:10:38 +00:00
-@@ -8,7 +8,10 @@
+Index: dgen-sdl-1.23/musa/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/musa/Makefile.am
++++ dgen-sdl-1.23/musa/Makefile.am
+@@ -8,7 +8,10 @@ noinst_PROGRAMS = m68kmake
noinst_LIBRARIES = libmusa68.a
@@ -124,9 +129,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
m68kops.c: m68kmake
./m68kmake
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am 2000-10-27 00:08:19 +01:00
-+++ dgen-sdl-1.23/mz80/Makefile.am 2005-02-25 00:22:19 +00:00
+Index: dgen-sdl-1.23/mz80/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/mz80/Makefile.am
++++ dgen-sdl-1.23/mz80/Makefile.am
@@ -3,13 +3,11 @@
include $(top_srcdir)/Makefile.asm.am
@@ -145,10 +151,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
EXTRA_DIST = mz80.txt
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am 2001-02-10 19:34:28 +00:00
-+++ dgen-sdl-1.23/sdl/Makefile.am 2005-02-25 01:26:27 +00:00
-@@ -3,11 +3,14 @@
+Index: dgen-sdl-1.23/sdl/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/sdl/Makefile.am
++++ dgen-sdl-1.23/sdl/Makefile.am
+@@ -3,12 +3,15 @@
EXTRA_DIST = dgenfont.pbm chartfont.c
@@ -158,16 +165,18 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
noinst_PROGRAMS = pbm2df
noinst_LIBRARIES = libpd.a
-+
+
+pbm2df: pbm2df.c
+ $(HOSTCC) -o pbm2df pbm2df.c
-
++
# built sources
-diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star/Makefile.am
---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am 2001-07-02 22:48:27 +01:00
-+++ dgen-sdl-1.23/star/Makefile.am 2005-02-24 23:21:05 +00:00
-@@ -7,7 +7,7 @@
+ BUILT_SOURCES = dgenfont.cpp
+Index: dgen-sdl-1.23/star/Makefile.am
+===================================================================
+--- dgen-sdl-1.23.orig/star/Makefile.am
++++ dgen-sdl-1.23/star/Makefile.am
+@@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.asm.am
# license)
EXTRA_DIST = cpudebug.c cpudebug.h star.c starcpu.h stardoc.txt
@@ -176,3 +185,17 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-
noinst_LIBRARIES = libstarcpu.a
+Index: dgen-sdl-1.23/musa/m68kcpu.h
+===================================================================
+--- dgen-sdl-1.23.orig/musa/m68kcpu.h
++++ dgen-sdl-1.23/musa/m68kcpu.h
+@@ -51,7 +51,8 @@
+ #define int32 long
+
+ /* int and unsigned int must be at least 32 bits wide */
+-#define uint unsigned int
++//#define uint unsigned int
++typedef unsigned int uint;
+
+
+ /* Allow for architectures that don't have 8-bit sizes */
============================================================
--- packages/dgen/dgen-sdl_1.23.bb a3aecaa526b1fad198c4eeff09990398df3eafbc
+++ packages/dgen/dgen-sdl_1.23.bb 5385ad78b79a29edbb73c8dccd827c3466dc7881
@@ -1,12 +1,14 @@
-inherit autotools
+DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
+DEPENDS = "virtual/libsdl"
+SECTION = "x11/games"
+LICENSE = "BSD"
-DEFAULT_PREFERENCE = "-1"
+SRC_URI = "\
+ http://pknet.com/~joe/${PN}-${PV}.tar.gz \
+ file://fix-configure-and-make.patch;patch=1 \
+"
-SECTION = "x11/games"
-DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
-DEPENDS = "virtual/libsdl"
-SRC_URI = "http://pknet.com/~joe/${PN}-${PV}.tar.gz \
- file://fix-configure-and-make.patch;patch=1"
+inherit autotools
EXTRA_OECONF = " --disable-sdltest --without-x --without-opengl --without-nasm --without-mmx --without-star"
More information about the Openembedded-commits
mailing list