Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4225
Modified Files:
libx264-57-shlibs.info
Added Files:
libx264-98-shlibs.info libx264-98-shlibs.patch
Log Message:
new -98- libN version for libx264
--- NEW FILE: libx264-98-shlibs.patch ---
diff -ruN x264-snapshot-20100301-2245.orig/Makefile
x264-snapshot-20100301-2245/Makefile
--- x264-snapshot-20100301-2245.orig/Makefile 2010-03-06 02:14:30.000000000
+0900
+++ x264-snapshot-20100301-2245/Makefile 2010-03-06 02:16:03.000000000
+0900
@@ -123,7 +123,7 @@
$(RANLIB) libx264.a
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
- $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+ $(CC) -o $@ $(OBJS) $(OBJASM) $(SOFLAGS)
x264$(EXE): $(OBJCLI) libx264.a
$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
@@ -202,7 +202,7 @@
ifeq ($(SYS),MINGW)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
else
- $(if $(SONAME), ln -f -s $(SONAME)
$(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
+ $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SONAME_INSTALL))
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
endif
$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
diff -ruN x264-snapshot-20100301-2245.orig/configure
x264-snapshot-20100301-2245/configure
--- x264-snapshot-20100301-2245.orig/configure 2010-03-06 02:14:30.000000000
+0900
+++ x264-snapshot-20100301-2245/configure 2010-03-06 02:24:39.000000000
+0900
@@ -17,7 +17,7 @@
echo " --enable-gprof adds -pg, doesn't strip"
echo " --enable-visualize enables visualization (X11 only)"
echo " --enable-pic build position-independent code"
-echo " --enable-shared build libx264.so"
+echo " --enable-shared build libx264.dylib"
echo " --extra-asflags=EASFLAGS add EASFLAGS to ASFLAGS"
echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS"
echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS"
@@ -188,10 +188,10 @@
ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
;;
--extra-cflags=*)
- CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+ CFLAGS="${opt#--extra-cflags=} $CFLAGS"
;;
--extra-ldflags=*)
- LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+ LDFLAGS="${opt#--extra-ldflags=} $LDFLAGS"
;;
--enable-pthread)
pthread="auto" # can't skip detection, since it differs by OS
@@ -677,8 +677,10 @@
echo 'SOFLAGS=-Wl,--out-implib,$(IMPLIBNAME)
-Wl,--enable-auto-image-base' >> config.mak
elif [ "$SYS" = "MACOSX" ]; then
echo "SOSUFFIX=dylib" >> config.mak
- echo "SONAME=libx264.$API.dylib" >> config.mak
- echo 'SOFLAGS=-dynamiclib -Wl,-single_module
-Wl,-read_only_relocs,suppress -install_name $(DESTDIR)$(libdir)/$(SONAME)' >>
config.mak
+ echo "SOINSTALLPATH=${prefix}/lib" >> config.mak
+ echo "SONAME_INSTALL=libx264.$API.dylib" >> config.mak
+ echo "SONAME=libx264.$API.0.0.dylib" >> config.mak
+ echo 'SOFLAGS=-dynamiclib -install_name
$(SOINSTALLPATH)/$(SONAME_INSTALL) -compatibility_version 1 -current_version 1
-Wl,-read_only_relocs,suppress $(LDFLAGS)' >> config.mak
elif [ "$SYS" = "SunOS" ]; then
echo "SOSUFFIX=so" >> config.mak
echo "SONAME=libx264.so.$API" >> config.mak
--- NEW FILE: libx264-98-shlibs.info ---
Package: libx264-98-shlibs
Version: 0.0.20100602
Revision: 2
###
BuildDepends: x11-dev, fink (>= 0.24.12-1), (%m = i386) yasm (>= 0.8.0-1)
Depends: x11
###
Source:
ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20100602-2245.tar.bz2
SourceDirectory: x264-snapshot-20100602-2245
Source-MD5: 1630006c8947ecfc8b4b79ae9cc5749c
###
PatchFile: %n.patch
PatchFile-MD5: 5a507681e0bad207279e564c47896666
###
DocFiles: AUTHORS COPYING
###
NoSetCFLAGS: true
ConfigureParams: --enable-visualize --enable-pic --enable-shared
--extra-cflags="-I. -fno-common -I%p/include" --host=%m-apple-darwin`uname -r`
###
InstallScript: <<
make install DESTDIR=%d
/bin/ln -s libx264.98.dylib %i/lib/libx264.dylib
<<
###
Shlibs: %p/lib/libx264.98.dylib 1.0.0 %n (>= 0.0.20100602-5)
###
SplitOff: <<
Package: x264
Depends: libx264-98-shlibs (>= %v-%r), x11
Files: <<
bin
share
<<
DocFiles: AUTHORS COPYING
<<
SplitOff2: <<
Package: libx264-98-dev
Depends: libx264-98-shlibs (>= %v-%r)
Conflicts: libx264-dev, libx264-98-dev
Replaces: libx264-dev, libx264-98-dev
BuildDependsOnly: true
Files: <<
include/x264.h
lib/libx264.a
lib/libx264.dylib
lib/pkgconfig/x264.pc
<<
DocFiles: AUTHORS COPYING
<<
###
Description: Encoding H264/AVC video streams
DescDetail: <<
x264 is a free library for encoding H264/AVC video streams
<<
DescPackaging: <<
Starting with library version -98-, the -dev splitoff is named to match the
-shlibs splitoff. In version -57-, the dev splitoff was simply named
libx264-dev, and this generated much confusion for the dependency engine.
<<
###
License: GPL
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
Homepage: http://www.videolan.org/developers/x264.html
Index: libx264-57-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libx264-57-shlibs.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libx264-57-shlibs.info 23 Aug 2009 02:36:02 -0000 1.5
+++ libx264-57-shlibs.info 20 Jul 2010 20:15:32 -0000 1.6
@@ -1,6 +1,6 @@
Package: libx264-57-shlibs
Version: 0.0.20071214
-Revision: 4
+Revision: 5
###
BuildDepends: atk1 (>= 1.20.0-1), cairo (>= 1.6-1), expat1, fontconfig2-dev,
freetype219, glib2-dev (>= 2.14.0-1), glitz, gtk+2-dev (>= 2.12.8-1),
libgettext3-dev, libiconv-dev, pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>=
0.10.0-1), x11-dev, xft2-dev, glitz, gettext-tools, fink (>= 0.24.12-1)
Depends: x11
@@ -14,7 +14,7 @@
###
DocFiles: AUTHORS COPYING
###
-ConfigureParams: --enable-gtk --enable-pthread --enable-visualize --enable-pic
--enable-shared --extra-cflags="-fno-common -I%p/lib/freetype219/include
-I%p/include" --extra-ldflags="-L%p/lib/freetype219/lib"
--host=%m-apple-darwin`uname -r`
+ConfigureParams: --enable-gtk --enable-pthread --enable-visualize --enable-pic
--enable-shared --extra-cflags="-I. -fno-common -I%p/lib/freetype219/include
-I%p/include" --extra-ldflags="-L%p/lib/freetype219/lib"
--host=%m-apple-darwin`uname -r`
###
CompileScript: <<
#!/bin/sh -ev
@@ -48,6 +48,8 @@
SplitOff3: <<
Package: libx264-dev
Depends: libx264-57-shlibs (>= %v-%r)
+ Conflicts: libx264-dev, libx264-98-dev
+ Replaces: libx264-dev, libx264-98-dev
BuildDependsOnly: true
Files: <<
include/x264.h
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
