Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/x264/patches/x264-20090427_2245-no-libs.patch

    Annotation of /trunk/x264/patches/x264-20090427_2245-no-libs.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 777 - (hide annotations) (download)
    Fri May 1 10:05:49 2009 UTC (15 years, 1 month ago) by niro
    File size: 1955 byte(s) 
    -re-diff for x264-20090427
    1 niro 777 diff -Naur x264-snapshot-20090427-2245/configure x264-snapshot-20090427-2245-magellan/configure
    2     --- x264-snapshot-20090427-2245/configure 2009-04-27 22:45:11.000000000 +0200
    3     +++ x264-snapshot-20090427-2245-magellan/configure 2009-05-01 12:41:14.000000000 +0200
    4     @@ -463,7 +463,6 @@
    5     echo "SONAME=libx264.so.$API" >> config.mak
    6     echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
    7     fi
    8     - echo 'default: $(SONAME)' >> config.mak
    9     fi
    10    
    11     ./version.sh
    12     diff -Naur x264-snapshot-20090427-2245/Makefile x264-snapshot-20090427-2245-magellan/Makefile
    13     --- x264-snapshot-20090427-2245/Makefile 2009-04-27 22:45:11.000000000 +0200
    14     +++ x264-snapshot-20090427-2245-magellan/Makefile 2009-05-01 12:43:55.000000000 +0200
    15     @@ -80,8 +80,8 @@
    16     $(SONAME): .depend $(OBJS) $(OBJASM)
    17     $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
    18    
    19     -x264$(EXE): $(OBJCLI) libx264.a
    20     - $(CC) -o $@ $+ $(LDFLAGS)
    21     +x264$(EXE): $(OBJCLI)
    22     + $(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
    23    
    24     checkasm: tools/checkasm.o libx264.a
    25     $(CC) -o $@ $+ $(LDFLAGS)
    26     @@ -143,21 +143,9 @@
    27     rm -f config.mak config.h x264.pc
    28     rm -rf test/
    29    
    30     -install: x264$(EXE) $(SONAME)
    31     - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
    32     - install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
    33     - install -m 644 x264.h $(DESTDIR)$(includedir)
    34     - install -m 644 libx264.a $(DESTDIR)$(libdir)
    35     - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
    36     +install: x264$(EXE)
    37     + install -d $(DESTDIR)$(bindir)
    38     install x264$(EXE) $(DESTDIR)$(bindir)
    39     - $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
    40     -ifeq ($(SYS),MINGW)
    41     - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
    42     -else
    43     - $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
    44     - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
    45     -endif
    46     - $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
    47    
    48     uninstall:
    49     rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a