cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* FFmpeg headers moved

Browse Source 
* FFmpeg LIB_DEPENDS/WANTLIB changes
* add @bin markers in PLISTs
* bump PKGNAMEs

feedback/ok brad@
This commit is contained in:
jakemsr 2008-07-09 02:07:36 +00:00
parent f78c7b80a6
commit 6838aeee39
43 changed files with 538 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/akode/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2008/04/16 02:10:21 jakemsr Exp $
# $OpenBSD: Makefile,v 1.11 2008/07/09 02:07:36 jakemsr Exp $
COMMENT= Decoding Library for KDE Multimedia
DISTNAME= akode-2.0.2
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
SHARED_LIBS += akode 2.1 # .2.0
CATEGORIES= audio multimedia x11/kde
@ -27,7 +27,7 @@ LIB_DEPENDS= FLAC.>=8::audio/flac \
avcodec.>=10,avformat.>=10,avutil.>=3::graphics/ffmpeg \
jack::audio/jack
WANTLIB= a52 c faac faad m mp3lame \
WANTLIB= a52 bz2 c faac faad m mp3lame \
ogg ossaudio pthread stdc++ theora x264 z
USE_X11= Yes

13
audio/akode/patches/patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp
View File

@ -1,14 +1,17 @@
$OpenBSD: patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp,v 1.2 2008/04/16 02:10:21 jakemsr Exp $
$OpenBSD: patch-akode_plugins_ffmpeg_decoder_ffmpeg_decoder_cpp,v 1.3 2008/07/09 02:07:36 jakemsr Exp $
--- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.orig Thu Aug 10 11:37:20 2006
+++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp Mon Mar 24 18:14:43 2008
+++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp Sat Jun 21 10:00:47 2008
@@ -26,9 +26,11 @@
#include "decoder.h"
#include <assert.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
+extern "C" {
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
#include <ffmpeg/avio.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+}
#include "ffmpeg_decoder.h"

4
audio/akode/pkg/PLIST
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2008/04/16 02:10:21 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.5 2008/07/09 02:07:36 jakemsr Exp $
%%SHARED%%
bin/akode-config
bin/akodeplay
@bin bin/akodeplay
include/akode/
include/akode/akode_export.h
include/akode/akodelib.h

4
audio/aqualung/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2008/06/15 00:04:49 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2008/07/09 02:07:36 jakemsr Exp $
COMMENT= advanced music player
DISTNAME= aqualung-0.9beta9.1
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
CATEGORIES= audio
HOMEPAGE= http://aqualung.factorial.hu/

14
audio/aqualung/patches/patch-src_decoder_dec_lavc_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_decoder_dec_lavc_h,v 1.1 2008/07/09 02:07:36 jakemsr Exp $
--- src/decoder/dec_lavc.h.orig Sat Jun 21 11:55:41 2008
+++ src/decoder/dec_lavc.h Sat Jun 21 11:56:11 2008
@@ -23,8 +23,8 @@
#define _DEC_LAVC_H
#ifdef HAVE_LAVC
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#endif /* HAVE_LAVC */
#include "file_decoder.h"

4
audio/aqualung/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2008/03/15 11:54:10 landry Exp $
bin/aqualung
@comment $OpenBSD: PLIST,v 1.3 2008/07/09 02:07:36 jakemsr Exp $
@bin bin/aqualung
@man man/man1/aqualung.1
share/applications/aqualung.desktop
share/aqualung/

7
graphics/ffmpegthumbnailer/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/01/06 19:25:47 landry Exp $
# $OpenBSD: Makefile,v 1.2 2008/07/09 02:09:59 jakemsr Exp $
COMMENT= lightweight video thumbnailer for file managers
DISTNAME= ffmpegthumbnailer-1.1.3
PKGNAME= ${DISTNAME}p0
CATEGORIES= graphics multimedia
HOMEPAGE= http://code.google.com/p/ffmpegthumbnailer
@ -14,10 +15,10 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://ffmpegthumbnailer.googlecode.com/files/
LIB_DEPENDS= avcodec.>=10,avformat.>=10,avutil.>=4::graphics/ffmpeg \
LIB_DEPENDS= avcodec.>=10,avformat.>=10,avutil.>=4,swscale.>=1::graphics/ffmpeg \
png.>=6::graphics/png
WANTLIB= X11 Xext a52 c faac faad m mp3lame ogg ossaudio pthread \
WANTLIB= a52 bz2 c faac faad m mp3lame ogg pthread \
stdc++ theora vorbis vorbisenc x264 z
CONFIGURE_STYLE=gnu

12
graphics/ffmpegthumbnailer/patches/patch-src_moviedecoder_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_moviedecoder_cpp,v 1.1 2008/07/09 02:09:59 jakemsr Exp $
--- src/moviedecoder.cpp.orig Sat Jun 21 19:48:47 2008
+++ src/moviedecoder.cpp Sat Jun 21 19:49:01 2008
@@ -5,7 +5,7 @@
#include <iostream>
extern "C" {
-#include <ffmpeg/swscale.h>
+#include <libswscale/swscale.h>
}
using namespace std;

14
graphics/ffmpegthumbnailer/patches/patch-src_moviedecoder_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_moviedecoder_h,v 1.1 2008/07/09 02:09:59 jakemsr Exp $
--- src/moviedecoder.h.orig Sat Jun 21 19:47:00 2008
+++ src/moviedecoder.h Sat Jun 21 19:48:14 2008
@@ -9,8 +9,8 @@
#include <vector>
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
typedef unsigned char byte;

4
graphics/ffmpegthumbnailer/pkg/PLIST
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/01/06 19:25:47 landry Exp $
bin/ffmpegthumbnailer
@comment $OpenBSD: PLIST,v 1.2 2008/07/09 02:09:59 jakemsr Exp $
@bin bin/ffmpegthumbnailer

8
graphics/gegl/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2008/07/02 14:03:40 merdely Exp $
# $OpenBSD: Makefile,v 1.6 2008/07/09 02:09:59 jakemsr Exp $
SHARED_ONLY= Yes
@ -10,7 +10,7 @@ DISTNAME= gegl-${V}
CATEGORIES= graphics devel
PKGNAME-main= gegl-${V}p1
PKGNAME-plugins=gegl-plugins-${V}p1
PKGNAME-plugins=gegl-plugins-${V}p2
SHARED_LIBS= gegl-0.0 0.0 # .16.0
@ -49,8 +49,8 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
rsvg-2:librsvg-*-!no_gnome:x11/gnome/librsvg \
babl-0.0::graphics/babl
WANTLIB-plugins=${WANTLIB} Half Iex IlmThread Imath SDL a52 faac faad mp3lame \
ogg stdc++ theora usbhid vorbis vorbisenc x264
WANTLIB-plugins=${WANTLIB} Half Iex IlmThread Imath SDL a52 bz2 faac faad \
mp3lame ogg stdc++ theora usbhid vorbis vorbisenc x264
RUN_DEPENDS-plugins= ::${BUILD_PKGPATH},-main
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
IlmImf.>=4::graphics/openexr \

12
graphics/gegl/patches/patch-operations_external_ff-load_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-operations_external_ff-load_c,v 1.1 2008/07/09 02:09:59 jakemsr Exp $
--- operations/external/ff-load.c.orig Sat Jun 21 15:16:10 2008
+++ operations/external/ff-load.c Sat Jun 21 15:16:23 2008
@@ -27,7 +27,7 @@ gegl_chant_int (frame, "Frame", 0, 1000000, 0, "frame
#include "gegl-chant.h"
#include <errno.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
typedef struct
{

4
graphics/gegl/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2008/04/10 14:12:35 ajacoutot Exp $
bin/gegl
@comment $OpenBSD: PLIST-main,v 1.2 2008/07/09 02:09:59 jakemsr Exp $
@bin bin/gegl
include/gegl-0.0/
include/gegl-0.0/gegl-buffer.h
include/gegl-0.0/gegl-chant.h

8
multimedia/ffmpeg2theora/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2008/06/01 08:21:15 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
COMMENT= reencode many media file formats to Ogg Theora
DISTNAME= ffmpeg2theora-0.19
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= multimedia
EXTRACT_SUFX= .tar.bz2
@ -16,11 +16,11 @@ PERMIT_PACKAGE_CDROM= patents in ffmpeg
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ogg pthread a52 faac faad mp3lame x264 z
WANTLIB= bz2 c m ogg pthread a52 faac faad mp3lame x264 z
MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= avcodec.>=8,avformat.>=8,avutil.>=2::graphics/ffmpeg \
LIB_DEPENDS= avcodec.>=8,avformat.>=8,avutil.>=2,swscale.>=1::graphics/ffmpeg \
vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
theora.>=2::multimedia/libtheora

14
multimedia/ffmpeg2theora/patches/patch-ffmpeg2theora_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ffmpeg2theora_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- ffmpeg2theora.c.orig Sat Jun 21 20:56:30 2008
+++ ffmpeg2theora.c Sat Jun 21 20:56:54 2008
@@ -26,8 +26,8 @@
#include <getopt.h>
#include <math.h>
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
#include "theora/theora.h"
#include "vorbis/codec.h"

4
multimedia/ffmpeg2theora/pkg/PLIST
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/27 17:56:14 steven Exp $
bin/ffmpeg2theora
@comment $OpenBSD: PLIST,v 1.2 2008/07/09 02:13:01 jakemsr Exp $
@bin bin/ffmpeg2theora
@man man/man1/ffmpeg2theora.1

4
multimedia/k3b/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2008/05/28 20:05:14 naddy Exp $
# $OpenBSD: Makefile,v 1.3 2008/07/09 02:13:01 jakemsr Exp $
SHARED_ONLY = Yes
COMMENT = CD/DVD creator
DISTNAME = k3b-1.0.4
PKGNAME = ${DISTNAME}p0
PKGNAME = ${DISTNAME}p1
SHARED_LIBS = k3b 0.0 # 3.0
SHARED_LIBS += k3bdevice 0.0 # 5.0

25
multimedia/k3b/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $
$OpenBSD: patch-configure,v 1.2 2008/07/09 02:13:01 jakemsr Exp $
--- configure.orig Fri Nov 2 03:02:31 2007
+++ configure Fri Jan 18 19:08:34 2008
+++ configure Sun Jun 22 00:56:53 2008
@@ -29531,7 +29531,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
fi
@ -13,7 +13,18 @@ $OpenBSD: patch-configure,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $
fi
@@ -36537,7 +36540,7 @@ fi
@@ -36499,8 +36502,8 @@ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${a
cat >conftest.$ac_ext <<_ACEOF
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
@@ -36537,11 +36540,11 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
OLD_LIBS=$LIBS
@ -21,7 +32,13 @@ $OpenBSD: patch-configure,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $
+ LIBS="$(pkg-config --libs libavcodec libavformat) $LIBS"
cat >conftest.$ac_ext <<_ACEOF
extern "C" {
#include <ffmpeg/avformat.h>
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
@@ -36784,7 +36787,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_process
echo $ECHO_N "(cached) $ECHO_C" >&6
else

12
multimedia/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegdecoder_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_decoder_ffmpeg_k3bffmpegdecoder_cpp,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.orig Sun Jun 22 01:24:01 2008
+++ plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp Sun Jun 22 01:24:17 2008
@@ -22,7 +22,7 @@
#include <k3bpluginfactory.h>
extern "C" {
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
}
#include <math.h>

14
multimedia/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper_cpp,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig Sun Jun 22 01:24:57 2008
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp Sun Jun 22 01:25:20 2008
@@ -18,8 +18,8 @@
#include "k3bffmpegwrapper.h"
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
#include <string.h>

4
multimedia/k3b/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $
bin/k3b
@comment $OpenBSD: PLIST,v 1.2 2008/07/09 02:13:01 jakemsr Exp $
@bin bin/k3b
bin/k3bsetup
include/k3b_export.h
include/k3bactivepipe.h

10
multimedia/libquicktime/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.14 2008/06/01 08:21:15 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2008/07/09 02:13:01 jakemsr Exp $
# $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $
SHARED_ONLY= Yes
COMMENT= library for reading and writing quicktime files
DISTNAME= libquicktime-1.0.2
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= multimedia
SHARED_LIBS= quicktime 3.0
@ -36,7 +36,7 @@ LIB_DEPENDS= vorbis.>=3,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
png.>=4::graphics/png \
dv.>=4::multimedia/libdv \
mp3lame::audio/lame \
avcodec.>=11,avutil.>=5::graphics/ffmpeg \
avcodec.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg \
gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2
VMEM_WARNING= Yes
@ -48,9 +48,9 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
ac_cv_search_pthread_create=-pthread
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-gpl \
--without-alsa \
--with-avcodec="${LOCALBASE}"
--without-alsa
.include <bsd.port.mk>

31
multimedia/libquicktime/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.6 2008/01/26 02:02:50 jakemsr Exp $
$OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
--- configure.orig Tue Jan 8 14:00:53 2008
+++ configure Sat Jan 19 21:52:53 2008
+++ configure Sat Jun 21 12:16:30 2008
@@ -24861,7 +24861,7 @@ fi
VORBIS_LIBS="-L$prefix/lib"
fi
@ -26,3 +26,30 @@ $OpenBSD: patch-configure,v 1.6 2008/01/26 02:02:50 jakemsr Exp $
{ echo "$as_me:$LINENO: checking for lame" >&5
@@ -27562,7 +27562,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavcodec/avcodec.h>
int main()
{
FILE * output;
@@ -27728,7 +27728,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavcodec/avcodec.h>
int main()
{
FILE * output;
@@ -27893,7 +27893,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavcodec/avcodec.h>
int main()
{
FILE * output;

40
multimedia/libquicktime/patches/patch-configure_ac
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.3 2008/01/26 02:02:50 jakemsr Exp $
--- configure.ac.orig Wed Jan 2 12:57:44 2008
+++ configure.ac Sat Jan 19 21:06:11 2008
@@ -190,6 +190,9 @@ VORBIS_REQUIRED="1.0"
have_vorbis=false
AH_TEMPLATE([HAVE_VORBIS], [Vorbis libraries are there])
+
+OLD_LIBS="$LIBS"
+LIBS="$LIBS -logg"
if test "x$with_vorbis" != "xno"; then
XIPH_PATH_VORBIS(have_vorbis=true)
@@ -199,7 +202,9 @@ AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue
if test x$have_vorbis = xtrue; then
AC_DEFINE(HAVE_VORBIS)
fi
-
+
+LIBS="$OLD_LIBS"
+
AC_SUBST(VORBIS_REQUIRED)
dnl
@@ -216,11 +221,11 @@ if test "x$with_lame" != "xno"; then
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-if test x$have_vorbis = xtrue; then
-LIBS="$LIBS -lmp3lame -lvorbis -lm"
-else
+# if test x$have_vorbis = xtrue; then
+# LIBS="$LIBS -lmp3lame -lvorbis -logg -lm"
+# else
LIBS="$LIBS -lmp3lame -lm"
-fi
+# fi
dnl CFLAGS="$CFLAGS"

12
multimedia/libquicktime/patches/patch-plugins_ffmpeg_ffmpeg_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_ffmpeg_ffmpeg_h,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/ffmpeg/ffmpeg.h.orig Sat Jun 21 12:40:00 2008
+++ plugins/ffmpeg/ffmpeg.h Sat Jun 21 12:40:12 2008
@@ -26,7 +26,7 @@
#define QUICKTIME_FFMPEG_H
#include <quicktime/qtprivate.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
void quicktime_init_video_codec_ffmpeg(quicktime_video_map_t *vtrack,
AVCodec *encoder, AVCodec *decoder);

12
multimedia/libquicktime/patches/patch-plugins_ffmpeg_params_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_ffmpeg_params_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/ffmpeg/params.c.orig Sat Jun 21 12:40:39 2008
+++ plugins/ffmpeg/params.c Sat Jun 21 12:40:50 2008
@@ -24,7 +24,7 @@
#include "lqt_private.h"
#include "params.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include <string.h>
typedef struct

12
multimedia/libquicktime/patches/patch-plugins_ffmpeg_video_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_ffmpeg_video_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/ffmpeg/video.c.orig Sat Jun 21 21:02:38 2008
+++ plugins/ffmpeg/video.c Sat Jun 21 21:02:53 2008
@@ -32,7 +32,7 @@
#define LOG_DOMAIN "ffmpeg_video"
#ifdef HAVE_LIBSWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
#endif
// Enable interlaced encoding (experimental)

22
multimedia/libquicktime/pkg/PLIST
View File

@ -1,15 +1,15 @@
@comment $OpenBSD: PLIST,v 1.6 2008/01/26 02:02:50 jakemsr Exp $
bin/libquicktime_config
@comment $OpenBSD: PLIST,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
@bin bin/libquicktime_config
bin/lqt-config
bin/lqt_transcode
bin/lqtplay
bin/qt2text
bin/qtdechunk
bin/qtdump
bin/qtinfo
bin/qtrechunk
bin/qtstreamize
bin/qtyuv4toyuv
@bin bin/lqt_transcode
@bin bin/lqtplay
@bin bin/qt2text
@bin bin/qtdechunk
@bin bin/qtdump
@bin bin/qtinfo
@bin bin/qtrechunk
@bin bin/qtstreamize
@bin bin/qtyuv4toyuv
include/lqt/
include/lqt/colormodels.h
include/lqt/lqt.h

7
multimedia/transcode/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2008/01/26 02:17:50 jakemsr Exp $
# $OpenBSD: Makefile,v 1.20 2008/07/09 02:13:01 jakemsr Exp $
SHARED_ONLY= Yes
COMMENT= video stream processing tools
DISTNAME= transcode-1.0.5
PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
HOMEPAGE= http://www.transcoding.org/
@ -86,7 +87,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-sunau \
--enable-theora \
--enable-vorbis \
--with-libpostproc-includes="${LOCALBASE}/include/postproc"
--with-libpostproc-includes="${LOCALBASE}/include/libpostproc"
.if ${FLAVOR:L:Mlzo}
CONFIGURE_ARGS+= --enable-lzo
@ -108,7 +109,7 @@ PKG_ARGS+= -Dmjpegtools=0
.if ${FLAVOR:L:Mquicktime}
CONFIGURE_ARGS+= --enable-libquicktime
LIB_DEPENDS+= quicktime::multimedia/libquicktime
WANTLIB+= png
WANTLIB+= GL intl
PKG_ARGS+= -Dquicktime=1
.else
PKG_ARGS+= -Dquicktime=0

157
multimedia/transcode/patches/patch-configure
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-configure,v 1.6 2008/01/26 02:17:50 jakemsr Exp $
$OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
--- configure.orig Sat Jan 5 06:38:47 2008
+++ configure Sat Jan 19 20:23:08 2008
+++ configure Sat Jun 21 21:12:47 2008
@@ -1761,7 +1761,7 @@ Optional Packages:
prefix where libavcodec is installed (/usr)
--with-libavcodec-includes=DIR
directory where libavcodec headers
- (ffmpeg/avcodec.h) are installed (/usr/include)
+ (libavcodec/avcodec.h) are installed (/usr/include)
--with-libavcodec-libs=DIR
directory where libavcodec libararies
(libavcodec.so) are installed (/usr/lib)
@@ -10222,6 +10222,7 @@ fi
echo "${ECHO_T}$have_asm_altivec" >&6; }
if test x"$have_asm_altivec" = x"yes" ; then
@ -9,3 +18,147 @@ $OpenBSD: patch-configure,v 1.6 2008/01/26 02:17:50 jakemsr Exp $
cat >>confdefs.h <<\_ACEOF
#define HAVE_PPC_ALTIVEC 1
_ACEOF
@@ -27132,12 +27133,12 @@ echo "${ECHO_T}default" >&6; }
LIBAVCODEC_EXTRA_CFLAGS="$LIBAVCODEC_EXTRA_CFLAGS $xi"
LIBAVCODEC_EXTRA_CFLAGS="`echo $LIBAVCODEC_EXTRA_CFLAGS | sed -e 's/ */ /g'`"
- if test x"ffmpeg/avcodec.h" != x"none" ; then
+ if test x"libavcodec/avcodec.h" != x"none" ; then
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $libavcodec_ii"
if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
-echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5
+echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -27145,8 +27146,8 @@ fi
echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h usability" >&5
-echo $ECHO_N "checking ffmpeg/avcodec.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h usability" >&5
+echo $ECHO_N "checking libavcodec/avcodec.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -27154,7 +27155,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -27186,15 +27187,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking ffmpeg/avcodec.h presence" >&5
-echo $ECHO_N "checking ffmpeg/avcodec.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libavcodec/avcodec.h presence" >&5
+echo $ECHO_N "checking libavcodec/avcodec.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -27227,30 +27228,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ffmpeg/avcodec.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libavcodec/avcodec.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for ffmpeg/avcodec.h" >&5
-echo $ECHO_N "checking for ffmpeg/avcodec.h... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for libavcodec/avcodec.h" >&5
+echo $ECHO_N "checking for libavcodec/avcodec.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -27275,8 +27276,8 @@ else
fi
cat >> $tc_pkg_err_file <<EOF
-ERROR: $prob: cannot compile ffmpeg/avcodec.h
-ffmpeg/avcodec.h can be found in the following packages:
+ERROR: $prob: cannot compile libavcodec/avcodec.h
+libavcodec/avcodec.h can be found in the following packages:
FFMpeg http://www.ffmpeg.org/
EOF
@@ -27450,7 +27451,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
int
main()
{
@@ -27511,8 +27512,8 @@ else
fi
cat >> $tc_pkg_err_file <<EOF
-ERROR: $prob: cannot compile ffmpeg/avcodec.h
-ffmpeg/avcodec.h can be found in the following packages:
+ERROR: $prob: cannot compile libavcodec/avcodec.h
+libavcodec/avcodec.h can be found in the following packages:
libavcodec http://www.ffmpeg.org
EOF
@@ -27537,7 +27538,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
int
main ()

12
multimedia/transcode/patches/patch-export_aud_aux_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-export_aud_aux_c,v 1.3 2008/07/09 02:13:01 jakemsr Exp $
--- export/aud_aux.c.orig Sat Jun 21 21:14:44 2008
+++ export/aud_aux.c Sat Jun 21 21:14:59 2008
@@ -31,7 +31,7 @@
#include <inttypes.h>
#include <assert.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "aud_aux.h"
#include "ac3.h"

13
multimedia/transcode/patches/patch-export_export_ffmpeg_c
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-export_export_ffmpeg_c,v 1.2 2008/01/26 02:17:50 jakemsr Exp $
$OpenBSD: patch-export_export_ffmpeg_c,v 1.3 2008/07/09 02:13:01 jakemsr Exp $
--- export/export_ffmpeg.c.orig Sat Nov 17 01:35:31 2007
+++ export/export_ffmpeg.c Sat Jan 19 20:28:14 2008
+++ export/export_ffmpeg.c Sat Jun 21 21:15:39 2008
@@ -36,7 +36,7 @@
#include "vid_aux.h"
// FIXME
#undef EMULATE_FAST_INT
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#if !defined(INFINITY) && defined(HUGE_VAL)
#define INFINITY HUGE_VAL
@@ -87,7 +87,7 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
{"mpeg2video", "mpg2", "MPEG2 compliant video", 1},
{"h263", "h263", "H263", 0},

12
multimedia/transcode/patches/patch-export_ffmpeg_cfg_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-export_ffmpeg_cfg_h,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- export/ffmpeg_cfg.h.orig Sat Jun 21 21:19:50 2008
+++ export/ffmpeg_cfg.h Sat Jun 21 21:20:02 2008
@@ -2,7 +2,7 @@
#define __FFMPEG_CFG_H
#include "libioaux/configs.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
//char *lavc_param_vcodec = "mpeg4";
//extern int lavc_param_vbitrate;

12
multimedia/transcode/patches/patch-filter_filter_resample_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-filter_filter_resample_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- filter/filter_resample.c.orig Sat Jun 21 21:29:55 2008
+++ filter/filter_resample.c Sat Jun 21 21:30:12 2008
@@ -30,7 +30,7 @@
#include "filter.h"
#include "optstr.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
static char * resample_buffer = NULL;
static int bytes_per_sample;

12
multimedia/transcode/patches/patch-import_decode_lavc_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-import_decode_lavc_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- import/decode_lavc.c.orig Sat Jun 21 21:17:30 2008
+++ import/decode_lavc.c Sat Jun 21 21:17:48 2008
@@ -31,7 +31,7 @@
#ifdef EMULATE_FAST_INT
#undef EMULATE_FAST_INT
#endif
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "yuv2rgb.h"
#define READ_BUFFER_SIZE (10*1024*1024)

12
multimedia/transcode/patches/patch-import_import_ffmpeg_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-import_import_ffmpeg_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- import/import_ffmpeg.c.orig Sat Jun 21 21:16:13 2008
+++ import/import_ffmpeg.c Sat Jun 21 21:16:29 2008
@@ -38,7 +38,7 @@ static int capability_flag = TC_CAP_YUV | TC_CAP_RGB |
// FIXME
#undef EMULATE_FAST_INT
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "libvo/yuv2rgb.h"
#include "avilib/avilib.h"

36
multimedia/transcode/pkg/PLIST
View File

@ -1,25 +1,25 @@
@comment $OpenBSD: PLIST,v 1.3 2008/01/26 02:17:50 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.4 2008/07/09 02:13:01 jakemsr Exp $
%%i386%%
%%lzo%%
%%mjpegtools%%
%%quicktime%%
bin/avifix
bin/aviindex
bin/avimerge
bin/avisplit
bin/avisync
bin/tccat
bin/tcdecode
bin/tcdemux
bin/tcextract
bin/tcmodinfo
bin/tcmp3cut
bin/tcprobe
bin/tcrequant
bin/tcscan
bin/tcxmlcheck
bin/tcxpm2rgb
bin/transcode
@bin bin/avifix
@bin bin/aviindex
@bin bin/avimerge
@bin bin/avisplit
@bin bin/avisync
@bin bin/tccat
@bin bin/tcdecode
@bin bin/tcdemux
@bin bin/tcextract
@bin bin/tcmodinfo
@bin bin/tcmp3cut
@bin bin/tcprobe
@bin bin/tcrequant
@bin bin/tcscan
@bin bin/tcxmlcheck
@bin bin/tcxpm2rgb
@bin bin/transcode
lib/transcode/
@comment lib/transcode/a52_decore.la
lib/transcode/a52_decore.so

8
net/openh323/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2008/05/22 19:27:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.18 2008/07/09 02:13:59 jakemsr Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= H.323 video conferencing library
V= 1_19_0_1
DISTNAME= openh323-v${V}
PKGNAME= openh323-${V:S/_/./g}p0
PKGNAME= openh323-${V:S/_/./g}p1
CATEGORIES= net devel
EXTRACT_SUFX= -src-tar.gz
@ -39,7 +39,7 @@ ALL_TARGET= optshared
NO_REGRESS= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil"
CONFIGURE_ARGS= --enable-h263avcodec \
--disable-localspeex \
@ -54,6 +54,8 @@ MAKE_ENV+= STDCCFLAGS="${STDCCFLAGS} -I${WRKSRC}/include" \
MAKE_FLAGS= LIB_MAJOR_VERSION=${LIBh323_VERSION:R} \
LIB_MINOR_VERSION=${LIBh323_VERSION:E}
CFLAGS += -I${LOCALBASE}/include/libavcodec
do-extract:
@tar xzf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR}

24
net/openh323/patches/patch-src_ffh263codec_cxx
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_ffh263codec_cxx,v 1.2 2008/03/15 17:38:43 ajacoutot Exp $
--- src/ffh263codec.cxx.orig Wed Dec 8 03:03:59 2004
+++ src/ffh263codec.cxx Tue Mar 4 14:29:13 2008
$OpenBSD: patch-src_ffh263codec_cxx,v 1.3 2008/07/09 02:13:59 jakemsr Exp $
--- src/ffh263codec.cxx.orig Tue Dec 7 18:03:59 2004
+++ src/ffh263codec.cxx Sun Jun 29 16:00:47 2008
@@ -142,6 +142,7 @@
*
*/
@ -50,6 +50,24 @@ $OpenBSD: patch-src_ffh263codec_cxx,v 1.2 2008/03/15 17:38:43 ajacoutot Exp $
isLoadedOK = TRUE;
}
@@ -357,7 +364,7 @@ int FfmpgLink::AvcodecDecodeVideo(AVCodecContext *ctx,
PWaitAndSignal m(processLock);
PTRACE(6, "Avcodec decode video at " << ::hex << ctx << " frame" << picture
- << " buf" << (int)buf << ::dec << " got picture" << *got_picture_ptr
+ << " buf" << (long)buf << ::dec << " got picture" << *got_picture_ptr
<< " buffer size is" << buf_size);
int res = Favcodec_decode_video(ctx, picture, got_picture_ptr, buf, buf_size);
PTRACE(6, "Avcodec decode video of " <<buf_size << " bytes. result is " << res );
@@ -370,7 +377,7 @@ int FfmpgLink::AvcodecEncodeVideo(AVCodecContext *ctx,
PWaitAndSignal m(processLock);
PTRACE(6, "Avcodec encode video for ctxt " << ::hex << ctx << " picture" << pict
- << " buf" << (int)buf << ::dec << " buffer size is" << buf_size);
+ << " buf" << (long)buf << ::dec << " buffer size is" << buf_size);
int res = Favcodec_encode_video(ctx, buf, buf_size, pict);
PTRACE(6, "Avcodec encode video into " << res << " bytes.");
@@ -388,10 +395,12 @@ void FfmpgLink::AvcodecInit(void)
Favcodec_init();
}

5
x11/wxSVG/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/05/17 17:10:40 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2008/07/09 02:13:59 jakemsr Exp $
COMMENT= C++ library to create, manipulate and render SVG files
DISTNAME= wxsvg-1.0b10
PKGNAME= ${DISTNAME}p0
SHARED_LIBS += wxsvg 0.0 # .0.0
CATEGORIES= x11 graphics
@ -24,7 +25,7 @@ MODULES= devel/gettext
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS= avcodec,avformat::graphics/ffmpeg \
LIB_DEPENDS= avcodec,avformat,swscale::graphics/ffmpeg \
art_lgpl_2::graphics/libart \
wx_base,wx_base_net,wx_base_odbc,wx_base_xml,wx_gtk2_adv,wx_gtk2_aui,wx_gtk2_core,wx_gtk2_dbgrid,wx_gtk2_html,wx_gtk2_qa,wx_gtk2_richtext,wx_gtk2_xrc::x11/wxWidgets

15
x11/wxSVG/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2008/05/17 17:10:40 jasper Exp $
--- configure.in.orig Tue Jan 15 13:59:31 2008
+++ configure.in Thu May 15 23:32:24 2008
$OpenBSD: patch-configure_in,v 1.2 2008/07/09 02:13:59 jakemsr Exp $
--- configure.in.orig Tue Jan 15 04:59:31 2008
+++ configure.in Sat Jun 21 19:53:39 2008
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a confi
dnl initialization
AC_PREREQ(2.57)
@ -10,3 +10,12 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2008/05/17 17:10:40 jasper Exp $
AM_MAINTAINER_MODE
dnl options
@@ -161,7 +161,7 @@ if test x$enable_ffmpeg = xyes; then
AC_CHECK_LIB(avformat, av_register_all, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavformat])])
AC_CHECK_LIB(avcodec, avcodec_decode_audio2, [], [AC_MSG_ERROR([*** missing ffmpeg library: libavcodec])])
AC_CHECK_LIB(swscale, sws_getContext)
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: ffmpeg/avcodec.h.])])
+ AC_CHECK_HEADERS(libavcodec/avcodec.h, [], [AC_MSG_ERROR([*** missing ffmpeg header file: libavcodec/avcodec.h.])])
CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG"
fi

14
x11/wxSVG/patches/patch-src_mediadec_ffmpeg_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_mediadec_ffmpeg_cpp,v 1.1 2008/07/09 02:13:59 jakemsr Exp $
--- src/mediadec_ffmpeg.cpp.orig Sat Jun 21 20:05:54 2008
+++ src/mediadec_ffmpeg.cpp Sat Jun 21 20:06:15 2008
@@ -23,8 +23,8 @@
extern "C" {
#define __STDC_CONSTANT_MACROS
#define __STDC_LIMIT_MACROS
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
}
wxFfmpegMediaDecoder::wxFfmpegMediaDecoder():

4
x11/wxSVG/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/17 17:10:40 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/07/09 02:13:59 jakemsr Exp $
%%SHARED%%
bin/svgview
@bin bin/svgview
include/wxSVG/
include/wxSVG/Animated.h
include/wxSVG/CSSStyleDeclaration.h