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

- Update for newer FFmpeg API.

Browse Source 
- Remove pthread patch.

ok benoit@
This commit is contained in:
brad 2013-01-18 07:56:17 +00:00
parent 0e967d9217
commit 01d0ad8e7c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/amide/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2012/12/21 12:13:35 sthen Exp $ # $OpenBSD: Makefile,v 1.25 2013/01/18 07:56:17 brad Exp $
COMMENT = Amide a Medical Imaging Data Examiner COMMENT = Amide a Medical Imaging Data Examiner
DISTNAME = amide-0.9.2 DISTNAME = amide-0.9.2
REVISION = 14 REVISION = 15
CATEGORIES = graphics CATEGORIES = graphics
HOMEPAGE = http://amide.sourceforge.net/ HOMEPAGE = http://amide.sourceforge.net/
@ -43,7 +43,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = devel/gsl>=1.6 \ LIB_DEPENDS = devel/gsl>=1.6 \
x11/gnome/libgnomecanvas \ x11/gnome/libgnomecanvas \
graphics/xmedcon \ graphics/xmedcon \
graphics/ffmpeg>=20100512 \ graphics/ffmpeg>=20121026 \
devel/gconf2 devel/gconf2
USE_LIBTOOL = Yes USE_LIBTOOL = Yes

12
graphics/amide/patches/patch-configure_in
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-configure_in,v 1.2 2011/05/19 15:28:27 ajacoutot Exp $ $OpenBSD: patch-configure_in,v 1.3 2013/01/18 07:56:17 brad Exp $
- Remove over-the-top optimization - Remove over-the-top optimization
- Fix pthread library
- Remove gnome-vfs2 dependency. - Remove gnome-vfs2 dependency.
--- configure.in.orig Wed Dec 9 01:34:33 2009 --- configure.in.orig Wed Dec 9 01:34:33 2009
@ -17,15 +16,6 @@ $OpenBSD: patch-configure_in,v 1.2 2011/05/19 15:28:27 ajacoutot Exp $
esac esac
if test $CC = "gcc"; then if test $CC = "gcc"; then
@@ -92,7 +92,7 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDC
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
AC_LANG_CPLUSPLUS
-AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
+AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-pthread", THREAD_LIBS="")
AC_CHECK_LIB(dcmdata, main, FOUND_DCMDATA=yes, FOUND_DCMDATA=no, -lofstd -lz -L/usr/local/dicom/lib -L/sw/lib $THREAD_LIBS)
dnl trying to phase out libfame use in favor of ffmpeg
@@ -286,7 +286,6 @@ PKG_CHECK_MODULES(AMIDE_GTK,[ @@ -286,7 +286,6 @@ PKG_CHECK_MODULES(AMIDE_GTK,[
## gconf stuff is encapsulated in amide_gconf.c ## gconf stuff is encapsulated in amide_gconf.c
if (test $native_win32 = no); then if (test $native_win32 = no); then

16
graphics/amide/patches/patch-src_mpeg_encode_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_mpeg_encode_c,v 1.2 2011/05/15 21:16:06 jasper Exp $ $OpenBSD: patch-src_mpeg_encode_c,v 1.3 2013/01/18 07:56:17 brad Exp $
--- src/mpeg_encode.c.orig Mon Nov 16 07:55:52 2009 --- src/mpeg_encode.c.orig Mon Nov 16 01:55:52 2009
+++ src/mpeg_encode.c Sun May 15 23:15:55 2011 +++ src/mpeg_encode.c Fri Jan 18 02:18:00 2013
@@ -141,7 +141,7 @@ static void convert_rgb_pixbuf_to_yuv(yuv_t * yuv, Gdk @@ -141,7 +141,7 @@ static void convert_rgb_pixbuf_to_yuv(yuv_t * yuv, Gdk
/* -------------------------------------------------------- */ /* -------------------------------------------------------- */
#ifdef AMIDE_FFMPEG_SUPPORT #ifdef AMIDE_FFMPEG_SUPPORT
@ -10,3 +10,13 @@ $OpenBSD: patch-src_mpeg_encode_c,v 1.2 2011/05/15 21:16:06 jasper Exp $
typedef struct { typedef struct {
@@ -211,9 +211,6 @@ gboolean avcodec_initialized=FALSE;
static void mpeg_encoding_init(void) {
if (!avcodec_initialized) {
- /* must be called before using avcodec lib */
- avcodec_init();
-
/* register all the codecs */
avcodec_register_all();