source: npl/mediabox/ffmpeg/patches/fribidi.patch @ c5c522c

gcc484ntopperl-5.22
Last change on this file since c5c522c was c5c522c, checked in by Edwin Eefting <edwin@datux.nl>, 8 years ago

initial commit, transferred from cleaned syn3 svn tree

  • Property mode set to 100644
File size: 2.6 KB
  • Makefile.am

    diff -u fribidi.orig/Makefile.am fribidi/Makefile.am
    old new  
    99##############################################################################
    1010
    1111## The order of subdirs is important, don't change without a reason.
    12 SUBDIRS = gen.tab charset lib bin doc test
     12SUBDIRS = gen.tab charset lib #bin doc test
    1313
    1414EXTRA_DIST = bootstrap ChangeLog.old
    1515
  • configure.ac

    diff -u fribidi.orig/configure.ac fribidi/configure.ac
    old new  
    165165AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$FRIBIDI_CHARSETS = x1)
    166166
    167167# --with[out]-glib
    168 AC_ARG_WITH(glib,
    169               AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
    170                              [use Glib @<:@default=auto@:>@]))
    171 GLIB_PACKAGE=glib-2.0
    172 GLIB_MINVERSION=2.4
     168#AC_ARG_WITH(glib,
     169#              AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
     170#                             [use Glib @<:@default=auto@:>@]))
     171#GLIB_PACKAGE=glib-2.0
     172#GLIB_MINVERSION=2.4
    173173GLIB_LIBS=
    174174GLIB_CFLAGS=
    175 if test x$with_glib = xyes; then
    176         PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
    177         FRIBIDI_USE_GLIB=1
    178 else
    179 if test x$with_glib = xno; then
     175#if test x$with_glib = xyes; then
     176#       PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
     177#       FRIBIDI_USE_GLIB=1
     178#else
     179#if test x$with_glib = xno; then
    180180        FRIBIDI_USE_GLIB=0
    181 else
    182         PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
    183                 FRIBIDI_USE_GLIB=1,
    184                 FRIBIDI_USE_GLIB=0)
    185 fi
    186 fi
    187 if test x$FRIBIDI_USE_GLIB = x0; then
     181#else
     182#       PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
     183#               FRIBIDI_USE_GLIB=1,
     184#               FRIBIDI_USE_GLIB=0)
     185#fi
     186#fi
     187#if test x$FRIBIDI_USE_GLIB = x0; then
    188188        GLIB_PACKAGE=
    189 fi
     189#fi
    190190AC_SUBST(FRIBIDI_USE_GLIB)
    191191AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
    192192
    193193
    194 MISC_CFLAGS="$GLIB_CFLAGS"
    195 MISC_LIBS="$GLIB_LIBS"
    196 MISC_PACKAGES="$GLIB_PACKAGE"
    197 AC_SUBST(MISC_CFLAGS)
    198 AC_SUBST(MISC_LIBS)
    199 AC_SUBST(MISC_PACKAGES)
     194#MISC_CFLAGS="$GLIB_CFLAGS"
     195#MISC_LIBS="$GLIB_LIBS"
     196#MISC_PACKAGES="$GLIB_PACKAGE"
     197#AC_SUBST(MISC_CFLAGS)
     198#AC_SUBST(MISC_LIBS)
     199#AC_SUBST(MISC_PACKAGES)
    200200
    201201# Generate output
    202202AC_CONFIG_FILES([fribidi.pc
  • fribidi.pc.in

    old new  
    77
    88Name: @PACKAGE_NAME@
    99Description: Unicode Bidirectional Algorithm Library
    10 Requires: @MISC_PACKAGES@
    1110Version: @VERSION@
    1211Libs: -L${libdir} -lfribidi
    1312Cflags: -I${includedir}/@PACKAGE@
Note: See TracBrowser for help on using the repository browser.