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

- fix build, update LIB_DEPENDS/WANTLIB after recent ffmpeg changes

Browse Source 
- add @bin marker while here
- bump PKGNAME

breakage pointed out by naddy@

"diff looks sane to me" jasper@
This commit is contained in:
jakemsr 2008-07-15 11:15:30 +00:00
parent 241c16a745
commit 61eaba731d
4 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multimedia/dvdstyler/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2008/06/01 08:21:15 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2008/07/15 11:15:30 jakemsr Exp $
COMMENT= DVD authoring application
DISTNAME= DVDStyler-1.6.2
PKGNAME= ${DISTNAME:L}p0
PKGNAME= ${DISTNAME:L}p2
CATEGORIES= multimedia
HOMEPAGE= http://www.dvdstyler.de/
@ -20,7 +20,7 @@ MODULES= devel/gettext
WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 \
audiofile avcodec avformat avutil bonobo-2 bonobo-activation \
audiofile bonobo-2 bonobo-activation \
bonoboui-2 c cairo esd expat fontconfig freetype gailutil \
gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 \
gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 \
@ -34,7 +34,8 @@ BUILD_DEPENDS= ::multimedia/dvdauthor \
::sysutils/dvd+rw-tools
LIB_DEPENDS= exif::graphics/libexif \
gnomeui-2::x11/gnome/libgnomeui \
wxsvg::x11/wxSVG
wxsvg::x11/wxSVG \
avcodec.>=12,avformat.>=12,avutil.>=6,swscale.>=1::graphics/ffmpeg
RUN_DEPENDS= ::devel/desktop-file-utils \
::multimedia/dvdauthor \
::multimedia/mjpegtools \

23
multimedia/dvdstyler/patches/patch-configure Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure,v 1.1 2008/07/15 11:15:30 jakemsr Exp $
--- configure.orig Sun Jul 13 10:20:36 2008
+++ configure Sun Jul 13 10:23:34 2008
@@ -5729,7 +5729,7 @@ _ACEOF
fi
-for ac_header in ffmpeg/avcodec.h
+for ac_header in libavcodec/avcodec.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -5870,8 +5870,8 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
else
- { { echo "$as_me:$LINENO: error: *** missing ffmpeg header file: ffmpeg/avcodec.h." >&5
-echo "$as_me: error: *** missing ffmpeg header file: ffmpeg/avcodec.h." >&2;}
+ { { echo "$as_me:$LINENO: error: *** missing ffmpeg header file: libavcodec/avcodec.h." >&5
+echo "$as_me: error: *** missing ffmpeg header file: libavcodec/avcodec.h." >&2;}
{ (exit 1); exit 1; }; }
fi

14
multimedia/dvdstyler/patches/patch-src_mediaenc_ffmpeg_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_mediaenc_ffmpeg_cpp,v 1.1 2008/07/15 11:15:30 jakemsr Exp $
--- src/mediaenc_ffmpeg.cpp.orig Sun Jul 13 10:29:38 2008
+++ src/mediaenc_ffmpeg.cpp Sun Jul 13 10:30:20 2008
@@ -24,8 +24,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>
}
#define AUDIO_BUF_SIZE 50000

4
multimedia/dvdstyler/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/17 17:18:48 jasper Exp $
bin/dvdstyler
@comment $OpenBSD: PLIST,v 1.2 2008/07/15 11:15:30 jakemsr Exp $
@bin bin/dvdstyler
share/applications/dvdstyler.desktop
share/doc/dvdstyler/
share/doc/dvdstyler/README