summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/preferred-gpe-versions-2.8.inc2
-rw-r--r--packages/bluez/bluez-gnome_0.13.bb3
-rw-r--r--packages/bluez/bluez-gnome_0.6.bb11
-rw-r--r--packages/bluez/bluez-gnome_0.7.bb11
-rw-r--r--packages/bluez/bluez-gnome_0.9.bb11
-rw-r--r--packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch2
-rw-r--r--packages/fbreader/fbreader_0.8.2a.bb8
-rw-r--r--packages/ffmpeg/ffmpeg_svn.bb9
-rw-r--r--packages/maemo/xpext_1.0-5.bb2
-rw-r--r--packages/maemo/xsp_1.0.0-8.bb2
-rw-r--r--packages/minimix/minimix_0.9.bb8
-rw-r--r--packages/vlc/vlc-gpe_0.8.4.bb4
12 files changed, 34 insertions, 39 deletions
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index acc8498262..fb9e2815ba 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -61,7 +61,7 @@ PREFERRED_VERSION_gpe-shield ?= "0.9"
PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
PREFERRED_VERSION_minilite ?= "0.50"
PREFERRED_VERSION_miniclipboard ?= "0.3"
-PREFERRED_VERSION_minimix ?= "0.8"
+PREFERRED_VERSION_minimix ?= "0.9"
PREFERRED_VERSION_gpe-edit ?= "0.40"
PREFERRED_VERSION_gpe-gallery ?= "0.97"
PREFERRED_VERSION_gpe-calculator ?= "0.2"
diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb
index d50e8e5fde..0fb8a7980f 100644
--- a/packages/bluez/bluez-gnome_0.13.bb
+++ b/packages/bluez/bluez-gnome_0.13.bb
@@ -1,7 +1,10 @@
DESCRIPTION = "BLuetooth configuration applet"
LICENSE = "GPL+LGPL"
+PR = "r1"
+
DEPENDS = "dbus-glib gconf libnotify gtk+"
+RRECOMMENDS = "gnome-icon-theme"
SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
diff --git a/packages/bluez/bluez-gnome_0.6.bb b/packages/bluez/bluez-gnome_0.6.bb
deleted file mode 100644
index d50e8e5fde..0000000000
--- a/packages/bluez/bluez-gnome_0.6.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "BLuetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gnome_0.7.bb b/packages/bluez/bluez-gnome_0.7.bb
deleted file mode 100644
index d50e8e5fde..0000000000
--- a/packages/bluez/bluez-gnome_0.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "BLuetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/bluez/bluez-gnome_0.9.bb b/packages/bluez/bluez-gnome_0.9.bb
deleted file mode 100644
index d50e8e5fde..0000000000
--- a/packages/bluez/bluez-gnome_0.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "BLuetooth configuration applet"
-LICENSE = "GPL+LGPL"
-
-DEPENDS = "dbus-glib gconf libnotify gtk+"
-
-SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} += "${datadir}/gconf"
-
diff --git a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
index 858a713125..ecb60a2108 100644
--- a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
+++ b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
@@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk fbreader-0.8.2a/make
+ UILIBS = -lqt-mt
else
- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
-+ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
endif
-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index 2419ccf4ae..52d7d86473 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r4"
+PR = "r5"
# The RESOLUTION is defined at compile time which makes
# this package MACHINE specific.
@@ -20,6 +20,9 @@ SRC_URI_append_spitz = "\
SRC_URI_append_akita = "\
file://zaurus-VGA.patch;patch=1"
+SRC_URI_append_htcuniversal = "\
+ file://zaurus-VGA.patch;patch=1"
+
# Set the defaults
READER_RESOLUTION = "240x320"
READER_ARCH = "openzaurus"
@@ -30,12 +33,15 @@ READER_STATUS = "release"
READER_RESOLUTION_fic-gta01 = "480x640"
READER_RESOLUTION_spitz = "640x480"
READER_RESOLUTION_akita = "640x480"
+READER_RESOLUTION_htcuniversal = "640x480"
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+LDFLAGS_append = " -liconv"
+
inherit pkgconfig
do_configure() {
diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
index b8bd365d51..051363474e 100644
--- a/packages/ffmpeg/ffmpeg_svn.bb
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -4,6 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "libogg zlib libvorbis faac liba52 lame"
PV = "0.4.9+svn${SRCDATE}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
@@ -104,6 +105,14 @@ do_stage() {
${STAGING_INCDIR}/ffmpeg/mathematics.h
install -m 0644 ${S}/libavutil/rational.h \
${STAGING_INCDIR}/ffmpeg/rational.h
+ install -m 0644 ${S}/libavutil/mem.h \
+ ${STAGING_INCDIR}/ffmpeg/mem.h
+ install -m 0644 ${S}/libavutil/log.h \
+ ${STAGING_INCDIR}/ffmpeg/log.h
+
+ install -d ${STAGING_INCDIR}/libpostproc
+ install -m 0644 ${S}/libpostproc/postprocess.h \
+ ${STAGING_INCDIR}/libpostproc/postprocess.h
}
PACKAGES += "libavcodec libavcodec-dev \
diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb
index 5deee48af1..cc40205c50 100644
--- a/packages/maemo/xpext_1.0-5.bb
+++ b/packages/maemo/xpext_1.0-5.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "virtual/libx11 xextensions libxext"
+DEPENDS = "virtual/libx11 libxext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
file://auxdir.patch;patch=1;pnum=0"
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index cb368f83cc..d5f94c64cd 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/packages/maemo/xsp_1.0.0-8.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "virtual/libx11 xextensions libxext xpext"
+DEPENDS = "virtual/libx11 libxext xpext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
S = "${WORKDIR}/Xsp"
diff --git a/packages/minimix/minimix_0.9.bb b/packages/minimix/minimix_0.9.bb
new file mode 100644
index 0000000000..feb45c50ad
--- /dev/null
+++ b/packages/minimix/minimix_0.9.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Volume Control Applet for GPE"
+LICENSE = "GPL"
+SECTION = "gpe"
+
+DEPENDS = "libgpewidget"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
diff --git a/packages/vlc/vlc-gpe_0.8.4.bb b/packages/vlc/vlc-gpe_0.8.4.bb
index 59869f14de..cd3ab47e2b 100644
--- a/packages/vlc/vlc-gpe_0.8.4.bb
+++ b/packages/vlc/vlc-gpe_0.8.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.videolan.org"
LICENSE = "GPL"
PRIORITY = "optional"
SECTION = "gpe"
-PR = "r1"
+PR = "r2"
DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
@@ -15,6 +15,8 @@ export GTK2_CFLAGS = "`pkg-config --cflags gtk+-2.0 gthread-2.0`"
export GTK2_LIBS = "`pkg-config --libs gtk+-2.0 gthread-2.0`"
export vlc_WORKAROUNDLDFLAGS = "lib/libvlc.a"
+LDFLAGS_append = " -L${STAGING_LIBDIR} -lpostproc"
+
inherit autotools
EXTRA_OECONF = "\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 17:08:26 +0000