On Mon, May 04, 2009 at 09:52:47PM +0200, Matthias Kilian wrote:
> Sorry for the delay,
>
> On Wed, Apr 29, 2009 at 09:36:05PM +0000, Jacob Meuser wrote:
> > > Index: patches/patch-configure
> > > ===================================================================
> > > RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-configure,v
> > > retrieving revision 1.7
> > > diff -u -p -r1.7 patch-configure
> > > --- patches/patch-configure 9 Jul 2008 02:13:01 -0000 1.7
> > > +++ patches/patch-configure 29 Apr 2009 20:31:45 -0000
> [...]
> > > +@@ -27956,7 +27956,7 @@ cat confdefs.h >>conftest.$ac_ext
> > > + cat >>conftest.$ac_ext <<_ACEOF
> > > /* end confdefs.h. */
> > >
> > > - #include <stdio.h>
> > > -- #include <ffmpeg/avcodec.h>
> > > -+ #include <libavcodec/avcodec.h>
> > > - int main()
> > > - {
> > > - FILE * output;
> [...]
> >
> > what's the purpose of this? configure first looks for
> > 'libavcodec/avcodec.h', then 'avcodec.h', then 'ffmpeg/avcodec.h'.
>
> IIRC, it didn't find libavcodec/avcodec.h when I worked on the fix,
> so I mechanically replaced all the includes in configure. It may
> be a junk patch , but it shouldn't hurt.
until the next update, when the question of "what's this doing here?"
wastes someone's time ...
> I'll try to build without
> the patch when I've some spare time.
this works for me on i386 with old and new x264 and even if old
libquicktime is still installed.
--
[email protected]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.17
diff -N -u -p Makefile
--- Makefile 29 Apr 2009 21:22:14 -0000 1.17
+++ Makefile 4 May 2009 21:13:04 -0000
@@ -5,6 +5,7 @@ SHARED_ONLY= Yes
COMMENT= library for reading and writing quicktime files
DISTNAME= libquicktime-1.1.1
+PKGNAME= ${DISTNAME}p0
CATEGORIES= multimedia
SHARED_LIBS= quicktime 4.0
@@ -48,7 +49,7 @@ MAKE_ENV= DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ LDFLAGS="-L${WRKBUILD}/src/.libs -L${LOCALBASE}/lib
-L${X11BASE}/lib" \
ac_cv_search_pthread_create=-pthread
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/libquicktime/patches/patch-configure,v
retrieving revision 1.8
diff -N -u -p patches/patch-configure
--- patches/patch-configure 29 Apr 2009 21:22:14 -0000 1.8
+++ patches/patch-configure 4 May 2009 21:13:04 -0000
@@ -26,39 +26,3 @@ $OpenBSD: patch-configure,v 1.8 2009/04/29 21:22:14 ki
{ echo "$as_me:$LINENO: checking for lame" >&5
-@@ -27956,7 +27956,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 ()
- {
-@@ -27982,7 +27982,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- found_header="true";AVCODEC_HEADER="<ffmpeg/avcodec.h>"
-+ found_header="true";AVCODEC_HEADER="<libavcodec/avcodec.h>"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -28258,7 +28258,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 ()
- {
-@@ -28284,7 +28284,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- found_header="true";AVCODEC_HEADER="<ffmpeg/avcodec.h>"
-+ found_header="true";AVCODEC_HEADER="<libavcodec/avcodec.h>"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
