diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-26 00:40:08 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-26 00:40:08 +0000 |
| commit | 01c0bc2e7cb8e6ddf63f513181210762335208d0 (patch) | |
| tree | ad3a78bc1451a322cc6742ab43782cd7050c7d4c | |
| parent | f5771cdc785a766fda704dce8961e0e205961d95 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2004/12/26 01:16:01+01:00 dyndns.org!reenoo
flac: package libs separately
2004/12/26 00:56:52+01:00 dyndns.org!reenoo
vlc-gpe: fix SECTION
2004/12/26 00:55:46+01:00 dyndns.org!reenoo
Add vlc-gpe - GPE edition of VLC
2004/12/26 00:52:57+01:00 dyndns.org!reenoo
mplayer: bump to 1.0pre6 to address several vulnerabilities. set DEFAULT_PREFERENCE for corgi,shepherd,husky to -1 since the patches might not apply. Please test for those machines.
BKrev: 41ce0868ugckCFEvdw1pMMmq0RnXhw
| -rw-r--r-- | packages/flac/flac_1.1.0.bb | 9 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre6/Makefile.patch | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre6/sdl.patch | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre6/zlib.patch | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_1.0pre6.bb | 0 | ||||
| -rw-r--r-- | packages/vlc/vlc-gpe_0.7.2.bb | 0 |
8 files changed, 8 insertions, 1 deletions
diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb index d433a8cb2e..4eb24a1849 100644 --- a/packages/flac/flac_1.1.0.bb +++ b/packages/flac/flac_1.1.0.bb @@ -3,7 +3,7 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "BSD GPL" SECTION = "libs" DEPENDS = "libogg" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ file://disable-xmms-plugin.patch;patch=1 \ @@ -20,6 +20,13 @@ EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ --without-libiconv-prefix \ --without-id3lib" +PACKAGES += "libflac libflac++ liboggflac liboggflac++" +FILES_${PN} = "${bindir}" +FILES_libflac = "${libdir}/libFLAC.so.*" +FILES_libflac++ = "${libdir}/libFLAC++.so.*" +FILES_liboggflac = "${libdir}/libOggFLAC.so.*" +FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" + do_configure () { install -d ${S}/m4 install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ diff --git a/packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre6/Makefile-vidix.patch diff --git a/packages/mplayer/mplayer-1.0pre6/Makefile.patch b/packages/mplayer/mplayer-1.0pre6/Makefile.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre6/Makefile.patch diff --git a/packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre6/mplayer-w100_1.0pre3.1.modified.diff diff --git a/packages/mplayer/mplayer-1.0pre6/sdl.patch b/packages/mplayer/mplayer-1.0pre6/sdl.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre6/sdl.patch diff --git a/packages/mplayer/mplayer-1.0pre6/zlib.patch b/packages/mplayer/mplayer-1.0pre6/zlib.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre6/zlib.patch diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer_1.0pre6.bb diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vlc/vlc-gpe_0.7.2.bb |